158 files changed, 3216 insertions, 2142 deletions
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 70b77e0899a8..dbf6ca781f66 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -118,8 +118,8 @@ static void ata_acpi_associate_ide_port(struct ata_port *ap)
                ap->pflags |= ATA_PFLAG_INIT_GTM_VALID;
 }
-static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
+static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device
-                                    u32 event)
+                                    *dev, u32 event)
 {
        char event_string[12];
        char *envp[] = { event_string, NULL };
@@ -127,6 +127,9 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
        struct kobject *kobj = NULL;
        int wait = 0;
        unsigned long flags;
+        acpi_handle handle, tmphandle;
+        unsigned long sta;
+        acpi_status status;
        if (!ap)
                ap = dev->link->ap;
@@ -134,32 +137,57 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
        spin_lock_irqsave(ap->lock, flags);
+        if (dev)
+                handle = dev->acpi_handle;
+        else
+                handle = ap->acpi_handle;
+        status = acpi_get_handle(handle, "_EJ0", &tmphandle);
+        if (ACPI_FAILURE(status)) {
+                /* This device is not ejectable */
+                spin_unlock_irqrestore(ap->lock, flags);
+                return;
+        }
+        status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
+        if (ACPI_FAILURE(status)) {
+                printk ("Unable to determine bay status\n");
+                spin_unlock_irqrestore(ap->lock, flags);
+                return;
+        }
        switch (event) {
        case ACPI_NOTIFY_BUS_CHECK:
        case ACPI_NOTIFY_DEVICE_CHECK:
                ata_ehi_push_desc(ehi, "ACPI event");
-                ata_ehi_hotplugged(ehi);
+                if (!sta) {
-                ata_port_freeze(ap);
+                /* Device has been unplugged */
-                break;
+                        if (dev)
+                                dev->flags |= ATA_DFLAG_DETACH;
-        case ACPI_NOTIFY_EJECT_REQUEST:
+                        else {
-                ata_ehi_push_desc(ehi, "ACPI event");
+                                struct ata_link *tlink;
-                if (dev)
+                                struct ata_device *tdev;
-                        dev->flags |= ATA_DFLAG_DETACH;
-                else {
+                                ata_port_for_each_link(tlink, ap) {
-                        struct ata_link *tlink;
+                                        ata_link_for_each_dev(tdev, tlink) {
-                        struct ata_device *tdev;
+                                                tdev->flags |=
+                                                        ATA_DFLAG_DETACH;
-                        ata_port_for_each_link(tlink, ap)
+                                        }
-                                ata_link_for_each_dev(tdev, tlink)
+                                }
-                                        tdev->flags |= ATA_DFLAG_DETACH;
+                        }
+                        ata_port_schedule_eh(ap);
+                        wait = 1;
+                } else {
+                        ata_ehi_hotplugged(ehi);
+                        ata_port_freeze(ap);
                }
-                ata_port_schedule_eh(ap);
-                wait = 1;
-                break;
        }
+        spin_unlock_irqrestore(ap->lock, flags);
+        if (wait)
+                ata_port_wait_eh(ap);
        if (dev) {
                if (dev->sdev)
                        kobj = &dev->sdev->sdev_gendev.kobj;
@@ -170,11 +198,6 @@ static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
                sprintf(event_string, "BAY_EVENT=%d", event);
                kobject_uevent_env(kobj, KOBJ_CHANGE, envp);
        }
-        spin_unlock_irqrestore(ap->lock, flags);
-        if (wait)
-                ata_port_wait_eh(ap);
 }
 static void ata_acpi_dev_notify(acpi_handle handle, u32 event, void *data)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 927b692d723c..3c89f205c83f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2126,6 +2126,13 @@ int ata_dev_configure(struct ata_device *dev)
        dev->horkage |= ata_dev_blacklisted(dev);
        ata_force_horkage(dev);
+        if (dev->horkage & ATA_HORKAGE_DISABLE) {
+                ata_dev_printk(dev, KERN_INFO,
+                               "unsupported device, disabling\n");
+                ata_dev_disable(dev);
+                return 0;
+        }
        /* let ACPI work its magic */
        rc = ata_acpi_on_devcfg(dev);
        if (rc)
@@ -3490,22 +3497,11 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params,
        if ((rc = sata_link_debounce(link, params, deadline)))
                return rc;
-        /* Clear SError.  PMP and some host PHYs require this to
+        /* clear SError, some PHYs require this even for SRST to work */
-         * operate and clearing should be done before checking PHY
-         * online status to avoid race condition (hotplugging between
-         * link resume and status check).
-         */
        if (!(rc = sata_scr_read(link, SCR_ERROR, &serror)))
                rc = sata_scr_write(link, SCR_ERROR, serror);
-        if (rc == 0 || rc == -EINVAL) {
-                unsigned long flags;
-                spin_lock_irqsave(link->ap->lock, flags);
+        return rc != -EINVAL ? rc : 0;
-                link->eh_info.serror = 0;
-                spin_unlock_irqrestore(link->ap->lock, flags);
-                rc = 0;
-        }
-        return rc;
 }
 /**
@@ -3653,9 +3649,13 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
        if (check_ready)
                rc = ata_wait_ready(link, deadline, check_ready);
 out:
-        if (rc && rc != -EAGAIN)
+        if (rc && rc != -EAGAIN) {
+                /* online is set iff link is online && reset succeeded */
+                if (online)
+                        *online = false;
                ata_link_printk(link, KERN_ERR,
                                "COMRESET failed (errno=%d)\n", rc);
+        }
        DPRINTK("EXIT, rc=%d\n", rc);
        return rc;
 }
@@ -3700,8 +3700,14 @@ int sata_std_hardreset(struct ata_link *link, unsigned int *class,
 */
 void ata_std_postreset(struct ata_link *link, unsigned int *classes)
 {
+        u32 serror;
        DPRINTK("ENTER\n");
+        /* reset complete, clear SError */
+        if (!sata_scr_read(link, SCR_ERROR, &serror))
+                sata_scr_write(link, SCR_ERROR, serror);
        /* print link status */
        sata_print_link_status(link);
@@ -3894,8 +3900,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
        { "SAMSUNG CD-ROM SN-124", "N001",      ATA_HORKAGE_NODMA },
        { "Seagate STT20000A", NULL,            ATA_HORKAGE_NODMA },
        /* Odd clown on sil3726/4726 PMPs */
-        { "Config  Disk",       NULL,           ATA_HORKAGE_NODMA |
+        { "Config  Disk",       NULL,           ATA_HORKAGE_DISABLE },
-                                                ATA_HORKAGE_SKIP_PM },
        /* Weird ATAPI devices */
        { "TORiSAN DVD-ROM DRD-N216", NULL,     ATA_HORKAGE_MAX_SEC_128 },
@@ -5616,7 +5621,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
                        spin_lock_irqsave(ap->lock, flags);
                        ehi->probe_mask |= ATA_ALL_DEVICES;
-                        ehi->action |= ATA_EH_RESET;
+                        ehi->action |= ATA_EH_RESET | ATA_EH_LPM;
                        ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
                        ap->pflags &= ~ATA_PFLAG_INITIALIZING;
@@ -5649,7 +5654,6 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
                struct ata_port *ap = host->ports[i];
                ata_scsi_scan_host(ap, 1);
-                ata_lpm_schedule(ap, ap->pm_policy);
        }
        return 0;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 62e033146bed..7894d83ea1eb 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1308,12 +1308,7 @@ static void ata_eh_analyze_serror(struct ata_link *link)
        unsigned int err_mask = 0, action = 0;
        u32 hotplug_mask;
-        if (serror & SERR_PERSISTENT) {
+        if (serror & (SERR_PERSISTENT | SERR_DATA)) {
-                err_mask |= AC_ERR_ATA_BUS;
-                action |= ATA_EH_RESET;
-        }
-        if (serror &
-            (SERR_DATA_RECOVERED | SERR_COMM_RECOVERED | SERR_DATA)) {
                err_mask |= AC_ERR_ATA_BUS;
                action |= ATA_EH_RESET;
        }
@@ -2047,19 +2042,11 @@ static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset,
                        unsigned int *classes, unsigned long deadline)
 {
        struct ata_device *dev;
-        int rc;
        ata_link_for_each_dev(dev, link)
                classes[dev->devno] = ATA_DEV_UNKNOWN;
-        rc = reset(link, classes, deadline);
+        return reset(link, classes, deadline);
-        /* convert all ATA_DEV_UNKNOWN to ATA_DEV_NONE */
-        ata_link_for_each_dev(dev, link)
-                if (classes[dev->devno] == ATA_DEV_UNKNOWN)
-                        classes[dev->devno] = ATA_DEV_NONE;
-        return rc;
 }
 static int ata_eh_followup_srst_needed(struct ata_link *link,
@@ -2096,9 +2083,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
        ata_reset_fn_t reset;
        unsigned long flags;
        u32 sstatus;
-        int rc;
+        int nr_known, rc;
-        /* about to reset */
+        /*
+         * Prepare to reset
+         */
        spin_lock_irqsave(ap->lock, flags);
        ap->pflags |= ATA_PFLAG_RESETTING;
        spin_unlock_irqrestore(ap->lock, flags);
@@ -2124,16 +2113,8 @@ int ata_eh_reset(struct ata_link *link, int classify,
                        ap->ops->set_piomode(ap, dev);
        }
-        if (!softreset && !hardreset) {
-                if (verbose)
-                        ata_link_printk(link, KERN_INFO, "no reset method "
-                                        "available, skipping reset\n");
-                if (!(lflags & ATA_LFLAG_ASSUME_CLASS))
-                        lflags |= ATA_LFLAG_ASSUME_ATA;
-                goto done;
-        }
        /* prefer hardreset */
+        reset = NULL;
        ehc->i.action &= ~ATA_EH_RESET;
        if (hardreset) {
                reset = hardreset;
@@ -2141,11 +2122,6 @@ int ata_eh_reset(struct ata_link *link, int classify,
        } else if (softreset) {
                reset = softreset;
                ehc->i.action = ATA_EH_SOFTRESET;
-        } else {
-                ata_link_printk(link, KERN_ERR, "BUG: no reset method, "
-                                "please report to linux-ide@vger.kernel.org\n");
-                dump_stack();
-                return -EINVAL;
        }
        if (prereset) {
@@ -2165,55 +2141,71 @@ int ata_eh_reset(struct ata_link *link, int classify,
                                        "prereset failed (errno=%d)\n", rc);
                        goto out;
                }
-        }
-        /* prereset() might have cleared ATA_EH_RESET */
+                /* prereset() might have cleared ATA_EH_RESET.  If so,
-        if (!(ehc->i.action & ATA_EH_RESET)) {
+                 * bang classes and return.
-                /* prereset told us not to reset, bang classes and return */
+                 */
-                ata_link_for_each_dev(dev, link)
+                if (reset && !(ehc->i.action & ATA_EH_RESET)) {
-                        classes[dev->devno] = ATA_DEV_NONE;
+                        ata_link_for_each_dev(dev, link)
-                rc = 0;
+                                classes[dev->devno] = ATA_DEV_NONE;
-                goto out;
+                        rc = 0;
+                        goto out;
+                }
        }
 retry:
+        /*
+         * Perform reset
+         */
+        if (ata_is_host_link(link))
+                ata_eh_freeze_port(ap);
        deadline = jiffies + ata_eh_reset_timeouts[try++];
-        /* shut up during boot probing */
+        if (reset) {
-        if (verbose)
+                if (verbose)
-                ata_link_printk(link, KERN_INFO, "%s resetting link\n",
+                        ata_link_printk(link, KERN_INFO, "%s resetting link\n",
-                                reset == softreset ? "soft" : "hard");
+                                        reset == softreset ? "soft" : "hard");
-        /* mark that this EH session started with reset */
+                /* mark that this EH session started with reset */
-        if (reset == hardreset)
+                if (reset == hardreset)
-                ehc->i.flags |= ATA_EHI_DID_HARDRESET;
+                        ehc->i.flags |= ATA_EHI_DID_HARDRESET;
-        else
+                else
-                ehc->i.flags |= ATA_EHI_DID_SOFTRESET;
+                        ehc->i.flags |= ATA_EHI_DID_SOFTRESET;
-        rc = ata_do_reset(link, reset, classes, deadline);
+                rc = ata_do_reset(link, reset, classes, deadline);
-        if (reset == hardreset &&
+                if (reset == hardreset &&
-            ata_eh_followup_srst_needed(link, rc, classify, classes)) {
+                    ata_eh_followup_srst_needed(link, rc, classify, classes)) {
-                /* okay, let's do follow-up softreset */
+                        /* okay, let's do follow-up softreset */
-                reset = softreset;
+                        reset = softreset;
-                if (!reset) {
+                        if (!reset) {
-                        ata_link_printk(link, KERN_ERR,
+                                ata_link_printk(link, KERN_ERR,
-                                        "follow-up softreset required "
+                                                "follow-up softreset required "
-                                        "but no softreset avaliable\n");
+                                                "but no softreset avaliable\n");
-                        rc = -EINVAL;
+                                rc = -EINVAL;
-                        goto fail;
+                                goto fail;
+                        }
+                        ata_eh_about_to_do(link, NULL, ATA_EH_RESET);
+                        rc = ata_do_reset(link, reset, classes, deadline);
                }
-                ata_eh_about_to_do(link, NULL, ATA_EH_RESET);
+                /* -EAGAIN can happen if we skipped followup SRST */
-                rc = ata_do_reset(link, reset, classes, deadline);
+                if (rc && rc != -EAGAIN)
+                        goto fail;
+        } else {
+                if (verbose)
+                        ata_link_printk(link, KERN_INFO, "no reset method "
+                                        "available, skipping reset\n");
+                if (!(lflags & ATA_LFLAG_ASSUME_CLASS))
+                        lflags |= ATA_LFLAG_ASSUME_ATA;
        }
-        /* -EAGAIN can happen if we skipped followup SRST */
+        /*
-        if (rc && rc != -EAGAIN)
+         * Post-reset processing
-                goto fail;
+         */
- done:
        ata_link_for_each_dev(dev, link) {
                /* After the reset, the device state is PIO 0 and the
                 * controller state is undefined.  Reset also wakes up
@@ -2236,9 +2228,53 @@ int ata_eh_reset(struct ata_link *link, int classify,
        if (sata_scr_read(link, SCR_STATUS, &sstatus) == 0)
                link->sata_spd = (sstatus >> 4) & 0xf;
+        /* thaw the port */
+        if (ata_is_host_link(link))
+                ata_eh_thaw_port(ap);
+        /* postreset() should clear hardware SError.  Although SError
+         * is cleared during link resume, clearing SError here is
+         * necessary as some PHYs raise hotplug events after SRST.
+         * This introduces race condition where hotplug occurs between
+         * reset and here.  This race is mediated by cross checking
+         * link onlineness and classification result later.
+         */
        if (postreset)
                postreset(link, classes);
+        /* clear cached SError */
+        spin_lock_irqsave(link->ap->lock, flags);
+        link->eh_info.serror = 0;
+        spin_unlock_irqrestore(link->ap->lock, flags);
+        /* Make sure onlineness and classification result correspond.
+         * Hotplug could have happened during reset and some
+         * controllers fail to wait while a drive is spinning up after
+         * being hotplugged causing misdetection.  By cross checking
+         * link onlineness and classification result, those conditions
+         * can be reliably detected and retried.
+         */
+        nr_known = 0;
+        ata_link_for_each_dev(dev, link) {
+                /* convert all ATA_DEV_UNKNOWN to ATA_DEV_NONE */
+                if (classes[dev->devno] == ATA_DEV_UNKNOWN)
+                        classes[dev->devno] = ATA_DEV_NONE;
+                else
+                        nr_known++;
+        }
+        if (classify && !nr_known && ata_link_online(link)) {
+                if (try < max_tries) {
+                        ata_link_printk(link, KERN_WARNING, "link online but "
+                                       "device misclassified, retrying\n");
+                        rc = -EAGAIN;
+                        goto fail;
+                }
+                ata_link_printk(link, KERN_WARNING,
+                               "link online but device misclassified, "
+                               "device detection might fail\n");
+        }
        /* reset successful, schedule revalidation */
        ata_eh_done(link, NULL, ATA_EH_RESET);
        ehc->i.action |= ATA_EH_REVALIDATE;
@@ -2587,7 +2623,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
        struct ata_link *link;
        struct ata_device *dev;
        int nr_failed_devs, nr_disabled_devs;
-        int reset, rc;
+        int rc;
        unsigned long flags;
        DPRINTK("ENTER\n");
@@ -2630,7 +2666,6 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
        rc = 0;
        nr_failed_devs = 0;
        nr_disabled_devs = 0;
-        reset = 0;
        /* if UNLOADING, finish immediately */
        if (ap->pflags & ATA_PFLAG_UNLOADING)
@@ -2644,40 +2679,24 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
                if (ata_eh_skip_recovery(link))
                        ehc->i.action = 0;
-                /* do we need to reset? */
-                if (ehc->i.action & ATA_EH_RESET)
-                        reset = 1;
                ata_link_for_each_dev(dev, link)
                        ehc->classes[dev->devno] = ATA_DEV_UNKNOWN;
        }
        /* reset */
-        if (reset) {
+        ata_port_for_each_link(link, ap) {
-                /* if PMP is attached, this function only deals with
+                struct ata_eh_context *ehc = &link->eh_context;
-                 * downstream links, port should stay thawed.
-                 */
-                if (!sata_pmp_attached(ap))
-                        ata_eh_freeze_port(ap);
-                ata_port_for_each_link(link, ap) {
-                        struct ata_eh_context *ehc = &link->eh_context;
-                        if (!(ehc->i.action & ATA_EH_RESET))
+                if (!(ehc->i.action & ATA_EH_RESET))
-                                continue;
+                        continue;
-                        rc = ata_eh_reset(link, ata_link_nr_vacant(link),
+                rc = ata_eh_reset(link, ata_link_nr_vacant(link),
-                                          prereset, softreset, hardreset,
+                                  prereset, softreset, hardreset, postreset);
-                                          postreset);
+                if (rc) {
-                        if (rc) {
+                        ata_link_printk(link, KERN_ERR,
-                                ata_link_printk(link, KERN_ERR,
+                                        "reset failed, giving up\n");
-                                                "reset failed, giving up\n");
+                        goto out;
-                                goto out;
-                        }
                }
-                if (!sata_pmp_attached(ap))
-                        ata_eh_thaw_port(ap);
        }
        /* the rest */
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index ff1822a7da38..0f9386d4a5a0 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -48,7 +48,7 @@ static unsigned int sata_pmp_read(struct ata_link *link, int reg, u32 *r_val)
        tf.device = link->pmp;
        err_mask = ata_exec_internal(pmp_dev, &tf, NULL, DMA_NONE, NULL, 0,
-                                     SATA_PMP_SCR_TIMEOUT);
+                                     SATA_PMP_RW_TIMEOUT);
        if (err_mask)
                return err_mask;
@@ -88,7 +88,7 @@ static unsigned int sata_pmp_write(struct ata_link *link, int reg, u32 val)
        tf.lbah = (val >> 24) & 0xff;
        return ata_exec_internal(pmp_dev, &tf, NULL, DMA_NONE, NULL, 0,
-                                 SATA_PMP_SCR_TIMEOUT);
+                                 SATA_PMP_RW_TIMEOUT);
 }
 /**
@@ -257,19 +257,6 @@ static int sata_pmp_configure(struct ata_device *dev, int print_info)
                goto fail;
        }
-        /* turn off notification till fan-out ports are reset and configured */
-        if (gscr[SATA_PMP_GSCR_FEAT_EN] & SATA_PMP_FEAT_NOTIFY) {
-                gscr[SATA_PMP_GSCR_FEAT_EN] &= ~SATA_PMP_FEAT_NOTIFY;
-                err_mask = sata_pmp_write(dev->link, SATA_PMP_GSCR_FEAT_EN,
-                                          gscr[SATA_PMP_GSCR_FEAT_EN]);
-                if (err_mask) {
-                        rc = -EIO;
-                        reason = "failed to write GSCR_FEAT_EN";
-                        goto fail;
-                }
-        }
        if (print_info) {
                ata_dev_printk(dev, KERN_INFO, "Port Multiplier %s, "
                               "0x%04x:0x%04x r%d, %d ports, feat 0x%x/0x%x\n",
@@ -700,8 +687,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
        if (ehc->i.action & ATA_EH_RESET) {
                struct ata_link *tlink;
-                ata_eh_freeze_port(ap);
                /* reset */
                rc = ata_eh_reset(link, 0, prereset, softreset, hardreset,
                                  postreset);
@@ -711,8 +696,6 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
                        goto fail;
                }
-                ata_eh_thaw_port(ap);
                /* PMP is reset, SErrors cannot be trusted, scan all */
                ata_port_for_each_link(tlink, ap) {
                        struct ata_eh_context *ehc = &tlink->eh_context;
@@ -864,6 +847,7 @@ static int sata_pmp_eh_recover(struct ata_port *ap)
        struct ata_link *pmp_link = &ap->link;
        struct ata_device *pmp_dev = pmp_link->device;
        struct ata_eh_context *pmp_ehc = &pmp_link->eh_context;
+        u32 *gscr = pmp_dev->gscr;
        struct ata_link *link;
        struct ata_device *dev;
        unsigned int err_mask;
@@ -901,6 +885,22 @@ static int sata_pmp_eh_recover(struct ata_port *ap)
        if (rc)
                goto pmp_fail;
+        /* PHY event notification can disturb reset and other recovery
+         * operations.  Turn it off.
+         */
+        if (gscr[SATA_PMP_GSCR_FEAT_EN] & SATA_PMP_FEAT_NOTIFY) {
+                gscr[SATA_PMP_GSCR_FEAT_EN] &= ~SATA_PMP_FEAT_NOTIFY;
+                err_mask = sata_pmp_write(pmp_link, SATA_PMP_GSCR_FEAT_EN,
+                                          gscr[SATA_PMP_GSCR_FEAT_EN]);
+                if (err_mask) {
+                        ata_link_printk(pmp_link, KERN_WARNING,
+                                "failed to disable NOTIFY (err_mask=0x%x)\n",
+                                err_mask);
+                        goto pmp_fail;
+                }
+        }
        /* handle disabled links */
        rc = sata_pmp_eh_handle_disabled_links(ap);
        if (rc)
@@ -923,10 +923,10 @@ static int sata_pmp_eh_recover(struct ata_port *ap)
        /* enable notification */
        if (pmp_dev->flags & ATA_DFLAG_AN) {
-                pmp_dev->gscr[SATA_PMP_GSCR_FEAT_EN] |= SATA_PMP_FEAT_NOTIFY;
+                gscr[SATA_PMP_GSCR_FEAT_EN] |= SATA_PMP_FEAT_NOTIFY;
-                err_mask = sata_pmp_write(pmp_dev->link, SATA_PMP_GSCR_FEAT_EN,
+                err_mask = sata_pmp_write(pmp_link, SATA_PMP_GSCR_FEAT_EN,
-                                          pmp_dev->gscr[SATA_PMP_GSCR_FEAT_EN]);
+                                          gscr[SATA_PMP_GSCR_FEAT_EN]);
                if (err_mask) {
                        ata_dev_printk(pmp_dev, KERN_ERR, "failed to write "
                                       "PMP_FEAT_EN (Emask=0x%x)\n", err_mask);
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 3ce43920e459..aeb6e01d82ce 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -1082,12 +1082,6 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
        if (((cdb[4] >> 4) & 0xf) != 0)
                goto invalid_fld;       /* power conditions not supported */
-        if (qc->dev->horkage & ATA_HORKAGE_SKIP_PM) {
-                /* the device lacks PM support, finish without doing anything */
-                scmd->result = SAM_STAT_GOOD;
-                return 1;
-        }
        if (cdb[4] & 0x1) {
                tf->nsect = 1;  /* 1 sector, lba=0 */
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index fcabe46f262b..0f3e659db99a 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -177,11 +177,11 @@ static void ali_program_modes(struct ata_port *ap, struct ata_device *adev, stru
        u8 udma;
        if (t != NULL) {
-                t->setup = FIT(t->setup, 1, 8) & 7;
+                t->setup = clamp_val(t->setup, 1, 8) & 7;
-                t->act8b = FIT(t->act8b, 1, 8) & 7;
+                t->act8b = clamp_val(t->act8b, 1, 8) & 7;
-                t->rec8b = FIT(t->rec8b, 1, 16) & 15;
+                t->rec8b = clamp_val(t->rec8b, 1, 16) & 15;
-                t->active = FIT(t->active, 1, 8) & 7;
+                t->active = clamp_val(t->active, 1, 8) & 7;
-                t->recover = FIT(t->recover, 1, 16) & 15;
+                t->recover = clamp_val(t->recover, 1, 16) & 15;
                pci_write_config_byte(pdev, cas, t->setup);
                pci_write_config_byte(pdev, cbt, (t->act8b << 4) | t->rec8b);
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 26665c396485..57dd00f463d3 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -84,32 +84,32 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offse
        /* Configure the address set up timing */
        pci_read_config_byte(pdev, offset + 0x0C, &t);
-        t = (t & ~(3 << ((3 - dn) << 1))) | ((FIT(at.setup, 1, 4) - 1) << ((3 - dn) << 1));
+        t = (t & ~(3 << ((3 - dn) << 1))) | ((clamp_val(at.setup, 1, 4) - 1) << ((3 - dn) << 1));
        pci_write_config_byte(pdev, offset + 0x0C , t);
        /* Configure the 8bit I/O timing */
        pci_write_config_byte(pdev, offset + 0x0E + (1 - (dn >> 1)),
-                ((FIT(at.act8b, 1, 16) - 1) << 4) | (FIT(at.rec8b, 1, 16) - 1));
+                ((clamp_val(at.act8b, 1, 16) - 1) << 4) | (clamp_val(at.rec8b, 1, 16) - 1));
        /* Drive timing */
        pci_write_config_byte(pdev, offset + 0x08 + (3 - dn),
-                ((FIT(at.active, 1, 16) - 1) << 4) | (FIT(at.recover, 1, 16) - 1));
+                ((clamp_val(at.active, 1, 16) - 1) << 4) | (clamp_val(at.recover, 1, 16) - 1));
        switch (clock) {
                case 1:
-                t = at.udma ? (0xc0 | (FIT(at.udma, 2, 5) - 2)) : 0x03;
+                t = at.udma ? (0xc0 | (clamp_val(at.udma, 2, 5) - 2)) : 0x03;
                break;
                case 2:
-                t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 2, 10)]) : 0x03;
+                t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 2, 10)]) : 0x03;
                break;
                case 3:
-                t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 1, 10)]) : 0x03;
+                t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 1, 10)]) : 0x03;
                break;
                case 4:
-                t = at.udma ? (0xc0 | amd_cyc2udma[FIT(at.udma, 1, 15)]) : 0x03;
+                t = at.udma ? (0xc0 | amd_cyc2udma[clamp_val(at.udma, 1, 15)]) : 0x03;
                break;
                default:
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
index 5e104385d6a3..82fb6e273169 100644
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
@@ -291,8 +291,6 @@ static int __init pata_at32_probe(struct platform_device *pdev)
        if (!info)
                return -ENOMEM;
-        memset(info, 0, sizeof(struct at32_ide_info));
        info->irq = irq;
        info->cs  = board->cs;
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 9ab89732cf94..55516103626a 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -911,7 +911,10 @@ static void bfin_bmdma_start(struct ata_queued_cmd *qc)
        /* Reset all transfer count */
        ATAPI_SET_CONTROL(base, ATAPI_GET_CONTROL(base) | TFRCNT_RST);
-                /* Set transfer length to buffer len */
+        /* Set ATAPI state machine contorl in terminate sequence */
+        ATAPI_SET_CONTROL(base, ATAPI_GET_CONTROL(base) | END_ON_TERM);
+        /* Set transfer length to buffer len */
        for_each_sg(qc->sg, sg, qc->n_elem, si) {
                ATAPI_SET_XFER_LEN(base, (sg_dma_len(sg) >> 1));
        }
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index a9c3218e22fd..2ff62608ae37 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -62,14 +62,14 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev)
                return;
        }
-        time_16 = FIT(t.recover, 0, 15) | (FIT(t.active, 0, 15) << 4);
+        time_16 = clamp_val(t.recover, 0, 15) | (clamp_val(t.active, 0, 15) << 4);
-        time_8 = FIT(t.act8b, 0, 15) | (FIT(t.rec8b, 0, 15) << 4);
+        time_8 = clamp_val(t.act8b, 0, 15) | (clamp_val(t.rec8b, 0, 15) << 4);
        if (adev->devno == 0) {
                pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr);
                addr &= ~0x0F;  /* Mask bits */
-                addr |= FIT(t.setup, 0, 15);
+                addr |= clamp_val(t.setup, 0, 15);
                pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr);
                pci_write_config_byte(pdev, CY82_IDE_MASTER_IOR, time_16);
@@ -79,7 +79,7 @@ static void cy82c693_set_piomode(struct ata_port *ap, struct ata_device *adev)
                pci_read_config_dword(pdev, CY82_IDE_ADDRSETUP, &addr);
                addr &= ~0xF0;  /* Mask bits */
-                addr |= (FIT(t.setup, 0, 15) << 4);
+                addr |= (clamp_val(t.setup, 0, 15) << 4);
                pci_write_config_dword(pdev, CY82_IDE_ADDRSETUP, addr);
                pci_write_config_byte(pdev, CY82_IDE_SLAVE_IOR, time_16);
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 7af4b29cc422..fe7cc8ed4ea4 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -343,8 +343,8 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev)
        /* Get the timing data in cycles. For now play safe at 50Mhz */
        ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);
-        active = FIT(t.active, 2, 15);
+        active = clamp_val(t.active, 2, 15);
-        recover = FIT(t.recover, 4, 15);
+        recover = clamp_val(t.recover, 4, 15);
        inb(0x3E6);
        inb(0x3E6);
@@ -377,8 +377,8 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
        /* Get the timing data in cycles. For now play safe at 50Mhz */
        ata_timing_compute(adev, adev->pio_mode, &t, 20000, 1000);
-        active = FIT(t.active, 2, 15);
+        active = clamp_val(t.active, 2, 15);
-        recover = FIT(t.recover, 2, 16);
+        recover = clamp_val(t.recover, 2, 16);
        recover &= 0x15;
        inb(0x3E6);
@@ -462,9 +462,9 @@ static void opti82c611a_set_piomode(struct ata_port *ap,
                ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP);
        }
-        active = FIT(t.active, 2, 17) - 2;
+        active = clamp_val(t.active, 2, 17) - 2;
-        recover = FIT(t.recover, 1, 16) - 1;
+        recover = clamp_val(t.recover, 1, 16) - 1;
-        setup = FIT(t.setup, 1, 4) - 1;
+        setup = clamp_val(t.setup, 1, 4) - 1;
        /* Select the right timing bank for write timing */
        rc = ioread8(ap->ioaddr.lbal_addr);
@@ -541,9 +541,9 @@ static void opti82c46x_set_piomode(struct ata_port *ap, struct ata_device *adev)
                ata_timing_merge(&t, &tp, &t, ATA_TIMING_SETUP);
        }
-        active = FIT(t.active, 2, 17) - 2;
+        active = clamp_val(t.active, 2, 17) - 2;
-        recover = FIT(t.recover, 1, 16) - 1;
+        recover = clamp_val(t.recover, 1, 16) - 1;
-        setup = FIT(t.setup, 1, 4) - 1;
+        setup = clamp_val(t.setup, 1, 4) - 1;
        /* Select the right timing bank for write timing */
        rc = ioread8(ap->ioaddr.lbal_addr);
@@ -624,11 +624,11 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
        ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
        if (ld_qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
+                active = 8 - clamp_val(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
        } else {
-                active = 9 - FIT(t.active, 2, 9);
+                active = 9 - clamp_val(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
        }
        timing = (recovery << 4) | active | 0x08;
@@ -658,11 +658,11 @@ static void qdi6580dp_set_piomode(struct ata_port *ap, struct ata_device *adev)
        ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
        if (ld_qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
+                active = 8 - clamp_val(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
        } else {
-                active = 9 - FIT(t.active, 2, 9);
+                active = 9 - clamp_val(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
        }
        timing = (recovery << 4) | active | 0x08;
@@ -695,11 +695,11 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
        ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
        if (ld_qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
+                active = 8 - clamp_val(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
        } else {
-                active = 9 - FIT(t.active, 2, 9);
+                active = 9 - clamp_val(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
        }
        timing = (recovery << 4) | active | 0x08;
        ld_qdi->clock[adev->devno] = timing;
@@ -830,8 +830,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
        else
                ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
-        active = (FIT(t.active, 3, 17) - 1) & 0x0F;
+        active = (clamp_val(t.active, 3, 17) - 1) & 0x0F;
-        recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;
+        recovery = (clamp_val(t.recover, 1, 15) + 1) & 0x0F;
        timing = (active << 4) | recovery;
        winbond_writecfg(ld_winbond->timing, timing, reg);
@@ -842,7 +842,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
                reg |= 0x08;    /* FIFO off */
        if (!ata_pio_need_iordy(adev))
                reg |= 0x02;    /* IORDY off */
-        reg |= (FIT(t.setup, 0, 3) << 6);
+        reg |= (clamp_val(t.setup, 0, 3) << 6);
        winbond_writecfg(ld_winbond->timing, timing + 1, reg);
 }
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 76d2455bc453..be756b7ef07e 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -91,9 +91,9 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev)
                return;
        }
-        at.active = FIT(at.active, 2, 16) - 2;
+        at.active = clamp_val(at.active, 2, 16) - 2;
-        at.setup = FIT(at.setup, 1, 4) - 1;
+        at.setup = clamp_val(at.setup, 1, 4) - 1;
-        at.recover = FIT(at.recover, 1, 12) - 1;
+        at.recover = clamp_val(at.recover, 1, 12) - 1;
        idetcr = (at.setup << 6) | (recoverbits[at.recover] << 3) | activebits[at.active];
diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
index ae92b0049bd5..e0aa7eaaee0a 100644
--- a/drivers/ata/pata_ns87415.c
+++ b/drivers/ata/pata_ns87415.c
@@ -66,8 +66,8 @@ static void ns87415_set_mode(struct ata_port *ap, struct ata_device *adev, u8 mo
        ata_timing_compute(adev, adev->pio_mode, &t, T, 0);
-        clocking = 17 - FIT(t.active, 2, 17);
+        clocking = 17 - clamp_val(t.active, 2, 17);
-        clocking |= (16 - FIT(t.recover, 1, 16)) << 4;
+        clocking |= (16 - clamp_val(t.recover, 1, 16)) << 4;
        /* Use the same timing for read and write bytes */
        clocking |= (clocking << 8);
        pci_write_config_word(dev, timing, clocking);
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index bf45cf017753..97e5b090d7c2 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -60,11 +60,11 @@ static void qdi6500_set_piomode(struct ata_port *ap, struct ata_device *adev)
        ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
        if (qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
+                active = 8 - clamp_val(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
        } else {
-                active = 9 - FIT(t.active, 2, 9);
+                active = 9 - clamp_val(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
        }
        timing = (recovery << 4) | active | 0x08;
@@ -84,11 +84,11 @@ static void qdi6580_set_piomode(struct ata_port *ap, struct ata_device *adev)
        ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
        if (qdi->fast) {
-                active = 8 - FIT(t.active, 1, 8);
+                active = 8 - clamp_val(t.active, 1, 8);
-                recovery = 18 - FIT(t.recover, 3, 18);
+                recovery = 18 - clamp_val(t.recover, 3, 18);
        } else {
-                active = 9 - FIT(t.active, 2, 9);
+                active = 9 - clamp_val(t.active, 2, 9);
-                recovery = 15 - FIT(t.recover, 0, 15);
+                recovery = 15 - clamp_val(t.recover, 0, 15);
        }
        timing = (recovery << 4) | active | 0x08;
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 70d94fb28a5f..69877bd81815 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -216,7 +216,7 @@ static int sl82c105_qc_defer(struct ata_queued_cmd *qc)
        struct ata_port *alt = host->ports[1 ^ qc->ap->port_no];
        int rc;
-        /* First apply the usual rules */       
+        /* First apply the usual rules */
        rc = ata_std_qc_defer(qc);
        if (rc != 0)
                return rc;
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 2fea6cbe7755..708ed144ede9 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -259,15 +259,15 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
                pci_read_config_byte(pdev, 0x4C, &setup);
                setup &= ~(3 << shift);
-                setup |= FIT(t.setup, 1, 4) << shift;   /* 1,4 or 1,4 - 1  FIXME */
+                setup |= clamp_val(t.setup, 1, 4) << shift;     /* 1,4 or 1,4 - 1  FIXME */
                pci_write_config_byte(pdev, 0x4C, setup);
        }
        /* Load the PIO mode bits */
        pci_write_config_byte(pdev, 0x4F - ap->port_no,
-                ((FIT(t.act8b, 1, 16) - 1) << 4) | (FIT(t.rec8b, 1, 16) - 1));
+                ((clamp_val(t.act8b, 1, 16) - 1) << 4) | (clamp_val(t.rec8b, 1, 16) - 1));
        pci_write_config_byte(pdev, 0x48 + offset,
-                ((FIT(t.active, 1, 16) - 1) << 4) | (FIT(t.recover, 1, 16) - 1));
+                ((clamp_val(t.active, 1, 16) - 1) << 4) | (clamp_val(t.recover, 1, 16) - 1));
        /* Load the UDMA bits according to type */
        switch(udma_type) {
@@ -275,16 +275,16 @@ static void via_do_set_mode(struct ata_port *ap, struct ata_device *adev, int mo
                        /* BUG() ? */
                        /* fall through */
                case 33:
-                        ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 5) - 2)) : 0x03;
+                        ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 5) - 2)) : 0x03;
                        break;
                case 66:
-                        ut = t.udma ? (0xe8 | (FIT(t.udma, 2, 9) - 2)) : 0x0f;
+                        ut = t.udma ? (0xe8 | (clamp_val(t.udma, 2, 9) - 2)) : 0x0f;
                        break;
                case 100:
-                        ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
+                        ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 9) - 2)) : 0x07;
                        break;
                case 133:
-                        ut = t.udma ? (0xe0 | (FIT(t.udma, 2, 9) - 2)) : 0x07;
+                        ut = t.udma ? (0xe0 | (clamp_val(t.udma, 2, 9) - 2)) : 0x07;
                        break;
        }
diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
index 6e52a3573fbf..474528f8fe3d 100644
--- a/drivers/ata/pata_winbond.c
+++ b/drivers/ata/pata_winbond.c
@@ -75,8 +75,8 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
        else
                ata_timing_compute(adev, adev->pio_mode, &t, 30303, 1000);
-        active = (FIT(t.active, 3, 17) - 1) & 0x0F;
+        active = (clamp_val(t.active, 3, 17) - 1) & 0x0F;
-        recovery = (FIT(t.recover, 1, 15) + 1) & 0x0F;
+        recovery = (clamp_val(t.recover, 1, 15) + 1) & 0x0F;
        timing = (active << 4) | recovery;
        winbond_writecfg(winbond->config, timing, reg);
@@ -87,7 +87,7 @@ static void winbond_set_piomode(struct ata_port *ap, struct ata_device *adev)
                reg |= 0x08;    /* FIFO off */
        if (!ata_pio_need_iordy(adev))
                reg |= 0x02;    /* IORDY off */
-        reg |= (FIT(t.setup, 0, 3) << 6);
+        reg |= (clamp_val(t.setup, 0, 3) << 6);
        winbond_writecfg(winbond->config, timing + 1, reg);
 }
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index bb73b2222627..fb81f0c7a8c2 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -72,7 +72,7 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_mv"
-#define DRV_VERSION     "1.20"
+#define DRV_VERSION     "1.21"
 enum {
        /* BAR's are enumerated in terms of pci_resource_start() terms */
@@ -128,8 +128,13 @@ enum {
        MV_COMMON_FLAGS         = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                  ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI |
                                  ATA_FLAG_PIO_POLLING,
        MV_6XXX_FLAGS           = MV_FLAG_IRQ_COALESCE,
+        MV_GENIIE_FLAGS         = MV_COMMON_FLAGS | MV_6XXX_FLAGS |
+                                  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |
+                                  ATA_FLAG_NCQ | ATA_FLAG_AN,
        CRQB_FLAG_READ          = (1 << 0),
        CRQB_TAG_SHIFT          = 1,
        CRQB_IOID_SHIFT         = 6,    /* CRQB Gen-II/IIE IO Id shift */
@@ -197,13 +202,6 @@ enum {
        HC_MAIN_RSVD            = (0x7f << 25), /* bits 31-25 */
        HC_MAIN_RSVD_5          = (0x1fff << 19), /* bits 31-19 */
        HC_MAIN_RSVD_SOC        = (0x3fffffb << 6),     /* bits 31-9, 7-6 */
-        HC_MAIN_MASKED_IRQS     = (TRAN_LO_DONE | TRAN_HI_DONE |
-                                   PORTS_0_3_COAL_DONE | PORTS_4_7_COAL_DONE |
-                                   PORTS_0_7_COAL_DONE | GPIO_INT | TWSI_INT |
-                                   HC_MAIN_RSVD),
-        HC_MAIN_MASKED_IRQS_5   = (PORTS_0_3_COAL_DONE | PORTS_4_7_COAL_DONE |
-                                   HC_MAIN_RSVD_5),
-        HC_MAIN_MASKED_IRQS_SOC = (PORTS_0_3_COAL_DONE | HC_MAIN_RSVD_SOC),
        /* SATAHC registers */
        HC_CFG_OFS              = 0,
@@ -221,6 +219,7 @@ enum {
        SATA_STATUS_OFS         = 0x300,  /* ctrl, err regs follow status */
        SATA_ACTIVE_OFS         = 0x350,
        SATA_FIS_IRQ_CAUSE_OFS  = 0x364,
+        SATA_FIS_IRQ_AN         = (1 << 9),     /* async notification */
        LTMODE_OFS              = 0x30c,
        LTMODE_BIT8             = (1 << 8),     /* unknown, but necessary */
@@ -459,6 +458,7 @@ struct mv_port_signal {
 struct mv_host_priv {
        u32                     hp_flags;
+        u32                     main_irq_mask;
        struct mv_port_signal   signal[8];
        const struct mv_hw_ops  *ops;
        int                     n_ports;
@@ -640,25 +640,19 @@ static const struct ata_port_info mv_port_info[] = {
                .port_ops       = &mv6_ops,
        },
        {  /* chip_6042 */
-                .flags          = MV_COMMON_FLAGS | MV_6XXX_FLAGS |
+                .flags          = MV_GENIIE_FLAGS,
-                                  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |
-                                  ATA_FLAG_NCQ,
                .pio_mask       = 0x1f, /* pio0-4 */
                .udma_mask      = ATA_UDMA6,
                .port_ops       = &mv_iie_ops,
        },
        {  /* chip_7042 */
-                .flags          = MV_COMMON_FLAGS | MV_6XXX_FLAGS |
+                .flags          = MV_GENIIE_FLAGS,
-                                  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |
-                                  ATA_FLAG_NCQ,
                .pio_mask       = 0x1f, /* pio0-4 */
                .udma_mask      = ATA_UDMA6,
                .port_ops       = &mv_iie_ops,
        },
        {  /* chip_soc */
-                .flags          = MV_COMMON_FLAGS | MV_6XXX_FLAGS |
+                .flags          = MV_GENIIE_FLAGS | MV_FLAG_SOC,
-                                  ATA_FLAG_PMP | ATA_FLAG_ACPI_SATA |
-                                  ATA_FLAG_NCQ | MV_FLAG_SOC,
                .pio_mask       = 0x1f, /* pio0-4 */
                .udma_mask      = ATA_UDMA6,
                .port_ops       = &mv_iie_ops,
@@ -844,6 +838,33 @@ static void mv_set_edma_ptrs(void __iomem *port_mmio,
                 port_mmio + EDMA_RSP_Q_OUT_PTR_OFS);
 }
+static void mv_set_main_irq_mask(struct ata_host *host,
+                                 u32 disable_bits, u32 enable_bits)
+{
+        struct mv_host_priv *hpriv = host->private_data;
+        u32 old_mask, new_mask;
+        old_mask = hpriv->main_irq_mask;
+        new_mask = (old_mask & ~disable_bits) | enable_bits;
+        if (new_mask != old_mask) {
+                hpriv->main_irq_mask = new_mask;
+                writelfl(new_mask, hpriv->main_irq_mask_addr);
+        }
+}
+static void mv_enable_port_irqs(struct ata_port *ap,
+                                     unsigned int port_bits)
+{
+        unsigned int shift, hardport, port = ap->port_no;
+        u32 disable_bits, enable_bits;
+        MV_PORT_TO_SHIFT_AND_HARDPORT(port, shift, hardport);
+        disable_bits = (DONE_IRQ | ERR_IRQ) << shift;
+        enable_bits  = port_bits << shift;
+        mv_set_main_irq_mask(ap->host, disable_bits, enable_bits);
+}
 /**
 *      mv_start_dma - Enable eDMA engine
 *      @base: port base address
@@ -886,9 +907,11 @@ static void mv_start_dma(struct ata_port *ap, void __iomem *port_mmio,
                mv_edma_cfg(ap, want_ncq);
                /* clear FIS IRQ Cause */
-                writelfl(0, port_mmio + SATA_FIS_IRQ_CAUSE_OFS);
+                if (IS_GEN_IIE(hpriv))
+                        writelfl(0, port_mmio + SATA_FIS_IRQ_CAUSE_OFS);
                mv_set_edma_ptrs(port_mmio, hpriv, pp);
+                mv_enable_port_irqs(ap, DONE_IRQ|ERR_IRQ);
                writelfl(EDMA_EN, port_mmio + EDMA_CMD_OFS);
                pp->pp_flags |= MV_PP_FLAG_EDMA_EN;
@@ -1341,6 +1364,7 @@ out_port_free_dma_mem:
 static void mv_port_stop(struct ata_port *ap)
 {
        mv_stop_edma(ap);
+        mv_enable_port_irqs(ap, 0);
        mv_port_free_dma_mem(ap);
 }
@@ -1582,6 +1606,7 @@ static unsigned int mv_qc_issue(struct ata_queued_cmd *qc)
                 * shadow block, etc registers.
                 */
                mv_stop_edma(ap);
+                mv_enable_port_irqs(ap, ERR_IRQ);
                mv_pmp_select(ap, qc->dev->link->pmp);
                return ata_sff_qc_issue(qc);
        }
@@ -1670,6 +1695,18 @@ static void mv_pmp_eh_prep(struct ata_port *ap, unsigned int pmp_map)
        }
 }
+static int mv_req_q_empty(struct ata_port *ap)
+{
+        void __iomem *port_mmio = mv_ap_base(ap);
+        u32 in_ptr, out_ptr;
+        in_ptr  = (readl(port_mmio + EDMA_REQ_Q_IN_PTR_OFS)
+                        >> EDMA_REQ_Q_PTR_SHIFT) & MV_MAX_Q_DEPTH_MASK;
+        out_ptr = (readl(port_mmio + EDMA_REQ_Q_OUT_PTR_OFS)
+                        >> EDMA_REQ_Q_PTR_SHIFT) & MV_MAX_Q_DEPTH_MASK;
+        return (in_ptr == out_ptr);     /* 1 == queue_is_empty */
+}
 static int mv_handle_fbs_ncq_dev_err(struct ata_port *ap)
 {
        struct mv_port_priv *pp = ap->private_data;
@@ -1703,7 +1740,7 @@ static int mv_handle_fbs_ncq_dev_err(struct ata_port *ap)
                        ap->qc_active, failed_links,
                        ap->nr_active_links);
-        if (ap->nr_active_links <= failed_links) {
+        if (ap->nr_active_links <= failed_links && mv_req_q_empty(ap)) {
                mv_process_crpb_entries(ap, pp);
                mv_stop_edma(ap);
                mv_eh_freeze(ap);
@@ -1812,6 +1849,7 @@ static void mv_err_intr(struct ata_port *ap)
 {
        void __iomem *port_mmio = mv_ap_base(ap);
        u32 edma_err_cause, eh_freeze_mask, serr = 0;
+        u32 fis_cause = 0;
        struct mv_port_priv *pp = ap->private_data;
        struct mv_host_priv *hpriv = ap->host->private_data;
        unsigned int action = 0, err_mask = 0;
@@ -1821,16 +1859,19 @@ static void mv_err_intr(struct ata_port *ap)
        /*
         * Read and clear the SError and err_cause bits.
+         * For GenIIe, if EDMA_ERR_TRANS_IRQ_7 is set, we also must read/clear
+         * the FIS_IRQ_CAUSE register before clearing edma_err_cause.
         */
        sata_scr_read(&ap->link, SCR_ERROR, &serr);
        sata_scr_write_flush(&ap->link, SCR_ERROR, serr);
        edma_err_cause = readl(port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
+        if (IS_GEN_IIE(hpriv) && (edma_err_cause & EDMA_ERR_TRANS_IRQ_7)) {
+                fis_cause = readl(port_mmio + SATA_FIS_IRQ_CAUSE_OFS);
+                writelfl(~fis_cause, port_mmio + SATA_FIS_IRQ_CAUSE_OFS);
+        }
        writelfl(~edma_err_cause, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
-        ata_port_printk(ap, KERN_INFO, "%s: err_cause=%08x pp_flags=0x%x\n",
-                        __func__, edma_err_cause, pp->pp_flags);
        if (edma_err_cause & EDMA_ERR_DEV) {
                /*
                 * Device errors during FIS-based switching operation
@@ -1844,6 +1885,18 @@ static void mv_err_intr(struct ata_port *ap)
        ata_ehi_clear_desc(ehi);
        ata_ehi_push_desc(ehi, "edma_err_cause=%08x pp_flags=%08x",
                          edma_err_cause, pp->pp_flags);
+        if (IS_GEN_IIE(hpriv) && (edma_err_cause & EDMA_ERR_TRANS_IRQ_7)) {
+                ata_ehi_push_desc(ehi, "fis_cause=%08x", fis_cause);
+                if (fis_cause & SATA_FIS_IRQ_AN) {
+                        u32 ec = edma_err_cause &
+                               ~(EDMA_ERR_TRANS_IRQ_7 | EDMA_ERR_IRQ_TRANSIENT);
+                        sata_async_notification(ap);
+                        if (!ec)
+                                return; /* Just an AN; no need for the nukes */
+                        ata_ehi_push_desc(ehi, "SDB notify");
+                }
+        }
        /*
         * All generations share these EDMA error cause bits:
         */
@@ -2162,20 +2215,20 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance)
        struct ata_host *host = dev_instance;
        struct mv_host_priv *hpriv = host->private_data;
        unsigned int handled = 0;
-        u32 main_irq_cause, main_irq_mask;
+        u32 main_irq_cause, pending_irqs;
        spin_lock(&host->lock);
        main_irq_cause = readl(hpriv->main_irq_cause_addr);
-        main_irq_mask  = readl(hpriv->main_irq_mask_addr);
+        pending_irqs   = main_irq_cause & hpriv->main_irq_mask;
        /*
         * Deal with cases where we either have nothing pending, or have read
         * a bogus register value which can indicate HW removal or PCI fault.
         */
-        if ((main_irq_cause & main_irq_mask) && (main_irq_cause != 0xffffffffU)) {
+        if (pending_irqs && main_irq_cause != 0xffffffffU) {
-                if (unlikely((main_irq_cause & PCI_ERR) && HAS_PCI(host)))
+                if (unlikely((pending_irqs & PCI_ERR) && HAS_PCI(host)))
                        handled = mv_pci_error(host, hpriv->base);
                else
-                        handled = mv_host_intr(host, main_irq_cause);
+                        handled = mv_host_intr(host, pending_irqs);
        }
        spin_unlock(&host->lock);
        return IRQ_RETVAL(handled);
@@ -2373,7 +2426,6 @@ static void mv_reset_pci_bus(struct ata_host *host, void __iomem *mmio)
        ZERO(MV_PCI_DISC_TIMER);
        ZERO(MV_PCI_MSI_TRIGGER);
        writel(0x000100ff, mmio + MV_PCI_XBAR_TMOUT_OFS);
-        ZERO(PCI_HC_MAIN_IRQ_MASK_OFS);
        ZERO(MV_PCI_SERR_MASK);
        ZERO(hpriv->irq_cause_ofs);
        ZERO(hpriv->irq_mask_ofs);
@@ -2728,6 +2780,7 @@ static int mv_hardreset(struct ata_link *link, unsigned int *class,
                rc = sata_link_hardreset(link, timing, deadline + extra,
                                         &online, NULL);
+                rc = online ? -EAGAIN : rc;
                if (rc)
                        return rc;
                sata_scr_read(link, SCR_STATUS, &sstatus);
@@ -2744,32 +2797,18 @@ static int mv_hardreset(struct ata_link *link, unsigned int *class,
 static void mv_eh_freeze(struct ata_port *ap)
 {
-        struct mv_host_priv *hpriv = ap->host->private_data;
-        unsigned int shift, hardport, port = ap->port_no;
-        u32 main_irq_mask;
-        /* FIXME: handle coalescing completion events properly */
        mv_stop_edma(ap);
-        MV_PORT_TO_SHIFT_AND_HARDPORT(port, shift, hardport);
+        mv_enable_port_irqs(ap, 0);
-        /* disable assertion of portN err, done events */
-        main_irq_mask = readl(hpriv->main_irq_mask_addr);
-        main_irq_mask &= ~((DONE_IRQ | ERR_IRQ) << shift);
-        writelfl(main_irq_mask, hpriv->main_irq_mask_addr);
 }
 static void mv_eh_thaw(struct ata_port *ap)
 {
        struct mv_host_priv *hpriv = ap->host->private_data;
-        unsigned int shift, hardport, port = ap->port_no;
+        unsigned int port = ap->port_no;
+        unsigned int hardport = mv_hardport_from_port(port);
        void __iomem *hc_mmio = mv_hc_base_from_port(hpriv->base, port);
        void __iomem *port_mmio = mv_ap_base(ap);
-        u32 main_irq_mask, hc_irq_cause;
+        u32 hc_irq_cause;
-        /* FIXME: handle coalescing completion events properly */
-        MV_PORT_TO_SHIFT_AND_HARDPORT(port, shift, hardport);
        /* clear EDMA errors on this port */
        writel(0, port_mmio + EDMA_ERR_IRQ_CAUSE_OFS);
@@ -2779,10 +2818,7 @@ static void mv_eh_thaw(struct ata_port *ap)
        hc_irq_cause &= ~((DEV_IRQ | DMA_IRQ) << hardport);
        writelfl(hc_irq_cause, hc_mmio + HC_IRQ_CAUSE_OFS);
-        /* enable assertion of portN err, done events */
+        mv_enable_port_irqs(ap, ERR_IRQ);
-        main_irq_mask = readl(hpriv->main_irq_mask_addr);
-        main_irq_mask |= ((DONE_IRQ | ERR_IRQ) << shift);
-        writelfl(main_irq_mask, hpriv->main_irq_mask_addr);
 }
 /**
@@ -3035,7 +3071,7 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx)
        }
        /* global interrupt mask: 0 == mask everything */
-        writel(0, hpriv->main_irq_mask_addr);
+        mv_set_main_irq_mask(host, ~0, 0);
        n_hc = mv_get_hc_count(host->ports[0]->flags);
@@ -3083,25 +3119,12 @@ static int mv_init_host(struct ata_host *host, unsigned int board_idx)
                /* and unmask interrupt generation for host regs */
                writelfl(hpriv->unmask_all_irqs, mmio + hpriv->irq_mask_ofs);
-                if (IS_GEN_I(hpriv))
-                        writelfl(~HC_MAIN_MASKED_IRQS_5,
+                /*
-                                 hpriv->main_irq_mask_addr);
+                 * enable only global host interrupts for now.
-                else
+                 * The per-port interrupts get done later as ports are set up.
-                        writelfl(~HC_MAIN_MASKED_IRQS,
+                 */
-                                 hpriv->main_irq_mask_addr);
+                mv_set_main_irq_mask(host, 0, PCI_ERR);
-                VPRINTK("HC MAIN IRQ cause/mask=0x%08x/0x%08x "
-                        "PCI int cause/mask=0x%08x/0x%08x\n",
-                        readl(hpriv->main_irq_cause_addr),
-                        readl(hpriv->main_irq_mask_addr),
-                        readl(mmio + hpriv->irq_cause_ofs),
-                        readl(mmio + hpriv->irq_mask_ofs));
-        } else {
-                writelfl(~HC_MAIN_MASKED_IRQS_SOC,
-                         hpriv->main_irq_mask_addr);
-                VPRINTK("HC MAIN IRQ cause/mask=0x%08x/0x%08x\n",
-                        readl(hpriv->main_irq_cause_addr),
-                        readl(hpriv->main_irq_mask_addr));
        }
 done:
        return rc;
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 5a10dc5048ad..030665ba76b7 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -53,7 +53,15 @@ enum {
        PDC_MMIO_BAR            = 3,
        PDC_MAX_PRD             = LIBATA_MAX_PRD - 1, /* -1 for ASIC PRD bug workaround */
-        /* register offsets */
+        /* host register offsets (from host->iomap[PDC_MMIO_BAR]) */
+        PDC_INT_SEQMASK         = 0x40, /* Mask of asserted SEQ INTs */
+        PDC_FLASH_CTL           = 0x44, /* Flash control register */
+        PDC_SATA_PLUG_CSR       = 0x6C, /* SATA Plug control/status reg */
+        PDC2_SATA_PLUG_CSR      = 0x60, /* SATAII Plug control/status reg */
+        PDC_TBG_MODE            = 0x41C, /* TBG mode (not SATAII) */
+        PDC_SLEW_CTL            = 0x470, /* slew rate control reg (not SATAII) */
+        /* per-port ATA register offsets (from ap->ioaddr.cmd_addr) */
        PDC_FEATURE             = 0x04, /* Feature/Error reg (per port) */
        PDC_SECTOR_COUNT        = 0x08, /* Sector count reg (per port) */
        PDC_SECTOR_NUMBER       = 0x0C, /* Sector number reg (per port) */
@@ -63,14 +71,11 @@ enum {
        PDC_COMMAND             = 0x1C, /* Command/status reg (per port) */
        PDC_ALTSTATUS           = 0x38, /* Alternate-status/device-control reg (per port) */
        PDC_PKT_SUBMIT          = 0x40, /* Command packet pointer addr */
-        PDC_INT_SEQMASK         = 0x40, /* Mask of asserted SEQ INTs */
-        PDC_FLASH_CTL           = 0x44, /* Flash control register */
        PDC_GLOBAL_CTL          = 0x48, /* Global control/status (per port) */
        PDC_CTLSTAT             = 0x60, /* IDE control and status (per port) */
-        PDC_SATA_PLUG_CSR       = 0x6C, /* SATA Plug control/status reg */
-        PDC2_SATA_PLUG_CSR      = 0x60, /* SATAII Plug control/status reg */
+        /* per-port SATA register offsets (from ap->ioaddr.scr_addr) */
-        PDC_TBG_MODE            = 0x41C, /* TBG mode (not SATAII) */
+        PDC_PHYMODE4            = 0x14,
-        PDC_SLEW_CTL            = 0x470, /* slew rate control reg (not SATAII) */
        /* PDC_GLOBAL_CTL bit definitions */
        PDC_PH_ERR              = (1 <<  8), /* PCI error while loading packet */
@@ -134,7 +139,7 @@ struct pdc_port_priv {
 static int pdc_sata_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);
 static int pdc_sata_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);
-static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
+static int pdc_ata_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
 static int pdc_common_port_start(struct ata_port *ap);
 static int pdc_sata_port_start(struct ata_port *ap);
 static void pdc_qc_prep(struct ata_queued_cmd *qc);
@@ -332,12 +337,12 @@ static int pdc_sata_port_start(struct ata_port *ap)
        /* fix up PHYMODE4 align timing */
        if (ap->flags & PDC_FLAG_GEN_II) {
-                void __iomem *mmio = ap->ioaddr.scr_addr;
+                void __iomem *sata_mmio = ap->ioaddr.scr_addr;
                unsigned int tmp;
-                tmp = readl(mmio + 0x014);
+                tmp = readl(sata_mmio + PDC_PHYMODE4);
                tmp = (tmp & ~3) | 1;   /* set bits 1:0 = 0:1 */
-                writel(tmp, mmio + 0x014);
+                writel(tmp, sata_mmio + PDC_PHYMODE4);
        }
        return 0;
@@ -345,32 +350,32 @@ static int pdc_sata_port_start(struct ata_port *ap)
 static void pdc_reset_port(struct ata_port *ap)
 {
-        void __iomem *mmio = ap->ioaddr.cmd_addr + PDC_CTLSTAT;
+        void __iomem *ata_ctlstat_mmio = ap->ioaddr.cmd_addr + PDC_CTLSTAT;
        unsigned int i;
        u32 tmp;
        for (i = 11; i > 0; i--) {
-                tmp = readl(mmio);
+                tmp = readl(ata_ctlstat_mmio);
                if (tmp & PDC_RESET)
                        break;
                udelay(100);
                tmp |= PDC_RESET;
-                writel(tmp, mmio);
+                writel(tmp, ata_ctlstat_mmio);
        }
        tmp &= ~PDC_RESET;
-        writel(tmp, mmio);
+        writel(tmp, ata_ctlstat_mmio);
-        readl(mmio);    /* flush */
+        readl(ata_ctlstat_mmio);        /* flush */
 }
 static int pdc_pata_cable_detect(struct ata_port *ap)
 {
        u8 tmp;
-        void __iomem *mmio = ap->ioaddr.cmd_addr + PDC_CTLSTAT + 0x03;
+        void __iomem *ata_mmio = ap->ioaddr.cmd_addr;
-        tmp = readb(mmio);
+        tmp = readb(ata_mmio + PDC_CTLSTAT + 3);
        if (tmp & 0x01)
                return ATA_CBL_PATA40;
        return ATA_CBL_PATA80;
@@ -557,31 +562,25 @@ static void pdc_qc_prep(struct ata_queued_cmd *qc)
        switch (qc->tf.protocol) {
        case ATA_PROT_DMA:
                pdc_fill_sg(qc);
-                /* fall through */
+                /*FALLTHROUGH*/
        case ATA_PROT_NODATA:
                i = pdc_pkt_header(&qc->tf, qc->ap->prd_dma,
                                   qc->dev->devno, pp->pkt);
                if (qc->tf.flags & ATA_TFLAG_LBA48)
                        i = pdc_prep_lba48(&qc->tf, pp->pkt, i);
                else
                        i = pdc_prep_lba28(&qc->tf, pp->pkt, i);
                pdc_pkt_footer(&qc->tf, pp->pkt, i);
                break;
        case ATAPI_PROT_PIO:
                pdc_fill_sg(qc);
                break;
        case ATAPI_PROT_DMA:
                pdc_fill_sg(qc);
                /*FALLTHROUGH*/
        case ATAPI_PROT_NODATA:
                pdc_atapi_pkt(qc);
                break;
        default:
                break;
        }
@@ -611,7 +610,7 @@ static unsigned int pdc_sata_ata_port_to_ata_no(const struct ata_port *ap)
        unsigned int nr_ports = pdc_sata_nr_ports(ap);
        unsigned int i;
-        for(i = 0; i < nr_ports && host->ports[i] != ap; ++i)
+        for (i = 0; i < nr_ports && host->ports[i] != ap; ++i)
                ;
        BUG_ON(i >= nr_ports);
        return pdc_port_no_to_ata_no(i, pdc_is_sataii_tx4(ap->flags));
@@ -624,14 +623,14 @@ static unsigned int pdc_sata_hotplug_offset(const struct ata_port *ap)
 static void pdc_freeze(struct ata_port *ap)
 {
-        void __iomem *mmio = ap->ioaddr.cmd_addr;
+        void __iomem *ata_mmio = ap->ioaddr.cmd_addr;
        u32 tmp;
-        tmp = readl(mmio + PDC_CTLSTAT);
+        tmp = readl(ata_mmio + PDC_CTLSTAT);
        tmp |= PDC_IRQ_DISABLE;
        tmp &= ~PDC_DMA_ENABLE;
-        writel(tmp, mmio + PDC_CTLSTAT);
+        writel(tmp, ata_mmio + PDC_CTLSTAT);
-        readl(mmio + PDC_CTLSTAT); /* flush */
+        readl(ata_mmio + PDC_CTLSTAT); /* flush */
 }
 static void pdc_sata_freeze(struct ata_port *ap)
@@ -659,17 +658,17 @@ static void pdc_sata_freeze(struct ata_port *ap)
 static void pdc_thaw(struct ata_port *ap)
 {
-        void __iomem *mmio = ap->ioaddr.cmd_addr;
+        void __iomem *ata_mmio = ap->ioaddr.cmd_addr;
        u32 tmp;
        /* clear IRQ */
-        readl(mmio + PDC_INT_SEQMASK);
+        readl(ata_mmio + PDC_COMMAND);
        /* turn IRQ back on */
-        tmp = readl(mmio + PDC_CTLSTAT);
+        tmp = readl(ata_mmio + PDC_CTLSTAT);
        tmp &= ~PDC_IRQ_DISABLE;
-        writel(tmp, mmio + PDC_CTLSTAT);
+        writel(tmp, ata_mmio + PDC_CTLSTAT);
-        readl(mmio + PDC_CTLSTAT); /* flush */
+        readl(ata_mmio + PDC_CTLSTAT); /* flush */
 }
 static void pdc_sata_thaw(struct ata_port *ap)
@@ -743,11 +742,11 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc,
        ata_port_abort(ap);
 }
-static inline unsigned int pdc_host_intr(struct ata_port *ap,
+static unsigned int pdc_host_intr(struct ata_port *ap,
-                                         struct ata_queued_cmd *qc)
+                                  struct ata_queued_cmd *qc)
 {
        unsigned int handled = 0;
-        void __iomem *port_mmio = ap->ioaddr.cmd_addr;
+        void __iomem *ata_mmio = ap->ioaddr.cmd_addr;
        u32 port_status, err_mask;
        err_mask = PDC_ERR_MASK;
@@ -755,7 +754,7 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap,
                err_mask &= ~PDC1_ERR_MASK;
        else
                err_mask &= ~PDC2_ERR_MASK;
-        port_status = readl(port_mmio + PDC_GLOBAL_CTL);
+        port_status = readl(ata_mmio + PDC_GLOBAL_CTL);
        if (unlikely(port_status & err_mask)) {
                pdc_error_intr(ap, qc, port_status, err_mask);
                return 1;
@@ -770,7 +769,6 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap,
                ata_qc_complete(qc);
                handled = 1;
                break;
        default:
                ap->stats.idle_irq++;
                break;
@@ -781,10 +779,9 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap,
 static void pdc_irq_clear(struct ata_port *ap)
 {
-        struct ata_host *host = ap->host;
+        void __iomem *ata_mmio = ap->ioaddr.cmd_addr;
-        void __iomem *mmio = host->iomap[PDC_MMIO_BAR];
-        readl(mmio + PDC_INT_SEQMASK);
+        readl(ata_mmio + PDC_COMMAND);
 }
 static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
@@ -794,7 +791,7 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
        u32 mask = 0;
        unsigned int i, tmp;
        unsigned int handled = 0;
-        void __iomem *mmio_base;
+        void __iomem *host_mmio;
        unsigned int hotplug_offset, ata_no;
        u32 hotplug_status;
        int is_sataii_tx4;
@@ -806,7 +803,7 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
                return IRQ_NONE;
        }
-        mmio_base = host->iomap[PDC_MMIO_BAR];
+        host_mmio = host->iomap[PDC_MMIO_BAR];
        spin_lock(&host->lock);
@@ -815,26 +812,26 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
                hotplug_offset = PDC2_SATA_PLUG_CSR;
        else
                hotplug_offset = PDC_SATA_PLUG_CSR;
-        hotplug_status = readl(mmio_base + hotplug_offset);
+        hotplug_status = readl(host_mmio + hotplug_offset);
        if (hotplug_status & 0xff)
-                writel(hotplug_status | 0xff, mmio_base + hotplug_offset);
+                writel(hotplug_status | 0xff, host_mmio + hotplug_offset);
        hotplug_status &= 0xff; /* clear uninteresting bits */
        /* reading should also clear interrupts */
-        mask = readl(mmio_base + PDC_INT_SEQMASK);
+        mask = readl(host_mmio + PDC_INT_SEQMASK);
        if (mask == 0xffffffff && hotplug_status == 0) {
                VPRINTK("QUICK EXIT 2\n");
                goto done_irq;
        }
-        mask &= 0xffff;         /* only 16 tags possible */
+        mask &= 0xffff;         /* only 16 SEQIDs possible */
        if (mask == 0 && hotplug_status == 0) {
                VPRINTK("QUICK EXIT 3\n");
                goto done_irq;
        }
-        writel(mask, mmio_base + PDC_INT_SEQMASK);
+        writel(mask, host_mmio + PDC_INT_SEQMASK);
        is_sataii_tx4 = pdc_is_sataii_tx4(host->ports[0]->flags);
@@ -875,23 +872,24 @@ done_irq:
        return IRQ_RETVAL(handled);
 }
-static inline void pdc_packet_start(struct ata_queued_cmd *qc)
+static void pdc_packet_start(struct ata_queued_cmd *qc)
 {
        struct ata_port *ap = qc->ap;
        struct pdc_port_priv *pp = ap->private_data;
-        void __iomem *mmio = ap->host->iomap[PDC_MMIO_BAR];
+        void __iomem *host_mmio = ap->host->iomap[PDC_MMIO_BAR];
+        void __iomem *ata_mmio = ap->ioaddr.cmd_addr;
        unsigned int port_no = ap->port_no;
        u8 seq = (u8) (port_no + 1);
        VPRINTK("ENTER, ap %p\n", ap);
-        writel(0x00000001, mmio + (seq * 4));
+        writel(0x00000001, host_mmio + (seq * 4));
-        readl(mmio + (seq * 4));        /* flush */
+        readl(host_mmio + (seq * 4));   /* flush */
        pp->pkt[2] = seq;
        wmb();                  /* flush PRD, pkt writes */
-        writel(pp->pkt_dma, ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT);
+        writel(pp->pkt_dma, ata_mmio + PDC_PKT_SUBMIT);
-        readl(ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */
+        readl(ata_mmio + PDC_PKT_SUBMIT); /* flush */
 }
 static unsigned int pdc_qc_issue(struct ata_queued_cmd *qc)
@@ -909,11 +907,9 @@ static unsigned int pdc_qc_issue(struct ata_queued_cmd *qc)
        case ATA_PROT_DMA:
                pdc_packet_start(qc);
                return 0;
        default:
                break;
        }
        return ata_sff_qc_issue(qc);
 }
@@ -987,7 +983,7 @@ static void pdc_ata_setup_port(struct ata_port *ap,
 static void pdc_host_init(struct ata_host *host)
 {
-        void __iomem *mmio = host->iomap[PDC_MMIO_BAR];
+        void __iomem *host_mmio = host->iomap[PDC_MMIO_BAR];
        int is_gen2 = host->ports[0]->flags & PDC_FLAG_GEN_II;
        int hotplug_offset;
        u32 tmp;
@@ -1004,38 +1000,38 @@ static void pdc_host_init(struct ata_host *host)
         */
        /* enable BMR_BURST, maybe change FIFO_SHD to 8 dwords */
-        tmp = readl(mmio + PDC_FLASH_CTL);
+        tmp = readl(host_mmio + PDC_FLASH_CTL);
        tmp |= 0x02000; /* bit 13 (enable bmr burst) */
        if (!is_gen2)
                tmp |= 0x10000; /* bit 16 (fifo threshold at 8 dw) */
-        writel(tmp, mmio + PDC_FLASH_CTL);
+        writel(tmp, host_mmio + PDC_FLASH_CTL);
        /* clear plug/unplug flags for all ports */
-        tmp = readl(mmio + hotplug_offset);
+        tmp = readl(host_mmio + hotplug_offset);
-        writel(tmp | 0xff, mmio + hotplug_offset);
+        writel(tmp | 0xff, host_mmio + hotplug_offset);
        /* unmask plug/unplug ints */
-        tmp = readl(mmio + hotplug_offset);
+        tmp = readl(host_mmio + hotplug_offset);
-        writel(tmp & ~0xff0000, mmio + hotplug_offset);
+        writel(tmp & ~0xff0000, host_mmio + hotplug_offset);
        /* don't initialise TBG or SLEW on 2nd generation chips */
        if (is_gen2)
                return;
        /* reduce TBG clock to 133 Mhz. */
-        tmp = readl(mmio + PDC_TBG_MODE);
+        tmp = readl(host_mmio + PDC_TBG_MODE);
        tmp &= ~0x30000; /* clear bit 17, 16*/
        tmp |= 0x10000;  /* set bit 17:16 = 0:1 */
-        writel(tmp, mmio + PDC_TBG_MODE);
+        writel(tmp, host_mmio + PDC_TBG_MODE);
-        readl(mmio + PDC_TBG_MODE);     /* flush */
+        readl(host_mmio + PDC_TBG_MODE);        /* flush */
        msleep(10);
        /* adjust slew rate control register. */
-        tmp = readl(mmio + PDC_SLEW_CTL);
+        tmp = readl(host_mmio + PDC_SLEW_CTL);
        tmp &= 0xFFFFF03F; /* clear bit 11 ~ 6 */
        tmp  |= 0x00000900; /* set bit 11-9 = 100b , bit 8-6 = 100 */
-        writel(tmp, mmio + PDC_SLEW_CTL);
+        writel(tmp, host_mmio + PDC_SLEW_CTL);
 }
 static int pdc_ata_init_one(struct pci_dev *pdev,
@@ -1045,7 +1041,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
        const struct ata_port_info *pi = &pdc_port_info[ent->driver_data];
        const struct ata_port_info *ppi[PDC_MAX_PORTS];
        struct ata_host *host;
-        void __iomem *base;
+        void __iomem *host_mmio;
        int n_ports, i, rc;
        int is_sataii_tx4;
@@ -1062,7 +1058,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
                pcim_pin_device(pdev);
        if (rc)
                return rc;
-        base = pcim_iomap_table(pdev)[PDC_MMIO_BAR];
+        host_mmio = pcim_iomap_table(pdev)[PDC_MMIO_BAR];
        /* determine port configuration and setup host */
        n_ports = 2;
@@ -1072,7 +1068,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
                ppi[i] = pi;
        if (pi->flags & PDC_FLAG_SATA_PATA) {
-                u8 tmp = readb(base + PDC_FLASH_CTL+1);
+                u8 tmp = readb(host_mmio + PDC_FLASH_CTL + 1);
                if (!(tmp & 0x80))
                        ppi[n_ports++] = pi + 1;
        }
@@ -1088,13 +1084,13 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
        for (i = 0; i < host->n_ports; i++) {
                struct ata_port *ap = host->ports[i];
                unsigned int ata_no = pdc_port_no_to_ata_no(i, is_sataii_tx4);
-                unsigned int port_offset = 0x200 + ata_no * 0x80;
+                unsigned int ata_offset = 0x200 + ata_no * 0x80;
                unsigned int scr_offset = 0x400 + ata_no * 0x100;
-                pdc_ata_setup_port(ap, base + port_offset, base + scr_offset);
+                pdc_ata_setup_port(ap, host_mmio + ata_offset, host_mmio + scr_offset);
                ata_port_pbar_desc(ap, PDC_MMIO_BAR, -1, "mmio");
-                ata_port_pbar_desc(ap, PDC_MMIO_BAR, port_offset, "port");
+                ata_port_pbar_desc(ap, PDC_MMIO_BAR, ata_offset, "ata");
        }
        /* initialize adapter */
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 27a110110077..8ee6b5b4ede7 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -899,14 +899,25 @@ static bool sil24_qc_fill_rtf(struct ata_queued_cmd *qc)
 static void sil24_pmp_attach(struct ata_port *ap)
 {
+        u32 *gscr = ap->link.device->gscr;
        sil24_config_pmp(ap, 1);
        sil24_init_port(ap);
+        if (sata_pmp_gscr_vendor(gscr) == 0x11ab &&
+            sata_pmp_gscr_devid(gscr) == 0x4140) {
+                ata_port_printk(ap, KERN_INFO,
+                        "disabling NCQ support due to sil24-mv4140 quirk\n");
+                ap->flags &= ~ATA_FLAG_NCQ;
+        }
 }
 static void sil24_pmp_detach(struct ata_port *ap)
 {
        sil24_init_port(ap);
        sil24_config_pmp(ap, 0);
+        ap->flags |= ATA_FLAG_NCQ;
 }
 static int sil24_pmp_hardreset(struct ata_link *link, unsigned int *class,
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 3eeac5a78581..72eccae4904b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1084,11 +1084,13 @@ static void device_create_release(struct device *dev)
 }
 /**
- * device_create - creates a device and registers it with sysfs
+ * device_create_vargs - creates a device and registers it with sysfs
 * @class: pointer to the struct class that this device should be registered to
 * @parent: pointer to the parent struct device of this new device, if any
 * @devt: the dev_t for the char device to be added
+ * @drvdata: the data to be added to the device for callbacks
 * @fmt: string for the device's name
+ * @args: va_list for the device's name
 *
 * This function can be used by char device classes.  A struct device
 * will be created in sysfs, registered to the specified class.
@@ -1104,10 +1106,10 @@ static void device_create_release(struct device *dev)
 * Note: the struct class passed to this function must have previously
 * been created with a call to class_create().
 */
-struct device *device_create(struct class *class, struct device *parent,
+struct device *device_create_vargs(struct class *class, struct device *parent,
-                             dev_t devt, const char *fmt, ...)
+                                   dev_t devt, void *drvdata, const char *fmt,
+                                   va_list args)
 {
-        va_list args;
        struct device *dev = NULL;
        int retval = -ENODEV;
@@ -1124,10 +1126,9 @@ struct device *device_create(struct class *class, struct device *parent,
        dev->class = class;
        dev->parent = parent;
        dev->release = device_create_release;
+        dev_set_drvdata(dev, drvdata);
-        va_start(args, fmt);
        vsnprintf(dev->bus_id, BUS_ID_SIZE, fmt, args);
-        va_end(args);
        retval = device_register(dev);
        if (retval)
                goto error;
@@ -1138,6 +1139,78 @@ error:
        kfree(dev);
        return ERR_PTR(retval);
 }
+EXPORT_SYMBOL_GPL(device_create_vargs);
+/**
+ * device_create_drvdata - creates a device and registers it with sysfs
+ * @class: pointer to the struct class that this device should be registered to
+ * @parent: pointer to the parent struct device of this new device, if any
+ * @devt: the dev_t for the char device to be added
+ * @drvdata: the data to be added to the device for callbacks
+ * @fmt: string for the device's name
+ *
+ * This function can be used by char device classes.  A struct device
+ * will be created in sysfs, registered to the specified class.
+ *
+ * A "dev" file will be created, showing the dev_t for the device, if
+ * the dev_t is not 0,0.
+ * If a pointer to a parent struct device is passed in, the newly created
+ * struct device will be a child of that device in sysfs.
+ * The pointer to the struct device will be returned from the call.
+ * Any further sysfs files that might be required can be created using this
+ * pointer.
+ *
+ * Note: the struct class passed to this function must have previously
+ * been created with a call to class_create().
+ */
+struct device *device_create_drvdata(struct class *class,
+                                     struct device *parent,
+                                     dev_t devt,
+                                     void *drvdata,
+                                     const char *fmt, ...)
+{
+        va_list vargs;
+        struct device *dev;
+        va_start(vargs, fmt);
+        dev = device_create_vargs(class, parent, devt, drvdata, fmt, vargs);
+        va_end(vargs);
+        return dev;
+}
+EXPORT_SYMBOL_GPL(device_create_drvdata);
+/**
+ * device_create - creates a device and registers it with sysfs
+ * @class: pointer to the struct class that this device should be registered to
+ * @parent: pointer to the parent struct device of this new device, if any
+ * @devt: the dev_t for the char device to be added
+ * @fmt: string for the device's name
+ *
+ * This function can be used by char device classes.  A struct device
+ * will be created in sysfs, registered to the specified class.
+ *
+ * A "dev" file will be created, showing the dev_t for the device, if
+ * the dev_t is not 0,0.
+ * If a pointer to a parent struct device is passed in, the newly created
+ * struct device will be a child of that device in sysfs.
+ * The pointer to the struct device will be returned from the call.
+ * Any further sysfs files that might be required can be created using this
+ * pointer.
+ *
+ * Note: the struct class passed to this function must have previously
+ * been created with a call to class_create().
+ */
+struct device *device_create(struct class *class, struct device *parent,
+                             dev_t devt, const char *fmt, ...)
+{
+        va_list vargs;
+        struct device *dev;
+        va_start(vargs, fmt);
+        dev = device_create_vargs(class, parent, devt, NULL, fmt, vargs);
+        va_end(vargs);
+        return dev;
+}
 EXPORT_SYMBOL_GPL(device_create);
 static int __match_devt(struct device *dev, void *data)
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 7b76fd3b93a4..45cc3d9eacb8 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -418,7 +418,7 @@ void __suspend_report_result(const char *function, void *fn, int ret)
 {
        if (ret) {
                printk(KERN_ERR "%s(): ", function);
-                print_fn_descriptor_symbol("%s() returns ", (unsigned long)fn);
+                print_fn_descriptor_symbol("%s returns ", fn);
                printk("%d\n", ret);
        }
 }
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index c9751b2b57e6..7516baff3bb9 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1714,10 +1714,10 @@ static int __init amiga_floppy_init(void)
        int i, ret;
        if (!MACH_IS_AMIGA)
-                return -ENXIO;
+                return -ENODEV;
        if (!AMIGAHW_PRESENT(AMI_FLOPPY))
-                return -ENXIO;
+                return -ENODEV;
        if (register_blkdev(FLOPPY_MAJOR,"fd"))
                return -EBUSY;
@@ -1755,7 +1755,7 @@ static int __init amiga_floppy_init(void)
        if (!floppy_queue)
                goto out_queue;
-        ret = -ENXIO;
+        ret = -ENODEV;
        if (fd_probe_drives() < 1) /* No usable drives */
                goto out_probe;
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index 2d5853cbd4b0..be20a67f1fa8 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -332,7 +332,7 @@ z2_init(void)
    int ret;
    if (!MACH_IS_AMIGA)
-        return -ENXIO;
+        return -ENODEV;
    ret = -EBUSY;
    if (register_blkdev(Z2RAM_MAJOR, DEVICE_NAME))
diff --git a/drivers/char/drm/drm.h b/drivers/char/drm/drm.h
index 6874f31ca8ca..3a05c6d5ebe1 100644
--- a/drivers/char/drm/drm.h
+++ b/drivers/char/drm/drm.h
@@ -471,7 +471,6 @@ struct drm_irq_busid {
 enum drm_vblank_seq_type {
        _DRM_VBLANK_ABSOLUTE = 0x0,     /**< Wait for specific vblank sequence number */
        _DRM_VBLANK_RELATIVE = 0x1,     /**< Wait for given number of vblanks */
-        _DRM_VBLANK_FLIP = 0x8000000,   /**< Scheduled buffer swap should flip */
        _DRM_VBLANK_NEXTONMISS = 0x10000000,    /**< If missed, wait for next vblank */
        _DRM_VBLANK_SECONDARY = 0x20000000,     /**< Secondary display controller */
        _DRM_VBLANK_SIGNAL = 0x40000000 /**< Send signal instead of blocking */
@@ -504,21 +503,6 @@ union drm_wait_vblank {
        struct drm_wait_vblank_reply reply;
 };
-enum drm_modeset_ctl_cmd {
-        _DRM_PRE_MODESET = 1,
-        _DRM_POST_MODESET = 2,
-};
-/**
- * DRM_IOCTL_MODESET_CTL ioctl argument type
- *
- * \sa drmModesetCtl().
- */
-struct drm_modeset_ctl {
-        unsigned long arg;
-        enum drm_modeset_ctl_cmd cmd;
-};
 /**
 * DRM_IOCTL_AGP_ENABLE ioctl argument type.
 *
@@ -603,7 +587,6 @@ struct drm_set_version {
 #define DRM_IOCTL_GET_CLIENT            DRM_IOWR(0x05, struct drm_client)
 #define DRM_IOCTL_GET_STATS             DRM_IOR( 0x06, struct drm_stats)
 #define DRM_IOCTL_SET_VERSION           DRM_IOWR(0x07, struct drm_set_version)
-#define DRM_IOCTL_MODESET_CTL           DRM_IOW(0x08, struct drm_modeset_ctl)
 #define DRM_IOCTL_SET_UNIQUE            DRM_IOW( 0x10, struct drm_unique)
 #define DRM_IOCTL_AUTH_MAGIC            DRM_IOW( 0x11, struct drm_auth)
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 213b3ca3468e..0764b662b339 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -100,8 +100,10 @@ struct drm_device;
 #define DRIVER_HAVE_DMA    0x20
 #define DRIVER_HAVE_IRQ    0x40
 #define DRIVER_IRQ_SHARED  0x80
+#define DRIVER_IRQ_VBL     0x100
 #define DRIVER_DMA_QUEUE   0x200
 #define DRIVER_FB_DMA      0x400
+#define DRIVER_IRQ_VBL2    0x800
 /***********************************************************************/
 /** \name Begin the DRM... */
@@ -577,52 +579,10 @@ struct drm_driver {
        int (*context_dtor) (struct drm_device *dev, int context);
        int (*kernel_context_switch) (struct drm_device *dev, int old,
                                      int new);
-        void (*kernel_context_switch_unlock) (struct drm_device * dev);
+        void (*kernel_context_switch_unlock) (struct drm_device *dev);
-        /**
+        int (*vblank_wait) (struct drm_device *dev, unsigned int *sequence);
-         * get_vblank_counter - get raw hardware vblank counter
+        int (*vblank_wait2) (struct drm_device *dev, unsigned int *sequence);
-         * @dev: DRM device
+        int (*dri_library_name) (struct drm_device *dev, char *buf);
-         * @crtc: counter to fetch
-         *
-         * Driver callback for fetching a raw hardware vblank counter
-         * for @crtc.  If a device doesn't have a hardware counter, the
-         * driver can simply return the value of drm_vblank_count and
-         * make the enable_vblank() and disable_vblank() hooks into no-ops,
-         * leaving interrupts enabled at all times.
-         *
-         * Wraparound handling and loss of events due to modesetting is dealt
-         * with in the DRM core code.
-         *
-         * RETURNS
-         * Raw vblank counter value.
-         */
-        u32 (*get_vblank_counter) (struct drm_device *dev, int crtc);
-        /**
-         * enable_vblank - enable vblank interrupt events
-         * @dev: DRM device
-         * @crtc: which irq to enable
-         *
-         * Enable vblank interrupts for @crtc.  If the device doesn't have
-         * a hardware vblank counter, this routine should be a no-op, since
-         * interrupts will have to stay on to keep the count accurate.
-         *
-         * RETURNS
-         * Zero on success, appropriate errno if the given @crtc's vblank
-         * interrupt cannot be enabled.
-         */
-        int (*enable_vblank) (struct drm_device *dev, int crtc);
-        /**
-         * disable_vblank - disable vblank interrupt events
-         * @dev: DRM device
-         * @crtc: which irq to enable
-         *
-         * Disable vblank interrupts for @crtc.  If the device doesn't have
-         * a hardware vblank counter, this routine should be a no-op, since
-         * interrupts will have to stay on to keep the count accurate.
-         */
-        void (*disable_vblank) (struct drm_device *dev, int crtc);
-        int (*dri_library_name) (struct drm_device *dev, char * buf);
        /**
         * Called by \c drm_device_is_agp.  Typically used to determine if a
@@ -641,7 +601,7 @@ struct drm_driver {
        irqreturn_t(*irq_handler) (DRM_IRQ_ARGS);
        void (*irq_preinstall) (struct drm_device *dev);
-        int (*irq_postinstall) (struct drm_device *dev);
+        void (*irq_postinstall) (struct drm_device *dev);
        void (*irq_uninstall) (struct drm_device *dev);
        void (*reclaim_buffers) (struct drm_device *dev,
                                 struct drm_file * file_priv);
@@ -770,21 +730,13 @@ struct drm_device {
        /** \name VBLANK IRQ support */
        /*@{ */
-        wait_queue_head_t *vbl_queue;   /**< VBLANK wait queue */
+        wait_queue_head_t vbl_queue;    /**< VBLANK wait queue */
-        atomic_t *_vblank_count;        /**< number of VBLANK interrupts (driver must alloc the right number of counters) */
+        atomic_t vbl_received;
+        atomic_t vbl_received2;         /**< number of secondary VBLANK interrupts */
        spinlock_t vbl_lock;
-        struct list_head *vbl_sigs;             /**< signal list to send on VBLANK */
+        struct list_head vbl_sigs;              /**< signal list to send on VBLANK */
-        atomic_t vbl_signal_pending;    /* number of signals pending on all crtcs*/
+        struct list_head vbl_sigs2;     /**< signals to send on secondary VBLANK */
-        atomic_t *vblank_refcount;      /* number of users of vblank interrupts per crtc */
+        unsigned int vbl_pending;
-        u32 *last_vblank;               /* protected by dev->vbl_lock, used */
-                                        /* for wraparound handling */
-        u32 *vblank_offset;             /* used to track how many vblanks */
-        int *vblank_enabled;            /* so we don't call enable more than
-                                           once per disable */
-        u32 *vblank_premodeset;         /*  were lost during modeset */
-        struct timer_list vblank_disable_timer;
-        unsigned long max_vblank_count; /**< size of vblank counter register */
        spinlock_t tasklet_lock;        /**< For drm_locked_tasklet */
        void (*locked_tasklet_func)(struct drm_device *dev);
@@ -804,7 +756,6 @@ struct drm_device {
 #ifdef __alpha__
        struct pci_controller *hose;
 #endif
-        int num_crtcs;                  /**< Number of CRTCs on this device */
        struct drm_sg_mem *sg;  /**< Scatter gather memory */
        void *dev_private;              /**< device private data */
        struct drm_sigdata sigdata;        /**< For block_all_signals */
@@ -1039,19 +990,11 @@ extern void drm_driver_irq_preinstall(struct drm_device *dev);
 extern void drm_driver_irq_postinstall(struct drm_device *dev);
 extern void drm_driver_irq_uninstall(struct drm_device *dev);
-extern int drm_vblank_init(struct drm_device *dev, int num_crtcs);
+extern int drm_wait_vblank(struct drm_device *dev, void *data,
-extern int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *filp);
-extern int drm_vblank_wait(struct drm_device * dev, unsigned int *vbl_seq);
-extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*));
-extern u32 drm_vblank_count(struct drm_device *dev, int crtc);
-extern void drm_update_vblank_count(struct drm_device *dev, int crtc);
-extern void drm_handle_vblank(struct drm_device *dev, int crtc);
-extern int drm_vblank_get(struct drm_device *dev, int crtc);
-extern void drm_vblank_put(struct drm_device *dev, int crtc);
-                                /* Modesetting support */
-extern int drm_modeset_ctl(struct drm_device *dev, void *data,
                           struct drm_file *file_priv);
+extern int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq);
+extern void drm_vbl_send_signals(struct drm_device *dev);
+extern void drm_locked_tasklet(struct drm_device *dev, void(*func)(struct drm_device*));
                                /* AGP/GART support (drm_agpsupport.h) */
 extern struct drm_agp_head *drm_agp_init(struct drm_device *dev);
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 68f0da801ed8..d2e6da85f58a 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -323,7 +323,6 @@ int drm_release(struct inode *inode, struct file *filp)
        struct drm_file *file_priv = filp->private_data;
        struct drm_device *dev = file_priv->minor->dev;
        int retcode = 0;
-        unsigned long irqflags;
        lock_kernel();
@@ -355,11 +354,9 @@ int drm_release(struct inode *inode, struct file *filp)
                         */
                        do{
-                                spin_lock_irqsave(&dev->lock.spinlock,
+                                spin_lock_bh(&dev->lock.spinlock);
-                                                  irqflags);
                                locked = dev->lock.idle_has_lock;
-                                spin_unlock_irqrestore(&dev->lock.spinlock,
+                                spin_unlock_bh(&dev->lock.spinlock);
-                                                       irqflags);
                                if (locked)
                                        break;
                                schedule();
diff --git a/drivers/char/drm/drm_irq.c b/drivers/char/drm/drm_irq.c
index 286f9d61e7d5..089c015c01d1 100644
--- a/drivers/char/drm/drm_irq.c
+++ b/drivers/char/drm/drm_irq.c
@@ -71,117 +71,6 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
        return 0;
 }
-static void vblank_disable_fn(unsigned long arg)
-{
-        struct drm_device *dev = (struct drm_device *)arg;
-        unsigned long irqflags;
-        int i;
-        for (i = 0; i < dev->num_crtcs; i++) {
-                spin_lock_irqsave(&dev->vbl_lock, irqflags);
-                if (atomic_read(&dev->vblank_refcount[i]) == 0 &&
-                    dev->vblank_enabled[i]) {
-                        dev->driver->disable_vblank(dev, i);
-                        dev->vblank_enabled[i] = 0;
-                }
-                spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-        }
-}
-static void drm_vblank_cleanup(struct drm_device *dev)
-{
-        /* Bail if the driver didn't call drm_vblank_init() */
-        if (dev->num_crtcs == 0)
-                return;
-        del_timer(&dev->vblank_disable_timer);
-        vblank_disable_fn((unsigned long)dev);
-        drm_free(dev->vbl_queue, sizeof(*dev->vbl_queue) * dev->num_crtcs,
-                 DRM_MEM_DRIVER);
-        drm_free(dev->vbl_sigs, sizeof(*dev->vbl_sigs) * dev->num_crtcs,
-                 DRM_MEM_DRIVER);
-        drm_free(dev->_vblank_count, sizeof(*dev->_vblank_count) *
-                 dev->num_crtcs, DRM_MEM_DRIVER);
-        drm_free(dev->vblank_refcount, sizeof(*dev->vblank_refcount) *
-                 dev->num_crtcs, DRM_MEM_DRIVER);
-        drm_free(dev->vblank_enabled, sizeof(*dev->vblank_enabled) *
-                 dev->num_crtcs, DRM_MEM_DRIVER);
-        drm_free(dev->last_vblank, sizeof(*dev->last_vblank) * dev->num_crtcs,
-                 DRM_MEM_DRIVER);
-        drm_free(dev->vblank_premodeset, sizeof(*dev->vblank_premodeset) *
-                 dev->num_crtcs, DRM_MEM_DRIVER);
-        drm_free(dev->vblank_offset, sizeof(*dev->vblank_offset) * dev->num_crtcs,
-                 DRM_MEM_DRIVER);
-        dev->num_crtcs = 0;
-}
-int drm_vblank_init(struct drm_device *dev, int num_crtcs)
-{
-        int i, ret = -ENOMEM;
-        setup_timer(&dev->vblank_disable_timer, vblank_disable_fn,
-                    (unsigned long)dev);
-        spin_lock_init(&dev->vbl_lock);
-        atomic_set(&dev->vbl_signal_pending, 0);
-        dev->num_crtcs = num_crtcs;
-        dev->vbl_queue = drm_alloc(sizeof(wait_queue_head_t) * num_crtcs,
-                                   DRM_MEM_DRIVER);
-        if (!dev->vbl_queue)
-                goto err;
-        dev->vbl_sigs = drm_alloc(sizeof(struct list_head) * num_crtcs,
-                                  DRM_MEM_DRIVER);
-        if (!dev->vbl_sigs)
-                goto err;
-        dev->_vblank_count = drm_alloc(sizeof(atomic_t) * num_crtcs,
-                                      DRM_MEM_DRIVER);
-        if (!dev->_vblank_count)
-                goto err;
-        dev->vblank_refcount = drm_alloc(sizeof(atomic_t) * num_crtcs,
-                                         DRM_MEM_DRIVER);
-        if (!dev->vblank_refcount)
-                goto err;
-        dev->vblank_enabled = drm_calloc(num_crtcs, sizeof(int),
-                                         DRM_MEM_DRIVER);
-        if (!dev->vblank_enabled)
-                goto err;
-        dev->last_vblank = drm_calloc(num_crtcs, sizeof(u32), DRM_MEM_DRIVER);
-        if (!dev->last_vblank)
-                goto err;
-        dev->vblank_premodeset = drm_calloc(num_crtcs, sizeof(u32),
-                                            DRM_MEM_DRIVER);
-        if (!dev->vblank_premodeset)
-                goto err;
-        dev->vblank_offset = drm_calloc(num_crtcs, sizeof(u32), DRM_MEM_DRIVER);
-        if (!dev->vblank_offset)
-                goto err;
-        /* Zero per-crtc vblank stuff */
-        for (i = 0; i < num_crtcs; i++) {
-                init_waitqueue_head(&dev->vbl_queue[i]);
-                INIT_LIST_HEAD(&dev->vbl_sigs[i]);
-                atomic_set(&dev->_vblank_count[i], 0);
-                atomic_set(&dev->vblank_refcount[i], 0);
-        }
-        return 0;
-err:
-        drm_vblank_cleanup(dev);
-        return ret;
-}
-EXPORT_SYMBOL(drm_vblank_init);
 /**
 * Install IRQ handler.
 *
@@ -220,6 +109,17 @@ static int drm_irq_install(struct drm_device * dev)
        DRM_DEBUG("irq=%d\n", dev->irq);
+        if (drm_core_check_feature(dev, DRIVER_IRQ_VBL)) {
+                init_waitqueue_head(&dev->vbl_queue);
+                spin_lock_init(&dev->vbl_lock);
+                INIT_LIST_HEAD(&dev->vbl_sigs);
+                INIT_LIST_HEAD(&dev->vbl_sigs2);
+                dev->vbl_pending = 0;
+        }
        /* Before installing handler */
        dev->driver->irq_preinstall(dev);
@@ -237,14 +137,9 @@ static int drm_irq_install(struct drm_device * dev)
        }
        /* After installing handler */
-        ret = dev->driver->irq_postinstall(dev);
+        dev->driver->irq_postinstall(dev);
-        if (ret < 0) {
-                mutex_lock(&dev->struct_mutex);
-                dev->irq_enabled = 0;
-                mutex_unlock(&dev->struct_mutex);
-        }
-        return ret;
+        return 0;
 }
 /**
@@ -275,8 +170,6 @@ int drm_irq_uninstall(struct drm_device * dev)
        free_irq(dev->irq, dev);
-        drm_vblank_cleanup(dev);
        dev->locked_tasklet_func = NULL;
        return 0;
@@ -321,148 +214,6 @@ int drm_control(struct drm_device *dev, void *data,
 }
 /**
- * drm_vblank_count - retrieve "cooked" vblank counter value
- * @dev: DRM device
- * @crtc: which counter to retrieve
- *
- * Fetches the "cooked" vblank count value that represents the number of
- * vblank events since the system was booted, including lost events due to
- * modesetting activity.
- */
-u32 drm_vblank_count(struct drm_device *dev, int crtc)
-{
-        return atomic_read(&dev->_vblank_count[crtc]) +
-                dev->vblank_offset[crtc];
-}
-EXPORT_SYMBOL(drm_vblank_count);
-/**
- * drm_update_vblank_count - update the master vblank counter
- * @dev: DRM device
- * @crtc: counter to update
- *
- * Call back into the driver to update the appropriate vblank counter
- * (specified by @crtc).  Deal with wraparound, if it occurred, and
- * update the last read value so we can deal with wraparound on the next
- * call if necessary.
- */
-void drm_update_vblank_count(struct drm_device *dev, int crtc)
-{
-        unsigned long irqflags;
-        u32 cur_vblank, diff;
-        /*
-         * Interrupts were disabled prior to this call, so deal with counter
-         * wrap if needed.
-         * NOTE!  It's possible we lost a full dev->max_vblank_count events
-         * here if the register is small or we had vblank interrupts off for
-         * a long time.
-         */
-        cur_vblank = dev->driver->get_vblank_counter(dev, crtc);
-        spin_lock_irqsave(&dev->vbl_lock, irqflags);
-        if (cur_vblank < dev->last_vblank[crtc]) {
-                diff = dev->max_vblank_count -
-                        dev->last_vblank[crtc];
-                diff += cur_vblank;
-        } else {
-                diff = cur_vblank - dev->last_vblank[crtc];
-        }
-        dev->last_vblank[crtc] = cur_vblank;
-        spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-        atomic_add(diff, &dev->_vblank_count[crtc]);
-}
-EXPORT_SYMBOL(drm_update_vblank_count);
-/**
- * drm_vblank_get - get a reference count on vblank events
- * @dev: DRM device
- * @crtc: which CRTC to own
- *
- * Acquire a reference count on vblank events to avoid having them disabled
- * while in use.  Note callers will probably want to update the master counter
- * using drm_update_vblank_count() above before calling this routine so that
- * wakeups occur on the right vblank event.
- *
- * RETURNS
- * Zero on success, nonzero on failure.
- */
-int drm_vblank_get(struct drm_device *dev, int crtc)
-{
-        unsigned long irqflags;
-        int ret = 0;
-        spin_lock_irqsave(&dev->vbl_lock, irqflags);
-        /* Going from 0->1 means we have to enable interrupts again */
-        if (atomic_add_return(1, &dev->vblank_refcount[crtc]) == 1 &&
-            !dev->vblank_enabled[crtc]) {
-                ret = dev->driver->enable_vblank(dev, crtc);
-                if (ret)
-                        atomic_dec(&dev->vblank_refcount[crtc]);
-                else
-                        dev->vblank_enabled[crtc] = 1;
-        }
-        spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-        return ret;
-}
-EXPORT_SYMBOL(drm_vblank_get);
-/**
- * drm_vblank_put - give up ownership of vblank events
- * @dev: DRM device
- * @crtc: which counter to give up
- *
- * Release ownership of a given vblank counter, turning off interrupts
- * if possible.
- */
-void drm_vblank_put(struct drm_device *dev, int crtc)
-{
-        /* Last user schedules interrupt disable */
-        if (atomic_dec_and_test(&dev->vblank_refcount[crtc]))
-            mod_timer(&dev->vblank_disable_timer, jiffies + 5*DRM_HZ);
-}
-EXPORT_SYMBOL(drm_vblank_put);
-/**
- * drm_modeset_ctl - handle vblank event counter changes across mode switch
- * @DRM_IOCTL_ARGS: standard ioctl arguments
- *
- * Applications should call the %_DRM_PRE_MODESET and %_DRM_POST_MODESET
- * ioctls around modesetting so that any lost vblank events are accounted for.
- */
-int drm_modeset_ctl(struct drm_device *dev, void *data,
-                    struct drm_file *file_priv)
-{
-        struct drm_modeset_ctl *modeset = data;
-        int crtc, ret = 0;
-        u32 new;
-        crtc = modeset->arg;
-        if (crtc >= dev->num_crtcs) {
-                ret = -EINVAL;
-                goto out;
-        }
-        switch (modeset->cmd) {
-        case _DRM_PRE_MODESET:
-                dev->vblank_premodeset[crtc] =
-                        dev->driver->get_vblank_counter(dev, crtc);
-                break;
-        case _DRM_POST_MODESET:
-                new = dev->driver->get_vblank_counter(dev, crtc);
-                dev->vblank_offset[crtc] = dev->vblank_premodeset[crtc] - new;
-                break;
-        default:
-                ret = -EINVAL;
-                break;
-        }
-out:
-        return ret;
-}
-/**
 * Wait for VBLANK.
 *
 * \param inode device inode.
@@ -481,13 +232,12 @@ out:
 *
 * If a signal is not requested, then calls vblank_wait().
 */
-int drm_wait_vblank(struct drm_device *dev, void *data,
+int drm_wait_vblank(struct drm_device *dev, void *data, struct drm_file *file_priv)
-                    struct drm_file *file_priv)
 {
        union drm_wait_vblank *vblwait = data;
        struct timeval now;
        int ret = 0;
-        unsigned int flags, seq, crtc;
+        unsigned int flags, seq;
        if ((!dev->irq) || (!dev->irq_enabled))
                return -EINVAL;
@@ -501,13 +251,13 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
        }
        flags = vblwait->request.type & _DRM_VBLANK_FLAGS_MASK;
-        crtc = flags & _DRM_VBLANK_SECONDARY ? 1 : 0;
-        if (crtc >= dev->num_crtcs)
+        if (!drm_core_check_feature(dev, (flags & _DRM_VBLANK_SECONDARY) ?
+                                    DRIVER_IRQ_VBL2 : DRIVER_IRQ_VBL))
                return -EINVAL;
-        drm_update_vblank_count(dev, crtc);
+        seq = atomic_read((flags & _DRM_VBLANK_SECONDARY) ? &dev->vbl_received2
-        seq = drm_vblank_count(dev, crtc);
+                          : &dev->vbl_received);
        switch (vblwait->request.type & _DRM_VBLANK_TYPES_MASK) {
        case _DRM_VBLANK_RELATIVE:
@@ -526,7 +276,8 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
        if (flags & _DRM_VBLANK_SIGNAL) {
                unsigned long irqflags;
-                struct list_head *vbl_sigs = &dev->vbl_sigs[crtc];
+                struct list_head *vbl_sigs = (flags & _DRM_VBLANK_SECONDARY)
+                                      ? &dev->vbl_sigs2 : &dev->vbl_sigs;
                struct drm_vbl_sig *vbl_sig;
                spin_lock_irqsave(&dev->vbl_lock, irqflags);
@@ -547,26 +298,22 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
                        }
                }
-                if (atomic_read(&dev->vbl_signal_pending) >= 100) {
+                if (dev->vbl_pending >= 100) {
                        spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
                        return -EBUSY;
                }
+                dev->vbl_pending++;
                spin_unlock_irqrestore(&dev->vbl_lock, irqflags);
-                vbl_sig = drm_calloc(1, sizeof(struct drm_vbl_sig),
+                if (!
-                                     DRM_MEM_DRIVER);
+                    (vbl_sig =
-                if (!vbl_sig)
+                     drm_alloc(sizeof(struct drm_vbl_sig), DRM_MEM_DRIVER))) {
                        return -ENOMEM;
-                ret = drm_vblank_get(dev, crtc);
-                if (ret) {
-                        drm_free(vbl_sig, sizeof(struct drm_vbl_sig),
-                                 DRM_MEM_DRIVER);
-                        return ret;
                }
-                atomic_inc(&dev->vbl_signal_pending);
+                memset((void *)vbl_sig, 0, sizeof(*vbl_sig));
                vbl_sig->sequence = vblwait->request.sequence;
                vbl_sig->info.si_signo = vblwait->request.signal;
@@ -580,20 +327,17 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
                vblwait->reply.sequence = seq;
        } else {
-                unsigned long cur_vblank;
+                if (flags & _DRM_VBLANK_SECONDARY) {
+                        if (dev->driver->vblank_wait2)
-                ret = drm_vblank_get(dev, crtc);
+                                ret = dev->driver->vblank_wait2(dev, &vblwait->request.sequence);
-                if (ret)
+                } else if (dev->driver->vblank_wait)
-                        return ret;
+                        ret =
-                DRM_WAIT_ON(ret, dev->vbl_queue[crtc], 3 * DRM_HZ,
+                            dev->driver->vblank_wait(dev,
-                            (((cur_vblank = drm_vblank_count(dev, crtc))
+                                                     &vblwait->request.sequence);
-                              - vblwait->request.sequence) <= (1 << 23)));
-                drm_vblank_put(dev, crtc);
-                do_gettimeofday(&now);
+                do_gettimeofday(&now);
                vblwait->reply.tval_sec = now.tv_sec;
                vblwait->reply.tval_usec = now.tv_usec;
-                vblwait->reply.sequence = cur_vblank;
        }
      done:
@@ -604,57 +348,44 @@ int drm_wait_vblank(struct drm_device *dev, void *data,
 * Send the VBLANK signals.
 *
 * \param dev DRM device.
- * \param crtc CRTC where the vblank event occurred
 *
 * Sends a signal for each task in drm_device::vbl_sigs and empties the list.
 *
 * If a signal is not requested, then calls vblank_wait().
 */
-static void drm_vbl_send_signals(struct drm_device * dev, int crtc)
+void drm_vbl_send_signals(struct drm_device * dev)
 {
-        struct drm_vbl_sig *vbl_sig, *tmp;
-        struct list_head *vbl_sigs;
-        unsigned int vbl_seq;
        unsigned long flags;
+        int i;
        spin_lock_irqsave(&dev->vbl_lock, flags);
-        vbl_sigs = &dev->vbl_sigs[crtc];
+        for (i = 0; i < 2; i++) {
-        vbl_seq = drm_vblank_count(dev, crtc);
+                struct drm_vbl_sig *vbl_sig, *tmp;
+                struct list_head *vbl_sigs = i ? &dev->vbl_sigs2 : &dev->vbl_sigs;
+                unsigned int vbl_seq = atomic_read(i ? &dev->vbl_received2 :
+                                                   &dev->vbl_received);
-        list_for_each_entry_safe(vbl_sig, tmp, vbl_sigs, head) {
+                list_for_each_entry_safe(vbl_sig, tmp, vbl_sigs, head) {
-            if ((vbl_seq - vbl_sig->sequence) <= (1 << 23)) {
+                        if ((vbl_seq - vbl_sig->sequence) <= (1 << 23)) {
-                vbl_sig->info.si_code = vbl_seq;
+                                vbl_sig->info.si_code = vbl_seq;
-                send_sig_info(vbl_sig->info.si_signo,
+                                send_sig_info(vbl_sig->info.si_signo,
-                              &vbl_sig->info, vbl_sig->task);
+                                              &vbl_sig->info, vbl_sig->task);
-                list_del(&vbl_sig->head);
+                                list_del(&vbl_sig->head);
-                drm_free(vbl_sig, sizeof(*vbl_sig),
+                                drm_free(vbl_sig, sizeof(*vbl_sig),
-                         DRM_MEM_DRIVER);
+                                         DRM_MEM_DRIVER);
-                atomic_dec(&dev->vbl_signal_pending);
-                drm_vblank_put(dev, crtc);
+                                dev->vbl_pending--;
-            }
+                        }
+                }
        }
        spin_unlock_irqrestore(&dev->vbl_lock, flags);
 }
-/**
+EXPORT_SYMBOL(drm_vbl_send_signals);
- * drm_handle_vblank - handle a vblank event
- * @dev: DRM device
- * @crtc: where this event occurred
- *
- * Drivers should call this routine in their vblank interrupt handlers to
- * update the vblank counter and send any signals that may be pending.
- */
-void drm_handle_vblank(struct drm_device *dev, int crtc)
-{
-        drm_update_vblank_count(dev, crtc);
-        DRM_WAKEUP(&dev->vbl_queue[crtc]);
-        drm_vbl_send_signals(dev, crtc);
-}
-EXPORT_SYMBOL(drm_handle_vblank);
 /**
 * Tasklet wrapper function.
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index 12dcdd1832f0..0998723cde79 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -53,7 +53,6 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
        DECLARE_WAITQUEUE(entry, current);
        struct drm_lock *lock = data;
        int ret = 0;
-        unsigned long irqflags;
        ++file_priv->lock_count;
@@ -72,9 +71,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                        return -EINVAL;
        add_wait_queue(&dev->lock.lock_queue, &entry);
-        spin_lock_irqsave(&dev->lock.spinlock, irqflags);
+        spin_lock_bh(&dev->lock.spinlock);
        dev->lock.user_waiters++;
-        spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
+        spin_unlock_bh(&dev->lock.spinlock);
        for (;;) {
                __set_current_state(TASK_INTERRUPTIBLE);
                if (!dev->lock.hw_lock) {
@@ -96,9 +95,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                        break;
                }
        }
-        spin_lock_irqsave(&dev->lock.spinlock, irqflags);
+        spin_lock_bh(&dev->lock.spinlock);
        dev->lock.user_waiters--;
-        spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
+        spin_unlock_bh(&dev->lock.spinlock);
        __set_current_state(TASK_RUNNING);
        remove_wait_queue(&dev->lock.lock_queue, &entry);
@@ -199,9 +198,8 @@ int drm_lock_take(struct drm_lock_data *lock_data,
 {
        unsigned int old, new, prev;
        volatile unsigned int *lock = &lock_data->hw_lock->lock;
-        unsigned long irqflags;
-        spin_lock_irqsave(&lock_data->spinlock, irqflags);
+        spin_lock_bh(&lock_data->spinlock);
        do {
                old = *lock;
                if (old & _DRM_LOCK_HELD)
@@ -213,7 +211,7 @@ int drm_lock_take(struct drm_lock_data *lock_data,
                }
                prev = cmpxchg(lock, old, new);
        } while (prev != old);
-        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
+        spin_unlock_bh(&lock_data->spinlock);
        if (_DRM_LOCKING_CONTEXT(old) == context) {
                if (old & _DRM_LOCK_HELD) {
@@ -274,16 +272,15 @@ int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)
 {
        unsigned int old, new, prev;
        volatile unsigned int *lock = &lock_data->hw_lock->lock;
-        unsigned long irqflags;
-        spin_lock_irqsave(&lock_data->spinlock, irqflags);
+        spin_lock_bh(&lock_data->spinlock);
        if (lock_data->kernel_waiters != 0) {
                drm_lock_transfer(lock_data, 0);
                lock_data->idle_has_lock = 1;
-                spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
+                spin_unlock_bh(&lock_data->spinlock);
                return 1;
        }
-        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
+        spin_unlock_bh(&lock_data->spinlock);
        do {
                old = *lock;
@@ -347,20 +344,19 @@ static int drm_notifier(void *priv)
 void drm_idlelock_take(struct drm_lock_data *lock_data)
 {
        int ret = 0;
-        unsigned long irqflags;
-        spin_lock_irqsave(&lock_data->spinlock, irqflags);
+        spin_lock_bh(&lock_data->spinlock);
        lock_data->kernel_waiters++;
        if (!lock_data->idle_has_lock) {
-                spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
+                spin_unlock_bh(&lock_data->spinlock);
                ret = drm_lock_take(lock_data, DRM_KERNEL_CONTEXT);
-                spin_lock_irqsave(&lock_data->spinlock, irqflags);
+                spin_lock_bh(&lock_data->spinlock);
                if (ret == 1)
                        lock_data->idle_has_lock = 1;
        }
-        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
+        spin_unlock_bh(&lock_data->spinlock);
 }
 EXPORT_SYMBOL(drm_idlelock_take);
@@ -368,9 +364,8 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
 {
        unsigned int old, prev;
        volatile unsigned int *lock = &lock_data->hw_lock->lock;
-        unsigned long irqflags;
-        spin_lock_irqsave(&lock_data->spinlock, irqflags);
+        spin_lock_bh(&lock_data->spinlock);
        if (--lock_data->kernel_waiters == 0) {
                if (lock_data->idle_has_lock) {
                        do {
@@ -381,7 +376,7 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
                        lock_data->idle_has_lock = 0;
                }
        }
-        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
+        spin_unlock_bh(&lock_data->spinlock);
 }
 EXPORT_SYMBOL(drm_idlelock_release);
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index f47e46e3529f..88974342933c 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -415,13 +415,10 @@ static void i915_emit_breadcrumb(struct drm_device *dev)
        drm_i915_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
-        if (++dev_priv->counter > BREADCRUMB_MASK) {
+        dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter;
-                 dev_priv->counter = 1;
-                 DRM_DEBUG("Breadcrumb counter wrapped around\n");
-        }
-        if (dev_priv->sarea_priv)
+        if (dev_priv->counter > 0x7FFFFFFFUL)
-                dev_priv->sarea_priv->last_enqueue = dev_priv->counter;
+                dev_priv->sarea_priv->last_enqueue = dev_priv->counter = 1;
        BEGIN_LP_RING(4);
        OUT_RING(CMD_STORE_DWORD_IDX);
@@ -431,26 +428,6 @@ static void i915_emit_breadcrumb(struct drm_device *dev)
        ADVANCE_LP_RING();
 }
-int i915_emit_mi_flush(struct drm_device *dev, uint32_t flush)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        uint32_t flush_cmd = CMD_MI_FLUSH;
-        RING_LOCALS;
-        flush_cmd |= flush;
-        i915_kernel_lost_context(dev);
-        BEGIN_LP_RING(4);
-        OUT_RING(flush_cmd);
-        OUT_RING(0);
-        OUT_RING(0);
-        OUT_RING(0);
-        ADVANCE_LP_RING();
-        return 0;
-}
 static int i915_dispatch_cmdbuffer(struct drm_device * dev,
                                   drm_i915_cmdbuffer_t * cmd)
 {
@@ -534,74 +511,52 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
        return 0;
 }
-static void i915_do_dispatch_flip(struct drm_device * dev, int plane, int sync)
+static int i915_dispatch_flip(struct drm_device * dev)
 {
        drm_i915_private_t *dev_priv = dev->dev_private;
-        u32 num_pages, current_page, next_page, dspbase;
-        int shift = 2 * plane, x, y;
        RING_LOCALS;
-        /* Calculate display base offset */
+        DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",
-        num_pages = dev_priv->sarea_priv->third_handle ? 3 : 2;
+                  __FUNCTION__,
-        current_page = (dev_priv->sarea_priv->pf_current_page >> shift) & 0x3;
+                  dev_priv->current_page,
-        next_page = (current_page + 1) % num_pages;
+                  dev_priv->sarea_priv->pf_current_page);
-        switch (next_page) {
+        i915_kernel_lost_context(dev);
-        default:
-        case 0:
+        BEGIN_LP_RING(2);
-                dspbase = dev_priv->sarea_priv->front_offset;
+        OUT_RING(INST_PARSER_CLIENT | INST_OP_FLUSH | INST_FLUSH_MAP_CACHE);
-                break;
+        OUT_RING(0);
-        case 1:
+        ADVANCE_LP_RING();
-                dspbase = dev_priv->sarea_priv->back_offset;
-                break;
-        case 2:
-                dspbase = dev_priv->sarea_priv->third_offset;
-                break;
-        }
-        if (plane == 0) {
+        BEGIN_LP_RING(6);
-                x = dev_priv->sarea_priv->planeA_x;
+        OUT_RING(CMD_OP_DISPLAYBUFFER_INFO | ASYNC_FLIP);
-                y = dev_priv->sarea_priv->planeA_y;
+        OUT_RING(0);
+        if (dev_priv->current_page == 0) {
+                OUT_RING(dev_priv->back_offset);
+                dev_priv->current_page = 1;
        } else {
-                x = dev_priv->sarea_priv->planeB_x;
+                OUT_RING(dev_priv->front_offset);
-                y = dev_priv->sarea_priv->planeB_y;
+                dev_priv->current_page = 0;
        }
+        OUT_RING(0);
+        ADVANCE_LP_RING();
-        dspbase += (y * dev_priv->sarea_priv->pitch + x) * dev_priv->cpp;
+        BEGIN_LP_RING(2);
+        OUT_RING(MI_WAIT_FOR_EVENT | MI_WAIT_FOR_PLANE_A_FLIP);
+        OUT_RING(0);
+        ADVANCE_LP_RING();
-        DRM_DEBUG("plane=%d current_page=%d dspbase=0x%x\n", plane, current_page,
+        dev_priv->sarea_priv->last_enqueue = dev_priv->counter++;
-                  dspbase);
        BEGIN_LP_RING(4);
-        OUT_RING(sync ? 0 :
+        OUT_RING(CMD_STORE_DWORD_IDX);
-                 (MI_WAIT_FOR_EVENT | (plane ? MI_WAIT_FOR_PLANE_B_FLIP :
+        OUT_RING(20);
-                                       MI_WAIT_FOR_PLANE_A_FLIP)));
+        OUT_RING(dev_priv->counter);
-        OUT_RING(CMD_OP_DISPLAYBUFFER_INFO | (sync ? 0 : ASYNC_FLIP) |
+        OUT_RING(0);
-                 (plane ? DISPLAY_PLANE_B : DISPLAY_PLANE_A));
-        OUT_RING(dev_priv->sarea_priv->pitch * dev_priv->cpp);
-        OUT_RING(dspbase);
        ADVANCE_LP_RING();
-        dev_priv->sarea_priv->pf_current_page &= ~(0x3 << shift);
+        dev_priv->sarea_priv->pf_current_page = dev_priv->current_page;
-        dev_priv->sarea_priv->pf_current_page |= next_page << shift;
+        return 0;
-}
-void i915_dispatch_flip(struct drm_device * dev, int planes, int sync)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        int i;
-        DRM_DEBUG("planes=0x%x pfCurrentPage=%d\n",
-                  planes, dev_priv->sarea_priv->pf_current_page);
-        i915_emit_mi_flush(dev, MI_READ_FLUSH | MI_EXE_FLUSH);
-        for (i = 0; i < 2; i++)
-                if (planes & (1 << i))
-                        i915_do_dispatch_flip(dev, i, sync);
-        i915_emit_breadcrumb(dev);
 }
 static int i915_quiescent(struct drm_device * dev)
@@ -624,6 +579,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
                            struct drm_file *file_priv)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        u32 *hw_status = dev_priv->hw_status_page;
        drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
            dev_priv->sarea_priv;
        drm_i915_batchbuffer_t *batch = data;
@@ -646,7 +602,7 @@ static int i915_batchbuffer(struct drm_device *dev, void *data,
        ret = i915_dispatch_batchbuffer(dev, batch);
-        sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
+        sarea_priv->last_dispatch = (int)hw_status[5];
        return ret;
 }
@@ -654,6 +610,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
                          struct drm_file *file_priv)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        u32 *hw_status = dev_priv->hw_status_page;
        drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)
            dev_priv->sarea_priv;
        drm_i915_cmdbuffer_t *cmdbuf = data;
@@ -678,51 +635,18 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
                return ret;
        }
-        sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
+        sarea_priv->last_dispatch = (int)hw_status[5];
-        return 0;
-}
-static int i915_do_cleanup_pageflip(struct drm_device * dev)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        int i, planes, num_pages = dev_priv->sarea_priv->third_handle ? 3 : 2;
-        DRM_DEBUG("\n");
-        for (i = 0, planes = 0; i < 2; i++)
-                if (dev_priv->sarea_priv->pf_current_page & (0x3 << (2 * i))) {
-                        dev_priv->sarea_priv->pf_current_page =
-                                (dev_priv->sarea_priv->pf_current_page &
-                                 ~(0x3 << (2 * i))) | ((num_pages - 1) << (2 * i));
-                        planes |= 1 << i;
-                }
-        if (planes)
-                i915_dispatch_flip(dev, planes, 0);
        return 0;
 }
 static int i915_flip_bufs(struct drm_device *dev, void *data,
                          struct drm_file *file_priv)
 {
-        drm_i915_flip_t *param = data;
+        DRM_DEBUG("%s\n", __FUNCTION__);
-        DRM_DEBUG("\n");
        LOCK_TEST_WITH_RETURN(dev, file_priv);
-        /* This is really planes */
+        return i915_dispatch_flip(dev);
-        if (param->pipes & ~0x3) {
-                DRM_ERROR("Invalid planes 0x%x, only <= 0x3 is valid\n",
-                          param->pipes);
-                return -EINVAL;
-        }
-        i915_dispatch_flip(dev, param->pipes, 0);
-        return 0;
 }
 static int i915_getparam(struct drm_device *dev, void *data,
@@ -883,8 +807,6 @@ void i915_driver_lastclose(struct drm_device * dev)
        if (!dev_priv)
                return;
-        if (drm_getsarea(dev) && dev_priv->sarea_priv)
-                i915_do_cleanup_pageflip(dev);
        if (dev_priv->agp_heap)
                i915_mem_takedown(&(dev_priv->agp_heap));
diff --git a/drivers/char/drm/i915_drm.h b/drivers/char/drm/i915_drm.h
index 0431c00e2289..05c66cf03a9e 100644
--- a/drivers/char/drm/i915_drm.h
+++ b/drivers/char/drm/i915_drm.h
@@ -105,29 +105,14 @@ typedef struct _drm_i915_sarea {
        unsigned int rotated_tiled;
        unsigned int rotated2_tiled;
-        int planeA_x;
+        int pipeA_x;
-        int planeA_y;
+        int pipeA_y;
-        int planeA_w;
+        int pipeA_w;
-        int planeA_h;
+        int pipeA_h;
-        int planeB_x;
+        int pipeB_x;
-        int planeB_y;
+        int pipeB_y;
-        int planeB_w;
+        int pipeB_w;
-        int planeB_h;
+        int pipeB_h;
-        /* Triple buffering */
-        drm_handle_t third_handle;
-        int third_offset;
-        int third_size;
-        unsigned int third_tiled;
-        /* buffer object handles for the static buffers.  May change
-         * over the lifetime of the client, though it doesn't in our current
-         * implementation.
-         */
-        unsigned int front_bo_handle;
-        unsigned int back_bo_handle;
-        unsigned int third_bo_handle;
-        unsigned int depth_bo_handle;
 } drm_i915_sarea_t;
 /* Flags for perf_boxes
@@ -161,7 +146,7 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_INIT             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)
 #define DRM_IOCTL_I915_FLUSH            DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH)
-#define DRM_IOCTL_I915_FLIP             DRM_IOW( DRM_COMMAND_BASE + DRM_I915_FLIP, drm_i915_flip_t)
+#define DRM_IOCTL_I915_FLIP             DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLIP)
 #define DRM_IOCTL_I915_BATCHBUFFER      DRM_IOW( DRM_COMMAND_BASE + DRM_I915_BATCHBUFFER, drm_i915_batchbuffer_t)
 #define DRM_IOCTL_I915_IRQ_EMIT         DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_IRQ_EMIT, drm_i915_irq_emit_t)
 #define DRM_IOCTL_I915_IRQ_WAIT         DRM_IOW( DRM_COMMAND_BASE + DRM_I915_IRQ_WAIT, drm_i915_irq_wait_t)
@@ -176,18 +161,6 @@ typedef struct _drm_i915_sarea {
 #define DRM_IOCTL_I915_GET_VBLANK_PIPE  DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
 #define DRM_IOCTL_I915_VBLANK_SWAP      DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
-/* Asynchronous page flipping:
- */
-typedef struct drm_i915_flip {
-        /*
-         * This is really talking about planes, and we could rename it
-         * except for the fact that some of the duplicated i915_drm.h files
-         * out there check for HAVE_I915_FLIP and so might pick up this
-         * version.
-         */
-        int pipes;
-} drm_i915_flip_t;
 /* Allow drivers to submit batchbuffers directly to hardware, relying
 * on the security mechanisms provided by hardware.
 */
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index bb8f1b2fb383..e8f3d682e3b1 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
@@ -147,7 +147,7 @@ static void i915_save_vga(struct drm_device *dev)
        i915_write_indexed(cr_index, cr_data, 0x11,
                           i915_read_indexed(cr_index, cr_data, 0x11) &
                           (~0x80));
-        for (i = 0; i < 0x24; i++)
+        for (i = 0; i <= 0x24; i++)
                dev_priv->saveCR[i] =
                        i915_read_indexed(cr_index, cr_data, i);
        /* Make sure we don't turn off CR group 0 writes */
@@ -156,7 +156,7 @@ static void i915_save_vga(struct drm_device *dev)
        /* Attribute controller registers */
        inb(st01);
        dev_priv->saveAR_INDEX = inb(VGA_AR_INDEX);
-        for (i = 0; i < 20; i++)
+        for (i = 0; i <= 0x14; i++)
                dev_priv->saveAR[i] = i915_read_ar(st01, i, 0);
        inb(st01);
        outb(dev_priv->saveAR_INDEX, VGA_AR_INDEX);
@@ -206,7 +206,7 @@ static void i915_restore_vga(struct drm_device *dev)
        /* CRT controller regs */
        /* Enable CR group 0 writes */
        i915_write_indexed(cr_index, cr_data, 0x11, dev_priv->saveCR[0x11]);
-        for (i = 0; i < 0x24; i++)
+        for (i = 0; i <= 0x24; i++)
                i915_write_indexed(cr_index, cr_data, i, dev_priv->saveCR[i]);
        /* Graphics controller regs */
@@ -223,7 +223,7 @@ static void i915_restore_vga(struct drm_device *dev)
        /* Attribute controller registers */
        inb(st01);
-        for (i = 0; i < 20; i++)
+        for (i = 0; i <= 0x14; i++)
                i915_write_ar(st01, i, dev_priv->saveAR[i], 0);
        inb(st01); /* switch back to index mode */
        outb(dev_priv->saveAR_INDEX | 0x20, VGA_AR_INDEX);
@@ -256,6 +256,9 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
        pci_save_state(dev->pdev);
        pci_read_config_byte(dev->pdev, LBB, &dev_priv->saveLBB);
+        /* Display arbitration control */
+        dev_priv->saveDSPARB = I915_READ(DSPARB);
        /* Pipe & plane A info */
        dev_priv->savePIPEACONF = I915_READ(PIPEACONF);
        dev_priv->savePIPEASRC = I915_READ(PIPEASRC);
@@ -349,6 +352,7 @@ static int i915_suspend(struct drm_device *dev, pm_message_t state)
        dev_priv->saveVGACNTRL = I915_READ(VGACNTRL);
        /* Clock gating state */
+        dev_priv->saveD_STATE = I915_READ(D_STATE);
        dev_priv->saveDSPCLK_GATE_D = I915_READ(DSPCLK_GATE_D);
        /* Cache mode state */
@@ -388,6 +392,8 @@ static int i915_resume(struct drm_device *dev)
        pci_write_config_byte(dev->pdev, LBB, dev_priv->saveLBB);
+        I915_WRITE(DSPARB, dev_priv->saveDSPARB);
        /* Pipe & plane A info */
        /* Prime the clock */
        if (dev_priv->saveDPLL_A & DPLL_VCO_ENABLE) {
@@ -507,6 +513,7 @@ static int i915_resume(struct drm_device *dev)
        udelay(150);
        /* Clock gating state */
+        I915_WRITE (D_STATE, dev_priv->saveD_STATE);
        I915_WRITE (DSPCLK_GATE_D, dev_priv->saveDSPCLK_GATE_D);
        /* Cache mode state */
@@ -533,7 +540,8 @@ static struct drm_driver driver = {
         */
        .driver_features =
            DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/
-            DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
+            DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL |
+            DRIVER_IRQ_VBL2,
        .load = i915_driver_load,
        .unload = i915_driver_unload,
        .lastclose = i915_driver_lastclose,
@@ -541,9 +549,8 @@ static struct drm_driver driver = {
        .suspend = i915_suspend,
        .resume = i915_resume,
        .device_is_agp = i915_driver_device_is_agp,
-        .get_vblank_counter = i915_get_vblank_counter,
+        .vblank_wait = i915_driver_vblank_wait,
-        .enable_vblank = i915_enable_vblank,
+        .vblank_wait2 = i915_driver_vblank_wait2,
-        .disable_vblank = i915_disable_vblank,
        .irq_preinstall = i915_driver_irq_preinstall,
        .irq_postinstall = i915_driver_irq_postinstall,
        .irq_uninstall = i915_driver_irq_uninstall,
diff --git a/drivers/char/drm/i915_drv.h b/drivers/char/drm/i915_drv.h
index db7001f22561..1b20f7c0639c 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -76,9 +76,8 @@ struct mem_block {
 typedef struct _drm_i915_vbl_swap {
        struct list_head head;
        drm_drawable_t drw_id;
-        unsigned int plane;
+        unsigned int pipe;
        unsigned int sequence;
-        int flip;
 } drm_i915_vbl_swap_t;
 typedef struct drm_i915_private {
@@ -91,7 +90,7 @@ typedef struct drm_i915_private {
        drm_dma_handle_t *status_page_dmah;
        void *hw_status_page;
        dma_addr_t dma_status_page;
-        uint32_t counter;
+        unsigned long counter;
        unsigned int status_gfx_addr;
        drm_local_map_t hws_map;
@@ -104,18 +103,13 @@ typedef struct drm_i915_private {
        wait_queue_head_t irq_queue;
        atomic_t irq_received;
-        atomic_t irq_emited;
+        atomic_t irq_emitted;
        int tex_lru_log_granularity;
        int allow_batchbuffer;
        struct mem_block *agp_heap;
        unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds;
        int vblank_pipe;
-        spinlock_t user_irq_lock;
-        int user_irq_refcount;
-        int fence_irq_on;
-        uint32_t irq_enable_reg;
-        int irq_enabled;
        spinlock_t swaps_lock;
        drm_i915_vbl_swap_t vbl_swaps;
@@ -125,6 +119,7 @@ typedef struct drm_i915_private {
        u8 saveLBB;
        u32 saveDSPACNTR;
        u32 saveDSPBCNTR;
+        u32 saveDSPARB;
        u32 savePIPEACONF;
        u32 savePIPEBCONF;
        u32 savePIPEASRC;
@@ -194,6 +189,7 @@ typedef struct drm_i915_private {
        u32 saveIIR;
        u32 saveIMR;
        u32 saveCACHE_MODE_0;
+        u32 saveD_STATE;
        u32 saveDSPCLK_GATE_D;
        u32 saveMI_ARB_STATE;
        u32 saveSWF0[16];
@@ -203,10 +199,10 @@ typedef struct drm_i915_private {
        u8 saveSR[8];
        u8 saveGR[25];
        u8 saveAR_INDEX;
-        u8 saveAR[20];
+        u8 saveAR[21];
        u8 saveDACMASK;
        u8 saveDACDATA[256*3]; /* 256 3-byte colors */
-        u8 saveCR[36];
+        u8 saveCR[37];
 } drm_i915_private_t;
 extern struct drm_ioctl_desc i915_ioctls[];
@@ -222,7 +218,7 @@ extern void i915_driver_preclose(struct drm_device *dev,
 extern int i915_driver_device_is_agp(struct drm_device * dev);
 extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,
                              unsigned long arg);
-extern void i915_dispatch_flip(struct drm_device * dev, int pipes, int sync);
 /* i915_irq.c */
 extern int i915_irq_emit(struct drm_device *dev, void *data,
                         struct drm_file *file_priv);
@@ -233,7 +229,7 @@ extern int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequenc
 extern int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence);
 extern irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS);
 extern void i915_driver_irq_preinstall(struct drm_device * dev);
-extern int i915_driver_irq_postinstall(struct drm_device * dev);
+extern void i915_driver_irq_postinstall(struct drm_device * dev);
 extern void i915_driver_irq_uninstall(struct drm_device * dev);
 extern int i915_vblank_pipe_set(struct drm_device *dev, void *data,
                                struct drm_file *file_priv);
@@ -241,9 +237,6 @@ extern int i915_vblank_pipe_get(struct drm_device *dev, void *data,
                                struct drm_file *file_priv);
 extern int i915_vblank_swap(struct drm_device *dev, void *data,
                            struct drm_file *file_priv);
-extern int i915_enable_vblank(struct drm_device *dev, int crtc);
-extern void i915_disable_vblank(struct drm_device *dev, int crtc);
-extern u32 i915_get_vblank_counter(struct drm_device *dev, int crtc);
 /* i915_mem.c */
 extern int i915_mem_alloc(struct drm_device *dev, void *data,
@@ -388,91 +381,21 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 /* Interrupt bits:
 */
-#define I915_PIPE_CONTROL_NOTIFY_INTERRUPT              (1<<18)
+#define USER_INT_FLAG    (1<<1)
-#define I915_DISPLAY_PORT_INTERRUPT                     (1<<17)
+#define VSYNC_PIPEB_FLAG (1<<5)
-#define I915_RENDER_COMMAND_PARSER_ERROR_INTERRUPT      (1<<15)
+#define VSYNC_PIPEA_FLAG (1<<7)
-#define I915_GMCH_THERMAL_SENSOR_EVENT_INTERRUPT        (1<<14)
+#define HWB_OOM_FLAG     (1<<13) /* binner out of memory */
-#define I915_HWB_OOM_INTERRUPT                          (1<<13) /* binner out of memory */
-#define I915_SYNC_STATUS_INTERRUPT                      (1<<12)
-#define I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT     (1<<11)
-#define I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT     (1<<10)
-#define I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT       (1<<9)
-#define I915_DISPLAY_PLANE_C_FLIP_PENDING_INTERRUPT     (1<<8)
-#define I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT            (1<<7)
-#define I915_DISPLAY_PIPE_A_EVENT_INTERRUPT             (1<<6)
-#define I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT            (1<<5)
-#define I915_DISPLAY_PIPE_B_EVENT_INTERRUPT             (1<<4)
-#define I915_DEBUG_INTERRUPT                            (1<<2)
-#define I915_USER_INTERRUPT                             (1<<1)
 #define I915REG_HWSTAM          0x02098
 #define I915REG_INT_IDENTITY_R  0x020a4
 #define I915REG_INT_MASK_R      0x020a8
 #define I915REG_INT_ENABLE_R    0x020a0
-#define I915REG_INSTPM          0x020c0
-#define PIPEADSL                0x70000
-#define PIPEBDSL                0x71000
 #define I915REG_PIPEASTAT       0x70024
 #define I915REG_PIPEBSTAT       0x71024
-/*
- * The two pipe frame counter registers are not synchronized, so
- * reading a stable value is somewhat tricky. The following code
- * should work:
- *
- *  do {
- *    high1 = ((INREG(PIPEAFRAMEHIGH) & PIPE_FRAME_HIGH_MASK) >>
- *             PIPE_FRAME_HIGH_SHIFT;
- *    low1 =  ((INREG(PIPEAFRAMEPIXEL) & PIPE_FRAME_LOW_MASK) >>
- *             PIPE_FRAME_LOW_SHIFT);
- *    high2 = ((INREG(PIPEAFRAMEHIGH) & PIPE_FRAME_HIGH_MASK) >>
- *             PIPE_FRAME_HIGH_SHIFT);
- *  } while (high1 != high2);
- *  frame = (high1 << 8) | low1;
- */
-#define PIPEAFRAMEHIGH          0x70040
-#define PIPEBFRAMEHIGH          0x71040
-#define PIPE_FRAME_HIGH_MASK    0x0000ffff
-#define PIPE_FRAME_HIGH_SHIFT   0
-#define PIPEAFRAMEPIXEL         0x70044
-#define PIPEBFRAMEPIXEL         0x71044
-#define PIPE_FRAME_LOW_MASK     0xff000000
+#define I915_VBLANK_INTERRUPT_ENABLE    (1UL<<17)
-#define PIPE_FRAME_LOW_SHIFT    24
+#define I915_VBLANK_CLEAR               (1UL<<1)
-/*
- * Pixel within the current frame is counted in the PIPEAFRAMEPIXEL register
- * and is 24 bits wide.
- */
-#define PIPE_PIXEL_MASK         0x00ffffff
-#define PIPE_PIXEL_SHIFT        0
-#define I915_FIFO_UNDERRUN_STATUS               (1UL<<31)
-#define I915_CRC_ERROR_ENABLE                   (1UL<<29)
-#define I915_CRC_DONE_ENABLE                    (1UL<<28)
-#define I915_GMBUS_EVENT_ENABLE                 (1UL<<27)
-#define I915_VSYNC_INTERRUPT_ENABLE             (1UL<<25)
-#define I915_DISPLAY_LINE_COMPARE_ENABLE        (1UL<<24)
-#define I915_DPST_EVENT_ENABLE                  (1UL<<23)
-#define I915_LEGACY_BLC_EVENT_ENABLE            (1UL<<22)
-#define I915_ODD_FIELD_INTERRUPT_ENABLE         (1UL<<21)
-#define I915_EVEN_FIELD_INTERRUPT_ENABLE        (1UL<<20)
-#define I915_START_VBLANK_INTERRUPT_ENABLE      (1UL<<18)       /* 965 or later */
-#define I915_VBLANK_INTERRUPT_ENABLE            (1UL<<17)
-#define I915_OVERLAY_UPDATED_ENABLE             (1UL<<16)
-#define I915_CRC_ERROR_INTERRUPT_STATUS         (1UL<<13)
-#define I915_CRC_DONE_INTERRUPT_STATUS          (1UL<<12)
-#define I915_GMBUS_INTERRUPT_STATUS             (1UL<<11)
-#define I915_VSYNC_INTERRUPT_STATUS             (1UL<<9)
-#define I915_DISPLAY_LINE_COMPARE_STATUS        (1UL<<8)
-#define I915_DPST_EVENT_STATUS                  (1UL<<7)
-#define I915_LEGACY_BLC_EVENT_STATUS            (1UL<<6)
-#define I915_ODD_FIELD_INTERRUPT_STATUS         (1UL<<5)
-#define I915_EVEN_FIELD_INTERRUPT_STATUS        (1UL<<4)
-#define I915_START_VBLANK_INTERRUPT_STATUS      (1UL<<2)        /* 965 or later */
-#define I915_VBLANK_INTERRUPT_STATUS            (1UL<<1)
-#define I915_OVERLAY_UPDATED_STATUS             (1UL<<0)
 #define SRX_INDEX               0x3c4
 #define SRX_DATA                0x3c5
@@ -749,6 +672,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 /** P1 value is 2 greater than this field */
 # define VGA0_PD_P1_MASK        (0x1f << 0)
+/* PCI D state control register */
+#define D_STATE         0x6104
 #define DSPCLK_GATE_D   0x6200
 /* I830 CRTC registers */
@@ -1059,6 +984,12 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define PIPECONF_INTERLACE_W_FIELD_INDICATION   (6 << 21)
 #define PIPECONF_INTERLACE_FIELD_0_ONLY         (7 << 21)
+#define DSPARB    0x70030
+#define DSPARB_CSTART_MASK      (0x7f << 7)
+#define DSPARB_CSTART_SHIFT     7
+#define DSPARB_BSTART_MASK      (0x7f)           
+#define DSPARB_BSTART_SHIFT     0
 #define PIPEBCONF 0x71008
 #define PIPEBCONF_ENABLE        (1<<31)
 #define PIPEBCONF_DISABLE       0
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index 023ce66ef3ab..f7f16e7a8bf3 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -38,109 +38,6 @@
 #define MAX_NOPID ((u32)~0)
 /**
- * i915_get_pipe - return the the pipe associated with a given plane
- * @dev: DRM device
- * @plane: plane to look for
- *
- * The Intel Mesa & 2D drivers call the vblank routines with a plane number
- * rather than a pipe number, since they may not always be equal.  This routine
- * maps the given @plane back to a pipe number.
- */
-static int
-i915_get_pipe(struct drm_device *dev, int plane)
-{
-        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32 dspcntr;
-        dspcntr = plane ? I915_READ(DSPBCNTR) : I915_READ(DSPACNTR);
-        return dspcntr & DISPPLANE_SEL_PIPE_MASK ? 1 : 0;
-}
-/**
- * i915_get_plane - return the the plane associated with a given pipe
- * @dev: DRM device
- * @pipe: pipe to look for
- *
- * The Intel Mesa & 2D drivers call the vblank routines with a plane number
- * rather than a plane number, since they may not always be equal.  This routine
- * maps the given @pipe back to a plane number.
- */
-static int
-i915_get_plane(struct drm_device *dev, int pipe)
-{
-        if (i915_get_pipe(dev, 0) == pipe)
-                return 0;
-        return 1;
-}
-/**
- * i915_pipe_enabled - check if a pipe is enabled
- * @dev: DRM device
- * @pipe: pipe to check
- *
- * Reading certain registers when the pipe is disabled can hang the chip.
- * Use this routine to make sure the PLL is running and the pipe is active
- * before reading such registers if unsure.
- */
-static int
-i915_pipe_enabled(struct drm_device *dev, int pipe)
-{
-        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        unsigned long pipeconf = pipe ? PIPEBCONF : PIPEACONF;
-        if (I915_READ(pipeconf) & PIPEACONF_ENABLE)
-                return 1;
-        return 0;
-}
-/**
- * Emit a synchronous flip.
- *
- * This function must be called with the drawable spinlock held.
- */
-static void
-i915_dispatch_vsync_flip(struct drm_device *dev, struct drm_drawable_info *drw,
-                         int plane)
-{
-        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
-        u16 x1, y1, x2, y2;
-        int pf_planes = 1 << plane;
-        /* If the window is visible on the other plane, we have to flip on that
-         * plane as well.
-         */
-        if (plane == 1) {
-                x1 = sarea_priv->planeA_x;
-                y1 = sarea_priv->planeA_y;
-                x2 = x1 + sarea_priv->planeA_w;
-                y2 = y1 + sarea_priv->planeA_h;
-        } else {
-                x1 = sarea_priv->planeB_x;
-                y1 = sarea_priv->planeB_y;
-                x2 = x1 + sarea_priv->planeB_w;
-                y2 = y1 + sarea_priv->planeB_h;
-        }
-        if (x2 > 0 && y2 > 0) {
-                int i, num_rects = drw->num_rects;
-                struct drm_clip_rect *rect = drw->rects;
-                for (i = 0; i < num_rects; i++)
-                        if (!(rect[i].x1 >= x2 || rect[i].y1 >= y2 ||
-                              rect[i].x2 <= x1 || rect[i].y2 <= y1)) {
-                                pf_planes = 0x3;
-                                break;
-                        }
-        }
-        i915_dispatch_flip(dev, pf_planes, 1);
-}
-/**
 * Emit blits for scheduled buffer swaps.
 *
 * This function will be called with the HW lock held.
@@ -148,19 +45,20 @@ i915_dispatch_vsync_flip(struct drm_device *dev, struct drm_drawable_info *drw,
 static void i915_vblank_tasklet(struct drm_device *dev)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        unsigned long irqflags;
        struct list_head *list, *tmp, hits, *hit;
-        int nhits, nrects, slice[2], upper[2], lower[2], i, num_pages;
+        int nhits, nrects, slice[2], upper[2], lower[2], i;
-        unsigned counter[2];
+        unsigned counter[2] = { atomic_read(&dev->vbl_received),
+                                atomic_read(&dev->vbl_received2) };
        struct drm_drawable_info *drw;
        drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
-        u32 cpp = dev_priv->cpp,  offsets[3];
+        u32 cpp = dev_priv->cpp;
        u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
                                XY_SRC_COPY_BLT_WRITE_ALPHA |
                                XY_SRC_COPY_BLT_WRITE_RGB)
                             : XY_SRC_COPY_BLT_CMD;
        u32 src_pitch = sarea_priv->pitch * cpp;
        u32 dst_pitch = sarea_priv->pitch * cpp;
-        /* COPY rop (0xcc), map cpp to magic color depth constants */
        u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24);
        RING_LOCALS;
@@ -173,34 +71,24 @@ static void i915_vblank_tasklet(struct drm_device *dev)
                src_pitch >>= 2;
        }
-        counter[0] = drm_vblank_count(dev, 0);
-        counter[1] = drm_vblank_count(dev, 1);
        DRM_DEBUG("\n");
        INIT_LIST_HEAD(&hits);
        nhits = nrects = 0;
-        /* No irqsave/restore necessary.  This tasklet may be run in an
+        spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
-         * interrupt context or normal context, but we don't have to worry
-         * about getting interrupted by something acquiring the lock, because
-         * we are the interrupt context thing that acquires the lock.
-         */
-        spin_lock(&dev_priv->swaps_lock);
        /* Find buffer swaps scheduled for this vertical blank */
        list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
                drm_i915_vbl_swap_t *vbl_swap =
                        list_entry(list, drm_i915_vbl_swap_t, head);
-                int pipe = i915_get_pipe(dev, vbl_swap->plane);
-                if ((counter[pipe] - vbl_swap->sequence) > (1<<23))
+                if ((counter[vbl_swap->pipe] - vbl_swap->sequence) > (1<<23))
                        continue;
                list_del(list);
                dev_priv->swaps_pending--;
-                drm_vblank_put(dev, pipe);
                spin_unlock(&dev_priv->swaps_lock);
                spin_lock(&dev->drw_lock);
@@ -238,23 +126,43 @@ static void i915_vblank_tasklet(struct drm_device *dev)
                spin_lock(&dev_priv->swaps_lock);
        }
-        spin_unlock(&dev_priv->swaps_lock);
+        if (nhits == 0) {
+                spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
-        if (nhits == 0)
                return;
+        }
+        spin_unlock(&dev_priv->swaps_lock);
        i915_kernel_lost_context(dev);
-        upper[0] = upper[1] = 0;
+        if (IS_I965G(dev)) {
-        slice[0] = max(sarea_priv->planeA_h / nhits, 1);
+                BEGIN_LP_RING(4);
-        slice[1] = max(sarea_priv->planeB_h / nhits, 1);
-        lower[0] = sarea_priv->planeA_y + slice[0];
+                OUT_RING(GFX_OP_DRAWRECT_INFO_I965);
-        lower[1] = sarea_priv->planeB_y + slice[0];
+                OUT_RING(0);
+                OUT_RING(((sarea_priv->width - 1) & 0xffff) | ((sarea_priv->height - 1) << 16));
+                OUT_RING(0);
+                ADVANCE_LP_RING();
+        } else {
+                BEGIN_LP_RING(6);
-        offsets[0] = sarea_priv->front_offset;
+                OUT_RING(GFX_OP_DRAWRECT_INFO);
-        offsets[1] = sarea_priv->back_offset;
+                OUT_RING(0);
-        offsets[2] = sarea_priv->third_offset;
+                OUT_RING(0);
-        num_pages = sarea_priv->third_handle ? 3 : 2;
+                OUT_RING(sarea_priv->width | sarea_priv->height << 16);
+                OUT_RING(sarea_priv->width | sarea_priv->height << 16);
+                OUT_RING(0);
+                ADVANCE_LP_RING();
+        }
+        sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
+        upper[0] = upper[1] = 0;
+        slice[0] = max(sarea_priv->pipeA_h / nhits, 1);
+        slice[1] = max(sarea_priv->pipeB_h / nhits, 1);
+        lower[0] = sarea_priv->pipeA_y + slice[0];
+        lower[1] = sarea_priv->pipeB_y + slice[0];
        spin_lock(&dev->drw_lock);
@@ -266,8 +174,6 @@ static void i915_vblank_tasklet(struct drm_device *dev)
        for (i = 0; i++ < nhits;
             upper[0] = lower[0], lower[0] += slice[0],
             upper[1] = lower[1], lower[1] += slice[1]) {
-                int init_drawrect = 1;
                if (i == nhits)
                        lower[0] = lower[1] = sarea_priv->height;
@@ -275,7 +181,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)
                        drm_i915_vbl_swap_t *swap_hit =
                                list_entry(hit, drm_i915_vbl_swap_t, head);
                        struct drm_clip_rect *rect;
-                        int num_rects, plane, front, back;
+                        int num_rects, pipe;
                        unsigned short top, bottom;
                        drw = drm_get_drawable_info(dev, swap_hit->drw_id);
@@ -283,50 +189,10 @@ static void i915_vblank_tasklet(struct drm_device *dev)
                        if (!drw)
                                continue;
-                        plane = swap_hit->plane;
-                        if (swap_hit->flip) {
-                                i915_dispatch_vsync_flip(dev, drw, plane);
-                                continue;
-                        }
-                        if (init_drawrect) {
-                                int width  = sarea_priv->width;
-                                int height = sarea_priv->height;
-                                if (IS_I965G(dev)) {
-                                        BEGIN_LP_RING(4);
-                                        OUT_RING(GFX_OP_DRAWRECT_INFO_I965);
-                                        OUT_RING(0);
-                                        OUT_RING(((width - 1) & 0xffff) | ((height - 1) << 16));
-                                        OUT_RING(0);
-                                        ADVANCE_LP_RING();
-                                } else {
-                                        BEGIN_LP_RING(6);
-                                        OUT_RING(GFX_OP_DRAWRECT_INFO);
-                                        OUT_RING(0);
-                                        OUT_RING(0);
-                                        OUT_RING(((width - 1) & 0xffff) | ((height - 1) << 16));
-                                        OUT_RING(0);
-                                        OUT_RING(0);
-                                        ADVANCE_LP_RING();
-                                }
-                                sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
-                                init_drawrect = 0;
-                        }
                        rect = drw->rects;
-                        top = upper[plane];
+                        pipe = swap_hit->pipe;
-                        bottom = lower[plane];
+                        top = upper[pipe];
+                        bottom = lower[pipe];
-                        front = (dev_priv->sarea_priv->pf_current_page >>
-                                 (2 * plane)) & 0x3;
-                        back = (front + 1) % num_pages;
                        for (num_rects = drw->num_rects; num_rects--; rect++) {
                                int y1 = max(rect->y1, top);
@@ -341,17 +207,17 @@ static void i915_vblank_tasklet(struct drm_device *dev)
                                OUT_RING(ropcpp | dst_pitch);
                                OUT_RING((y1 << 16) | rect->x1);
                                OUT_RING((y2 << 16) | rect->x2);
-                                OUT_RING(offsets[front]);
+                                OUT_RING(sarea_priv->front_offset);
                                OUT_RING((y1 << 16) | rect->x1);
                                OUT_RING(src_pitch);
-                                OUT_RING(offsets[back]);
+                                OUT_RING(sarea_priv->back_offset);
                                ADVANCE_LP_RING();
                        }
                }
        }
-        spin_unlock(&dev->drw_lock);
+        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
        list_for_each_safe(hit, tmp, &hits) {
                drm_i915_vbl_swap_t *swap_hit =
@@ -363,112 +229,67 @@ static void i915_vblank_tasklet(struct drm_device *dev)
        }
 }
-u32 i915_get_vblank_counter(struct drm_device *dev, int plane)
-{
-        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        unsigned long high_frame;
-        unsigned long low_frame;
-        u32 high1, high2, low, count;
-        int pipe;
-        pipe = i915_get_pipe(dev, plane);
-        high_frame = pipe ? PIPEBFRAMEHIGH : PIPEAFRAMEHIGH;
-        low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;
-        if (!i915_pipe_enabled(dev, pipe)) {
-            printk(KERN_ERR "trying to get vblank count for disabled "
-                   "pipe %d\n", pipe);
-            return 0;
-        }
-        /*
-         * High & low register fields aren't synchronized, so make sure
-         * we get a low value that's stable across two reads of the high
-         * register.
-         */
-        do {
-                high1 = ((I915_READ(high_frame) & PIPE_FRAME_HIGH_MASK) >>
-                         PIPE_FRAME_HIGH_SHIFT);
-                low =  ((I915_READ(low_frame) & PIPE_FRAME_LOW_MASK) >>
-                        PIPE_FRAME_LOW_SHIFT);
-                high2 = ((I915_READ(high_frame) & PIPE_FRAME_HIGH_MASK) >>
-                         PIPE_FRAME_HIGH_SHIFT);
-        } while (high1 != high2);
-        count = (high1 << 8) | low;
-        /* count may be reset by other driver(e.g. 2D driver),
-           we have no way to know if it is wrapped or resetted
-           when count is zero. do a rough guess.
-        */
-        if (count == 0 && dev->last_vblank[pipe] < dev->max_vblank_count/2)
-                dev->last_vblank[pipe] = 0;
-        return count;
-}
 irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 {
        struct drm_device *dev = (struct drm_device *) arg;
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32 iir;
+        u16 temp;
        u32 pipea_stats, pipeb_stats;
-        int vblank = 0;
-        iir = I915_READ(I915REG_INT_IDENTITY_R);
-        if (iir == 0) {
-                DRM_DEBUG ("iir 0x%08x im 0x%08x ie 0x%08x pipea 0x%08x pipeb 0x%08x\n",
-                           iir,
-                           I915_READ(I915REG_INT_MASK_R),
-                           I915_READ(I915REG_INT_ENABLE_R),
-                           I915_READ(I915REG_PIPEASTAT),
-                           I915_READ(I915REG_PIPEBSTAT));
-                return IRQ_NONE;
-        }
-        /*
+        pipea_stats = I915_READ(I915REG_PIPEASTAT);
-         * Clear the PIPE(A|B)STAT regs before the IIR otherwise
+        pipeb_stats = I915_READ(I915REG_PIPEBSTAT);
-         * we may get extra interrupts.
-         */
-        if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
-                pipea_stats = I915_READ(I915REG_PIPEASTAT);
-                if (pipea_stats & (I915_START_VBLANK_INTERRUPT_STATUS|
-                                   I915_VBLANK_INTERRUPT_STATUS))
-                {
-                        vblank++;
-                        drm_handle_vblank(dev, i915_get_plane(dev, 0));
-                }
-                I915_WRITE(I915REG_PIPEASTAT, pipea_stats);
-        }
-        if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
-                pipeb_stats = I915_READ(I915REG_PIPEBSTAT);
-                if (pipeb_stats & (I915_START_VBLANK_INTERRUPT_STATUS|
-                                   I915_VBLANK_INTERRUPT_STATUS))
-                {
-                        vblank++;
-                        drm_handle_vblank(dev, i915_get_plane(dev, 1));
-                }
-                I915_WRITE(I915REG_PIPEBSTAT, pipeb_stats);
-        }
-        if (dev_priv->sarea_priv)
+        temp = I915_READ16(I915REG_INT_IDENTITY_R);
-            dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
-        I915_WRITE(I915REG_INT_IDENTITY_R, iir);
+        temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG);
-        (void) I915_READ(I915REG_INT_IDENTITY_R); /* Flush posted write */
-        if (iir & I915_USER_INTERRUPT) {
+        DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
+        if (temp == 0)
+                return IRQ_NONE;
+        I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
+        (void) I915_READ16(I915REG_INT_IDENTITY_R);
+        DRM_READMEMORYBARRIER();
+        dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
+        if (temp & USER_INT_FLAG)
                DRM_WAKEUP(&dev_priv->irq_queue);
-        }
-        if (vblank) {
+        if (temp & (VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG)) {
+                int vblank_pipe = dev_priv->vblank_pipe;
+                if ((vblank_pipe &
+                     (DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B))
+                    == (DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B)) {
+                        if (temp & VSYNC_PIPEA_FLAG)
+                                atomic_inc(&dev->vbl_received);
+                        if (temp & VSYNC_PIPEB_FLAG)
+                                atomic_inc(&dev->vbl_received2);
+                } else if (((temp & VSYNC_PIPEA_FLAG) &&
+                            (vblank_pipe & DRM_I915_VBLANK_PIPE_A)) ||
+                           ((temp & VSYNC_PIPEB_FLAG) &&
+                            (vblank_pipe & DRM_I915_VBLANK_PIPE_B)))
+                        atomic_inc(&dev->vbl_received);
+                DRM_WAKEUP(&dev->vbl_queue);
+                drm_vbl_send_signals(dev);
                if (dev_priv->swaps_pending > 0)
                        drm_locked_tasklet(dev, i915_vblank_tasklet);
+                I915_WRITE(I915REG_PIPEASTAT,
+                        pipea_stats|I915_VBLANK_INTERRUPT_ENABLE|
+                        I915_VBLANK_CLEAR);
+                I915_WRITE(I915REG_PIPEBSTAT,
+                        pipeb_stats|I915_VBLANK_INTERRUPT_ENABLE|
+                        I915_VBLANK_CLEAR);
        }
        return IRQ_HANDLED;
 }
-static int i915_emit_irq(struct drm_device *dev)
+static int i915_emit_irq(struct drm_device * dev)
 {
        drm_i915_private_t *dev_priv = dev->dev_private;
        RING_LOCALS;
@@ -515,12 +336,42 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
                          READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
        }
-        if (dev_priv->sarea_priv)
+        dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
-                dev_priv->sarea_priv->last_dispatch =
-                        READ_BREADCRUMB(dev_priv);
        return ret;
 }
+static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequence,
+                                      atomic_t *counter)
+{
+        drm_i915_private_t *dev_priv = dev->dev_private;
+        unsigned int cur_vblank;
+        int ret = 0;
+        if (!dev_priv) {
+                DRM_ERROR("called with no initialization\n");
+                return -EINVAL;
+        }
+        DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
+                    (((cur_vblank = atomic_read(counter))
+                        - *sequence) <= (1<<23)));
+        *sequence = cur_vblank;
+        return ret;
+}
+int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence)
+{
+        return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received);
+}
+int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence)
+{
+        return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received2);
+}
 /* Needs the lock as it touches the ring.
 */
 int i915_irq_emit(struct drm_device *dev, void *data,
@@ -563,96 +414,18 @@ int i915_irq_wait(struct drm_device *dev, void *data,
        return i915_wait_irq(dev, irqwait->irq_seq);
 }
-int i915_enable_vblank(struct drm_device *dev, int plane)
-{
-        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        int pipe = i915_get_pipe(dev, plane);
-        u32     pipestat_reg = 0;
-        u32     pipestat;
-        switch (pipe) {
-        case 0:
-                pipestat_reg = I915REG_PIPEASTAT;
-                dev_priv->irq_enable_reg |= I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
-                break;
-        case 1:
-                pipestat_reg = I915REG_PIPEBSTAT;
-                dev_priv->irq_enable_reg |= I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
-                break;
-        default:
-                DRM_ERROR("tried to enable vblank on non-existent pipe %d\n",
-                          pipe);
-                break;
-        }
-        if (pipestat_reg)
-        {
-                pipestat = I915_READ (pipestat_reg);
-                /*
-                 * Older chips didn't have the start vblank interrupt,
-                 * but
-                 */
-                if (IS_I965G (dev))
-                        pipestat |= I915_START_VBLANK_INTERRUPT_ENABLE;
-                else
-                        pipestat |= I915_VBLANK_INTERRUPT_ENABLE;
-                /*
-                 * Clear any pending status
-                 */
-                pipestat |= (I915_START_VBLANK_INTERRUPT_STATUS |
-                             I915_VBLANK_INTERRUPT_STATUS);
-                I915_WRITE(pipestat_reg, pipestat);
-        }
-        I915_WRITE(I915REG_INT_ENABLE_R, dev_priv->irq_enable_reg);
-        return 0;
-}
-void i915_disable_vblank(struct drm_device *dev, int plane)
-{
-        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        int pipe = i915_get_pipe(dev, plane);
-        u32     pipestat_reg = 0;
-        u32     pipestat;
-        switch (pipe) {
-        case 0:
-                pipestat_reg = I915REG_PIPEASTAT;
-                dev_priv->irq_enable_reg &= ~I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
-                break;
-        case 1:
-                pipestat_reg = I915REG_PIPEBSTAT;
-                dev_priv->irq_enable_reg &= ~I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
-                break;
-        default:
-                DRM_ERROR("tried to disable vblank on non-existent pipe %d\n",
-                          pipe);
-                break;
-        }
-        I915_WRITE(I915REG_INT_ENABLE_R, dev_priv->irq_enable_reg);
-        if (pipestat_reg)
-        {
-                pipestat = I915_READ (pipestat_reg);
-                pipestat &= ~(I915_START_VBLANK_INTERRUPT_ENABLE |
-                              I915_VBLANK_INTERRUPT_ENABLE);
-                /*
-                 * Clear any pending status
-                 */
-                pipestat |= (I915_START_VBLANK_INTERRUPT_STATUS |
-                             I915_VBLANK_INTERRUPT_STATUS);
-                I915_WRITE(pipestat_reg, pipestat);
-        }
-}
 static void i915_enable_interrupt (struct drm_device *dev)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        u16 flag;
-        dev_priv->irq_enable_reg |= I915_USER_INTERRUPT;
+        flag = 0;
+        if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A)
+                flag |= VSYNC_PIPEA_FLAG;
+        if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B)
+                flag |= VSYNC_PIPEB_FLAG;
-        I915_WRITE(I915REG_INT_ENABLE_R, dev_priv->irq_enable_reg);
+        I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | flag);
-        dev_priv->irq_enabled = 1;
 }
 /* Set the vblank monitor pipe
@@ -675,6 +448,8 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
        dev_priv->vblank_pipe = pipe->pipe;
+        i915_enable_interrupt (dev);
        return 0;
 }
@@ -692,9 +467,9 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
        flag = I915_READ(I915REG_INT_ENABLE_R);
        pipe->pipe = 0;
-        if (flag & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT)
+        if (flag & VSYNC_PIPEA_FLAG)
                pipe->pipe |= DRM_I915_VBLANK_PIPE_A;
-        if (flag & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
+        if (flag & VSYNC_PIPEB_FLAG)
                pipe->pipe |= DRM_I915_VBLANK_PIPE_B;
        return 0;
@@ -709,30 +484,27 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
        drm_i915_private_t *dev_priv = dev->dev_private;
        drm_i915_vblank_swap_t *swap = data;
        drm_i915_vbl_swap_t *vbl_swap;
-        unsigned int pipe, seqtype, curseq, plane;
+        unsigned int pipe, seqtype, curseq;
        unsigned long irqflags;
        struct list_head *list;
-        int ret;
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __func__);
                return -EINVAL;
        }
-        if (!dev_priv->sarea_priv || dev_priv->sarea_priv->rotation) {
+        if (dev_priv->sarea_priv->rotation) {
                DRM_DEBUG("Rotation not supported\n");
                return -EINVAL;
        }
        if (swap->seqtype & ~(_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE |
-                             _DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS |
+                             _DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS)) {
-                             _DRM_VBLANK_FLIP)) {
                DRM_ERROR("Invalid sequence type 0x%x\n", swap->seqtype);
                return -EINVAL;
        }
-        plane = (swap->seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0;
+        pipe = (swap->seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0;
-        pipe = i915_get_pipe(dev, plane);
        seqtype = swap->seqtype & (_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE);
@@ -743,11 +515,6 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
        spin_lock_irqsave(&dev->drw_lock, irqflags);
-        /* It makes no sense to schedule a swap for a drawable that doesn't have
-         * valid information at this point. E.g. this could mean that the X
-         * server is too old to push drawable information to the DRM, in which
-         * case all such swaps would become ineffective.
-         */
        if (!drm_get_drawable_info(dev, swap->drawable)) {
                spin_unlock_irqrestore(&dev->drw_lock, irqflags);
                DRM_DEBUG("Invalid drawable ID %d\n", swap->drawable);
@@ -756,8 +523,7 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-        drm_update_vblank_count(dev, pipe);
+        curseq = atomic_read(pipe ? &dev->vbl_received2 : &dev->vbl_received);
-        curseq = drm_vblank_count(dev, pipe);
        if (seqtype == _DRM_VBLANK_RELATIVE)
                swap->sequence += curseq;
@@ -771,43 +537,14 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
                }
        }
-        if (swap->seqtype & _DRM_VBLANK_FLIP) {
-                swap->sequence--;
-                if ((curseq - swap->sequence) <= (1<<23)) {
-                        struct drm_drawable_info *drw;
-                        LOCK_TEST_WITH_RETURN(dev, file_priv);
-                        spin_lock_irqsave(&dev->drw_lock, irqflags);
-                        drw = drm_get_drawable_info(dev, swap->drawable);
-                        if (!drw) {
-                                spin_unlock_irqrestore(&dev->drw_lock,
-                                    irqflags);
-                                DRM_DEBUG("Invalid drawable ID %d\n",
-                                          swap->drawable);
-                                return -EINVAL;
-                        }
-                        i915_dispatch_vsync_flip(dev, drw, plane);
-                        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
-                        return 0;
-                }
-        }
        spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
        list_for_each(list, &dev_priv->vbl_swaps.head) {
                vbl_swap = list_entry(list, drm_i915_vbl_swap_t, head);
                if (vbl_swap->drw_id == swap->drawable &&
-                    vbl_swap->plane == plane &&
+                    vbl_swap->pipe == pipe &&
                    vbl_swap->sequence == swap->sequence) {
-                        vbl_swap->flip = (swap->seqtype & _DRM_VBLANK_FLIP);
                        spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
                        DRM_DEBUG("Already scheduled\n");
                        return 0;
@@ -830,19 +567,9 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
        DRM_DEBUG("\n");
-        ret = drm_vblank_get(dev, pipe);
-        if (ret) {
-                drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
-                return ret;
-        }
        vbl_swap->drw_id = swap->drawable;
-        vbl_swap->plane = plane;
+        vbl_swap->pipe = pipe;
        vbl_swap->sequence = swap->sequence;
-        vbl_swap->flip = (swap->seqtype & _DRM_VBLANK_FLIP);
-        if (vbl_swap->flip)
-                swap->sequence++;
        spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
@@ -860,57 +587,37 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        I915_WRITE16(I915REG_HWSTAM, 0xeffe);
+        I915_WRITE16(I915REG_HWSTAM, 0xfffe);
        I915_WRITE16(I915REG_INT_MASK_R, 0x0);
        I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
 }
-int i915_driver_irq_postinstall(struct drm_device * dev)
+void i915_driver_irq_postinstall(struct drm_device * dev)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        int ret, num_pipes = 2;
        spin_lock_init(&dev_priv->swaps_lock);
        INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
        dev_priv->swaps_pending = 0;
-        dev_priv->user_irq_refcount = 0;
+        if (!dev_priv->vblank_pipe)
-        dev_priv->irq_enable_reg = 0;
+                dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A;
-        ret = drm_vblank_init(dev, num_pipes);
-        if (ret)
-                return ret;
-        dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
        i915_enable_interrupt(dev);
        DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
-        /*
-         * Initialize the hardware status page IRQ location.
-         */
-        I915_WRITE(I915REG_INSTPM, (1 << 5) | (1 << 21));
-        return 0;
 }
 void i915_driver_irq_uninstall(struct drm_device * dev)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u32 temp;
+        u16 temp;
        if (!dev_priv)
                return;
-        dev_priv->irq_enabled = 0;
+        I915_WRITE16(I915REG_HWSTAM, 0xffff);
-        I915_WRITE(I915REG_HWSTAM, 0xffffffff);
+        I915_WRITE16(I915REG_INT_MASK_R, 0xffff);
-        I915_WRITE(I915REG_INT_MASK_R, 0xffffffff);
+        I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
-        I915_WRITE(I915REG_INT_ENABLE_R, 0x0);
+        temp = I915_READ16(I915REG_INT_IDENTITY_R);
-        temp = I915_READ(I915REG_PIPEASTAT);
+        I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
-        I915_WRITE(I915REG_PIPEASTAT, temp);
-        temp = I915_READ(I915REG_PIPEBSTAT);
-        I915_WRITE(I915REG_PIPEBSTAT, temp);
-        temp = I915_READ(I915REG_INT_IDENTITY_R);
-        I915_WRITE(I915REG_INT_IDENTITY_R, temp);
 }
diff --git a/drivers/char/drm/mga_drv.c b/drivers/char/drm/mga_drv.c
index 6b3790939e76..5572939fc7d1 100644
--- a/drivers/char/drm/mga_drv.c
+++ b/drivers/char/drm/mga_drv.c
@@ -45,16 +45,15 @@ static struct pci_device_id pciidlist[] = {
 static struct drm_driver driver = {
        .driver_features =
            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA |
-            DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
+            DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
+            DRIVER_IRQ_VBL,
        .dev_priv_size = sizeof(drm_mga_buf_priv_t),
        .load = mga_driver_load,
        .unload = mga_driver_unload,
        .lastclose = mga_driver_lastclose,
        .dma_quiescent = mga_driver_dma_quiescent,
        .device_is_agp = mga_driver_device_is_agp,
-        .get_vblank_counter = mga_get_vblank_counter,
+        .vblank_wait = mga_driver_vblank_wait,
-        .enable_vblank = mga_enable_vblank,
-        .disable_vblank = mga_disable_vblank,
        .irq_preinstall = mga_driver_irq_preinstall,
        .irq_postinstall = mga_driver_irq_postinstall,
        .irq_uninstall = mga_driver_irq_uninstall,
diff --git a/drivers/char/drm/mga_drv.h b/drivers/char/drm/mga_drv.h
index 8f7291f36363..f6ebd24bd587 100644
--- a/drivers/char/drm/mga_drv.h
+++ b/drivers/char/drm/mga_drv.h
@@ -120,7 +120,6 @@ typedef struct drm_mga_private {
        u32 clear_cmd;
        u32 maccess;
-        atomic_t vbl_received;          /**< Number of vblanks received. */
        wait_queue_head_t fence_queue;
        atomic_t last_fence_retired;
        u32 next_fence_to_post;
@@ -182,14 +181,11 @@ extern int mga_warp_install_microcode(drm_mga_private_t * dev_priv);
 extern int mga_warp_init(drm_mga_private_t * dev_priv);
                                /* mga_irq.c */
-extern int mga_enable_vblank(struct drm_device *dev, int crtc);
-extern void mga_disable_vblank(struct drm_device *dev, int crtc);
-extern u32 mga_get_vblank_counter(struct drm_device *dev, int crtc);
 extern int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence);
 extern int mga_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);
 extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);
 extern void mga_driver_irq_preinstall(struct drm_device * dev);
-extern int mga_driver_irq_postinstall(struct drm_device * dev);
+extern void mga_driver_irq_postinstall(struct drm_device * dev);
 extern void mga_driver_irq_uninstall(struct drm_device * dev);
 extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,
                             unsigned long arg);
diff --git a/drivers/char/drm/mga_irq.c b/drivers/char/drm/mga_irq.c
index 06852fb4b278..9302cb8f0f83 100644
--- a/drivers/char/drm/mga_irq.c
+++ b/drivers/char/drm/mga_irq.c
@@ -35,20 +35,6 @@
 #include "mga_drm.h"
 #include "mga_drv.h"
-u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
-{
-        const drm_mga_private_t *const dev_priv =
-                (drm_mga_private_t *) dev->dev_private;
-        if (crtc != 0) {
-                return 0;
-        }
-        return atomic_read(&dev_priv->vbl_received);
-}
 irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
 {
        struct drm_device *dev = (struct drm_device *) arg;
@@ -61,8 +47,9 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
        /* VBLANK interrupt */
        if (status & MGA_VLINEPEN) {
                MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
-                atomic_inc(&dev_priv->vbl_received);
+                atomic_inc(&dev->vbl_received);
-                drm_handle_vblank(dev, 0);
+                DRM_WAKEUP(&dev->vbl_queue);
+                drm_vbl_send_signals(dev);
                handled = 1;
        }
@@ -91,34 +78,22 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
        return IRQ_NONE;
 }
-int mga_enable_vblank(struct drm_device *dev, int crtc)
+int mga_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)
 {
-        drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
+        unsigned int cur_vblank;
+        int ret = 0;
-        if (crtc != 0) {
-                DRM_ERROR("tried to enable vblank on non-existent crtc %d\n",
-                          crtc);
-                return 0;
-        }
-        MGA_WRITE(MGA_IEN, MGA_VLINEIEN | MGA_SOFTRAPEN);
-        return 0;
-}
+        /* Assume that the user has missed the current sequence number
+         * by about a day rather than she wants to wait for years
+         * using vertical blanks...
+         */
+        DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
+                    (((cur_vblank = atomic_read(&dev->vbl_received))
+                      - *sequence) <= (1 << 23)));
-void mga_disable_vblank(struct drm_device *dev, int crtc)
+        *sequence = cur_vblank;
-{
-        if (crtc != 0) {
-                DRM_ERROR("tried to disable vblank on non-existent crtc %d\n",
-                          crtc);
-        }
-        /* Do *NOT* disable the vertical refresh interrupt.  MGA doesn't have
+        return ret;
-         * a nice hardware counter that tracks the number of refreshes when
-         * the interrupt is disabled, and the kernel doesn't know the refresh
-         * rate to calculate an estimate.
-         */
-        /* MGA_WRITE(MGA_IEN, MGA_VLINEIEN | MGA_SOFTRAPEN); */
 }
 int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence)
@@ -150,22 +125,14 @@ void mga_driver_irq_preinstall(struct drm_device * dev)
        MGA_WRITE(MGA_ICLEAR, ~0);
 }
-int mga_driver_irq_postinstall(struct drm_device * dev)
+void mga_driver_irq_postinstall(struct drm_device * dev)
 {
        drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private;
-        int ret;
-        ret = drm_vblank_init(dev, 1);
-        if (ret)
-                return ret;
        DRM_INIT_WAITQUEUE(&dev_priv->fence_queue);
-        /* Turn on soft trap interrupt.  Vertical blank interrupts are enabled
+        /* Turn on vertical blank interrupt and soft trap interrupt. */
-         * in mga_enable_vblank.
+        MGA_WRITE(MGA_IEN, MGA_VLINEIEN | MGA_SOFTRAPEN);
-         */
-        MGA_WRITE(MGA_IEN, MGA_SOFTRAPEN);
-        return 0;
 }
 void mga_driver_irq_uninstall(struct drm_device * dev)
diff --git a/drivers/char/drm/r128_drv.c b/drivers/char/drm/r128_drv.c
index 2888aa01ebc7..6108e7587e12 100644
--- a/drivers/char/drm/r128_drv.c
+++ b/drivers/char/drm/r128_drv.c
@@ -43,13 +43,12 @@ static struct pci_device_id pciidlist[] = {
 static struct drm_driver driver = {
        .driver_features =
            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
-            DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
+            DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED |
+            DRIVER_IRQ_VBL,
        .dev_priv_size = sizeof(drm_r128_buf_priv_t),
        .preclose = r128_driver_preclose,
        .lastclose = r128_driver_lastclose,
-        .get_vblank_counter = r128_get_vblank_counter,
+        .vblank_wait = r128_driver_vblank_wait,
-        .enable_vblank = r128_enable_vblank,
-        .disable_vblank = r128_disable_vblank,
        .irq_preinstall = r128_driver_irq_preinstall,
        .irq_postinstall = r128_driver_irq_postinstall,
        .irq_uninstall = r128_driver_irq_uninstall,
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index 80af9e09e75d..011105e51ac6 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -97,8 +97,6 @@ typedef struct drm_r128_private {
        u32 crtc_offset;
        u32 crtc_offset_cntl;
-        atomic_t vbl_received;
        u32 color_fmt;
        unsigned int front_offset;
        unsigned int front_pitch;
@@ -151,12 +149,11 @@ extern int r128_wait_ring(drm_r128_private_t * dev_priv, int n);
 extern int r128_do_cce_idle(drm_r128_private_t * dev_priv);
 extern int r128_do_cleanup_cce(struct drm_device * dev);
-extern int r128_enable_vblank(struct drm_device *dev, int crtc);
+extern int r128_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);
-extern void r128_disable_vblank(struct drm_device *dev, int crtc);
-extern u32 r128_get_vblank_counter(struct drm_device *dev, int crtc);
 extern irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS);
 extern void r128_driver_irq_preinstall(struct drm_device * dev);
-extern int r128_driver_irq_postinstall(struct drm_device * dev);
+extern void r128_driver_irq_postinstall(struct drm_device * dev);
 extern void r128_driver_irq_uninstall(struct drm_device * dev);
 extern void r128_driver_lastclose(struct drm_device * dev);
 extern void r128_driver_preclose(struct drm_device * dev,
diff --git a/drivers/char/drm/r128_irq.c b/drivers/char/drm/r128_irq.c
index 5b95bd898f95..c76fdca7662d 100644
--- a/drivers/char/drm/r128_irq.c
+++ b/drivers/char/drm/r128_irq.c
@@ -35,16 +35,6 @@
 #include "r128_drm.h"
 #include "r128_drv.h"
-u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
-{
-        const drm_r128_private_t *dev_priv = dev->dev_private;
-        if (crtc != 0)
-                return 0;
-        return atomic_read(&dev_priv->vbl_received);
-}
 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
 {
        struct drm_device *dev = (struct drm_device *) arg;
@@ -56,38 +46,30 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
        /* VBLANK interrupt */
        if (status & R128_CRTC_VBLANK_INT) {
                R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
-                atomic_inc(&dev_priv->vbl_received);
+                atomic_inc(&dev->vbl_received);
-                drm_handle_vblank(dev, 0);
+                DRM_WAKEUP(&dev->vbl_queue);
+                drm_vbl_send_signals(dev);
                return IRQ_HANDLED;
        }
        return IRQ_NONE;
 }
-int r128_enable_vblank(struct drm_device *dev, int crtc)
+int r128_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)
 {
-        drm_r128_private_t *dev_priv = dev->dev_private;
+        unsigned int cur_vblank;
+        int ret = 0;
-        if (crtc != 0) {
-                DRM_ERROR("%s:  bad crtc %d\n", __FUNCTION__, crtc);
-                return -EINVAL;
-        }
-        R128_WRITE(R128_GEN_INT_CNTL, R128_CRTC_VBLANK_INT_EN);
+        /* Assume that the user has missed the current sequence number
-        return 0;
+         * by about a day rather than she wants to wait for years
-}
+         * using vertical blanks...
+         */
+        DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
+                    (((cur_vblank = atomic_read(&dev->vbl_received))
+                      - *sequence) <= (1 << 23)));
-void r128_disable_vblank(struct drm_device *dev, int crtc)
+        *sequence = cur_vblank;
-{
-        if (crtc != 0)
-                DRM_ERROR("%s:  bad crtc %d\n", __FUNCTION__, crtc);
-        /*
+        return ret;
-         * FIXME: implement proper interrupt disable by using the vblank
-         * counter register (if available)
-         *
-         * R128_WRITE(R128_GEN_INT_CNTL,
-         *            R128_READ(R128_GEN_INT_CNTL) & ~R128_CRTC_VBLANK_INT_EN);
-         */
 }
 void r128_driver_irq_preinstall(struct drm_device * dev)
@@ -100,9 +82,12 @@ void r128_driver_irq_preinstall(struct drm_device * dev)
        R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
 }
-int r128_driver_irq_postinstall(struct drm_device * dev)
+void r128_driver_irq_postinstall(struct drm_device * dev)
 {
-        return drm_vblank_init(dev, 1);
+        drm_r128_private_t *dev_priv = (drm_r128_private_t *) dev->dev_private;
+        /* Turn on VBL interrupt */
+        R128_WRITE(R128_GEN_INT_CNTL, R128_CRTC_VBLANK_INT_EN);
 }
 void r128_driver_irq_uninstall(struct drm_device * dev)
diff --git a/drivers/char/drm/radeon_drv.c b/drivers/char/drm/radeon_drv.c
index a2610319624d..349ac3d3b848 100644
--- a/drivers/char/drm/radeon_drv.c
+++ b/drivers/char/drm/radeon_drv.c
@@ -59,7 +59,8 @@ static struct pci_device_id pciidlist[] = {
 static struct drm_driver driver = {
        .driver_features =
            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
-            DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED,
+            DRIVER_HAVE_IRQ | DRIVER_HAVE_DMA | DRIVER_IRQ_SHARED |
+            DRIVER_IRQ_VBL | DRIVER_IRQ_VBL2,
        .dev_priv_size = sizeof(drm_radeon_buf_priv_t),
        .load = radeon_driver_load,
        .firstopen = radeon_driver_firstopen,
@@ -68,9 +69,8 @@ static struct drm_driver driver = {
        .postclose = radeon_driver_postclose,
        .lastclose = radeon_driver_lastclose,
        .unload = radeon_driver_unload,
-        .get_vblank_counter = radeon_get_vblank_counter,
+        .vblank_wait = radeon_driver_vblank_wait,
-        .enable_vblank = radeon_enable_vblank,
+        .vblank_wait2 = radeon_driver_vblank_wait2,
-        .disable_vblank = radeon_disable_vblank,
        .dri_library_name = dri_library_name,
        .irq_preinstall = radeon_driver_irq_preinstall,
        .irq_postinstall = radeon_driver_irq_postinstall,
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index b791420bd3d9..173ae620223a 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -304,9 +304,6 @@ typedef struct drm_radeon_private {
        u32 scratch_ages[5];
-        unsigned int crtc_last_cnt;
-        unsigned int crtc2_last_cnt;
        /* starting from here on, data is preserved accross an open */
        uint32_t flags;         /* see radeon_chip_flags */
        unsigned long fb_aper_offset;
@@ -377,13 +374,13 @@ extern int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *
 extern int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv);
 extern void radeon_do_release(struct drm_device * dev);
-extern u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc);
+extern int radeon_driver_vblank_wait(struct drm_device * dev,
-extern int radeon_enable_vblank(struct drm_device *dev, int crtc);
+                                     unsigned int *sequence);
-extern void radeon_disable_vblank(struct drm_device *dev, int crtc);
+extern int radeon_driver_vblank_wait2(struct drm_device * dev,
-extern void radeon_do_release(struct drm_device * dev);
+                                      unsigned int *sequence);
 extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS);
 extern void radeon_driver_irq_preinstall(struct drm_device * dev);
-extern int radeon_driver_irq_postinstall(struct drm_device * dev);
+extern void radeon_driver_irq_postinstall(struct drm_device * dev);
 extern void radeon_driver_irq_uninstall(struct drm_device * dev);
 extern int radeon_vblank_crtc_get(struct drm_device *dev);
 extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value);
@@ -561,12 +558,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
                                ? DRM_READ32( dev_priv->ring_rptr, RADEON_SCRATCHOFF(x) ) \
                                : RADEON_READ( RADEON_SCRATCH_REG0 + 4*(x) ) )
-#define RADEON_CRTC_CRNT_FRAME 0x0214
-#define RADEON_CRTC2_CRNT_FRAME 0x0314
-#define RADEON_CRTC_STATUS              0x005c
-#define RADEON_CRTC2_STATUS             0x03fc
 #define RADEON_GEN_INT_CNTL             0x0040
 #       define RADEON_CRTC_VBLANK_MASK          (1 << 0)
 #       define RADEON_CRTC2_VBLANK_MASK         (1 << 9)
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index 507d6b747a13..009af3814b6f 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -35,61 +35,12 @@
 #include "radeon_drm.h"
 #include "radeon_drv.h"
-static void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state)
+static __inline__ u32 radeon_acknowledge_irqs(drm_radeon_private_t * dev_priv,
+                                              u32 mask)
 {
-        drm_radeon_private_t *dev_priv = dev->dev_private;
+        u32 irqs = RADEON_READ(RADEON_GEN_INT_STATUS) & mask;
-        if (state)
-                dev_priv->irq_enable_reg |= mask;
-        else
-                dev_priv->irq_enable_reg &= ~mask;
-        RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
-}
-int radeon_enable_vblank(struct drm_device *dev, int crtc)
-{
-        switch (crtc) {
-        case 0:
-                radeon_irq_set_state(dev, RADEON_CRTC_VBLANK_MASK, 1);
-                break;
-        case 1:
-                radeon_irq_set_state(dev, RADEON_CRTC2_VBLANK_MASK, 1);
-                break;
-        default:
-                DRM_ERROR("tried to enable vblank on non-existent crtc %d\n",
-                          crtc);
-                return EINVAL;
-        }
-        return 0;
-}
-void radeon_disable_vblank(struct drm_device *dev, int crtc)
-{
-        switch (crtc) {
-        case 0:
-                radeon_irq_set_state(dev, RADEON_CRTC_VBLANK_MASK, 0);
-                break;
-        case 1:
-                radeon_irq_set_state(dev, RADEON_CRTC2_VBLANK_MASK, 0);
-                break;
-        default:
-                DRM_ERROR("tried to enable vblank on non-existent crtc %d\n",
-                          crtc);
-                break;
-        }
-}
-static __inline__ u32 radeon_acknowledge_irqs(drm_radeon_private_t * dev_priv)
-{
-        u32 irqs = RADEON_READ(RADEON_GEN_INT_STATUS) &
-                (RADEON_SW_INT_TEST | RADEON_CRTC_VBLANK_STAT |
-                 RADEON_CRTC2_VBLANK_STAT);
        if (irqs)
                RADEON_WRITE(RADEON_GEN_INT_STATUS, irqs);
        return irqs;
 }
@@ -121,21 +72,39 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS)
        /* Only consider the bits we're interested in - others could be used
         * outside the DRM
         */
-        stat = radeon_acknowledge_irqs(dev_priv);
+        stat = radeon_acknowledge_irqs(dev_priv, (RADEON_SW_INT_TEST_ACK |
+                                                  RADEON_CRTC_VBLANK_STAT |
+                                                  RADEON_CRTC2_VBLANK_STAT));
        if (!stat)
                return IRQ_NONE;
        stat &= dev_priv->irq_enable_reg;
        /* SW interrupt */
-        if (stat & RADEON_SW_INT_TEST)
+        if (stat & RADEON_SW_INT_TEST) {
                DRM_WAKEUP(&dev_priv->swi_queue);
+        }
        /* VBLANK interrupt */
-        if (stat & RADEON_CRTC_VBLANK_STAT)
+        if (stat & (RADEON_CRTC_VBLANK_STAT|RADEON_CRTC2_VBLANK_STAT)) {
-                drm_handle_vblank(dev, 0);
+                int vblank_crtc = dev_priv->vblank_crtc;
-        if (stat & RADEON_CRTC2_VBLANK_STAT)
-                drm_handle_vblank(dev, 1);
+                if ((vblank_crtc &
+                     (DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) ==
+                    (DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) {
+                        if (stat & RADEON_CRTC_VBLANK_STAT)
+                                atomic_inc(&dev->vbl_received);
+                        if (stat & RADEON_CRTC2_VBLANK_STAT)
+                                atomic_inc(&dev->vbl_received2);
+                } else if (((stat & RADEON_CRTC_VBLANK_STAT) &&
+                           (vblank_crtc & DRM_RADEON_VBLANK_CRTC1)) ||
+                           ((stat & RADEON_CRTC2_VBLANK_STAT) &&
+                            (vblank_crtc & DRM_RADEON_VBLANK_CRTC2)))
+                        atomic_inc(&dev->vbl_received);
+                DRM_WAKEUP(&dev->vbl_queue);
+                drm_vbl_send_signals(dev);
+        }
        return IRQ_HANDLED;
 }
@@ -175,27 +144,54 @@ static int radeon_wait_irq(struct drm_device * dev, int swi_nr)
        return ret;
 }
-u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc)
+static int radeon_driver_vblank_do_wait(struct drm_device * dev,
+                                        unsigned int *sequence, int crtc)
 {
-        drm_radeon_private_t *dev_priv = dev->dev_private;
+        drm_radeon_private_t *dev_priv =
-        u32 crtc_cnt_reg, crtc_status_reg;
+            (drm_radeon_private_t *) dev->dev_private;
+        unsigned int cur_vblank;
+        int ret = 0;
+        int ack = 0;
+        atomic_t *counter;
        if (!dev_priv) {
                DRM_ERROR("called with no initialization\n");
                return -EINVAL;
        }
-        if (crtc == 0) {
+        if (crtc == DRM_RADEON_VBLANK_CRTC1) {
-                crtc_cnt_reg = RADEON_CRTC_CRNT_FRAME;
+                counter = &dev->vbl_received;
-                crtc_status_reg = RADEON_CRTC_STATUS;
+                ack |= RADEON_CRTC_VBLANK_STAT;
-        } else if (crtc == 1) {
+        } else if (crtc == DRM_RADEON_VBLANK_CRTC2) {
-                crtc_cnt_reg = RADEON_CRTC2_CRNT_FRAME;
+                counter = &dev->vbl_received2;
-                crtc_status_reg = RADEON_CRTC2_STATUS;
+                ack |= RADEON_CRTC2_VBLANK_STAT;
-        } else {
+        } else
                return -EINVAL;
-        }
-        return RADEON_READ(crtc_cnt_reg) + (RADEON_READ(crtc_status_reg) & 1);
+        radeon_acknowledge_irqs(dev_priv, ack);
+        dev_priv->stats.boxes |= RADEON_BOX_WAIT_IDLE;
+        /* Assume that the user has missed the current sequence number
+         * by about a day rather than she wants to wait for years
+         * using vertical blanks...
+         */
+        DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
+                    (((cur_vblank = atomic_read(counter))
+                      - *sequence) <= (1 << 23)));
+        *sequence = cur_vblank;
+        return ret;
+}
+int radeon_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence)
+{
+        return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC1);
+}
+int radeon_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence)
+{
+        return radeon_driver_vblank_do_wait(dev, sequence, DRM_RADEON_VBLANK_CRTC2);
 }
 /* Needs the lock as it touches the ring.
@@ -238,6 +234,21 @@ int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_pr
        return radeon_wait_irq(dev, irqwait->irq_seq);
 }
+static void radeon_enable_interrupt(struct drm_device *dev)
+{
+        drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private;
+        dev_priv->irq_enable_reg = RADEON_SW_INT_ENABLE;
+        if (dev_priv->vblank_crtc & DRM_RADEON_VBLANK_CRTC1)
+                dev_priv->irq_enable_reg |= RADEON_CRTC_VBLANK_MASK;
+        if (dev_priv->vblank_crtc & DRM_RADEON_VBLANK_CRTC2)
+                dev_priv->irq_enable_reg |= RADEON_CRTC2_VBLANK_MASK;
+        RADEON_WRITE(RADEON_GEN_INT_CNTL, dev_priv->irq_enable_reg);
+        dev_priv->irq_enabled = 1;
+}
 /* drm_dma.h hooks
 */
 void radeon_driver_irq_preinstall(struct drm_device * dev)
@@ -249,27 +260,20 @@ void radeon_driver_irq_preinstall(struct drm_device * dev)
        RADEON_WRITE(RADEON_GEN_INT_CNTL, 0);
        /* Clear bits if they're already high */
-        radeon_acknowledge_irqs(dev_priv);
+        radeon_acknowledge_irqs(dev_priv, (RADEON_SW_INT_TEST_ACK |
+                                           RADEON_CRTC_VBLANK_STAT |
+                                           RADEON_CRTC2_VBLANK_STAT));
 }
-int radeon_driver_irq_postinstall(struct drm_device * dev)
+void radeon_driver_irq_postinstall(struct drm_device * dev)
 {
        drm_radeon_private_t *dev_priv =
            (drm_radeon_private_t *) dev->dev_private;
-        int ret;
        atomic_set(&dev_priv->swi_emitted, 0);
        DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
-        ret = drm_vblank_init(dev, 2);
+        radeon_enable_interrupt(dev);
-        if (ret)
-                return ret;
-        dev->max_vblank_count = 0x001fffff;
-        radeon_irq_set_state(dev, RADEON_SW_INT_ENABLE, 1);
-        return 0;
 }
 void radeon_driver_irq_uninstall(struct drm_device * dev)
@@ -311,5 +315,6 @@ int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value)
                return -EINVAL;
        }
        dev_priv->vblank_crtc = (unsigned int)value;
+        radeon_enable_interrupt(dev);
        return 0;
 }
diff --git a/drivers/char/drm/via_drv.c b/drivers/char/drm/via_drv.c
index 37870a4a3dc7..80c01cdfa37d 100644
--- a/drivers/char/drm/via_drv.c
+++ b/drivers/char/drm/via_drv.c
@@ -40,13 +40,11 @@ static struct pci_device_id pciidlist[] = {
 static struct drm_driver driver = {
        .driver_features =
            DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_HAVE_IRQ |
-            DRIVER_IRQ_SHARED,
+            DRIVER_IRQ_SHARED | DRIVER_IRQ_VBL,
        .load = via_driver_load,
        .unload = via_driver_unload,
        .context_dtor = via_final_context,
-        .get_vblank_counter = via_get_vblank_counter,
+        .vblank_wait = via_driver_vblank_wait,
-        .enable_vblank = via_enable_vblank,
-        .disable_vblank = via_disable_vblank,
        .irq_preinstall = via_driver_irq_preinstall,
        .irq_postinstall = via_driver_irq_postinstall,
        .irq_uninstall = via_driver_irq_uninstall,
diff --git a/drivers/char/drm/via_drv.h b/drivers/char/drm/via_drv.h
index fe67030e39ac..2daae81874cd 100644
--- a/drivers/char/drm/via_drv.h
+++ b/drivers/char/drm/via_drv.h
@@ -75,7 +75,6 @@ typedef struct drm_via_private {
        struct timeval last_vblank;
        int last_vblank_valid;
        unsigned usec_per_vblank;
-        atomic_t vbl_received;
        drm_via_state_t hc_state;
        char pci_buf[VIA_PCI_BUF_SIZE];
        const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
@@ -131,13 +130,11 @@ extern int via_init_context(struct drm_device * dev, int context);
 extern int via_final_context(struct drm_device * dev, int context);
 extern int via_do_cleanup_map(struct drm_device * dev);
-extern u32 via_get_vblank_counter(struct drm_device *dev, int crtc);
+extern int via_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);
-extern int via_enable_vblank(struct drm_device *dev, int crtc);
-extern void via_disable_vblank(struct drm_device *dev, int crtc);
 extern irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS);
 extern void via_driver_irq_preinstall(struct drm_device * dev);
-extern int via_driver_irq_postinstall(struct drm_device * dev);
+extern void via_driver_irq_postinstall(struct drm_device * dev);
 extern void via_driver_irq_uninstall(struct drm_device * dev);
 extern int via_dma_cleanup(struct drm_device * dev);
diff --git a/drivers/char/drm/via_irq.c b/drivers/char/drm/via_irq.c
index f1ab6fc7c07e..c6bb978a1106 100644
--- a/drivers/char/drm/via_irq.c
+++ b/drivers/char/drm/via_irq.c
@@ -92,17 +92,8 @@ static int via_irqmap_unichrome[] = {-1, -1, -1, 0, -1, 1};
 static unsigned time_diff(struct timeval *now, struct timeval *then)
 {
        return (now->tv_usec >= then->tv_usec) ?
-                now->tv_usec - then->tv_usec :
+            now->tv_usec - then->tv_usec :
-                1000000 - (then->tv_usec - now->tv_usec);
+            1000000 - (then->tv_usec - now->tv_usec);
-}
-u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
-{
-        drm_via_private_t *dev_priv = dev->dev_private;
-        if (crtc != 0)
-                return 0;
-        return atomic_read(&dev_priv->vbl_received);
 }
 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
@@ -117,8 +108,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
        status = VIA_READ(VIA_REG_INTERRUPT);
        if (status & VIA_IRQ_VBLANK_PENDING) {
-                atomic_inc(&dev_priv->vbl_received);
+                atomic_inc(&dev->vbl_received);
-                if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
+                if (!(atomic_read(&dev->vbl_received) & 0x0F)) {
                        do_gettimeofday(&cur_vblank);
                        if (dev_priv->last_vblank_valid) {
                                dev_priv->usec_per_vblank =
@@ -128,11 +119,12 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
                        dev_priv->last_vblank = cur_vblank;
                        dev_priv->last_vblank_valid = 1;
                }
-                if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
+                if (!(atomic_read(&dev->vbl_received) & 0xFF)) {
                        DRM_DEBUG("US per vblank is: %u\n",
                                  dev_priv->usec_per_vblank);
                }
-                drm_handle_vblank(dev, 0);
+                DRM_WAKEUP(&dev->vbl_queue);
+                drm_vbl_send_signals(dev);
                handled = 1;
        }
@@ -171,34 +163,31 @@ static __inline__ void viadrv_acknowledge_irqs(drm_via_private_t * dev_priv)
        }
 }
-int via_enable_vblank(struct drm_device *dev, int crtc)
+int via_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence)
 {
-        drm_via_private_t *dev_priv = dev->dev_private;
+        drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
-        u32 status;
+        unsigned int cur_vblank;
+        int ret = 0;
-        if (crtc != 0) {
+        DRM_DEBUG("\n");
-                DRM_ERROR("%s:  bad crtc %d\n", __FUNCTION__, crtc);
+        if (!dev_priv) {
+                DRM_ERROR("called with no initialization\n");
                return -EINVAL;
        }
-        status = VIA_READ(VIA_REG_INTERRUPT);
+        viadrv_acknowledge_irqs(dev_priv);
-        VIA_WRITE(VIA_REG_INTERRUPT, status & VIA_IRQ_VBLANK_ENABLE);
-        VIA_WRITE8(0x83d4, 0x11);
+        /* Assume that the user has missed the current sequence number
-        VIA_WRITE8(0x83d5, VIA_READ8(0x83d5) | 0x30);
+         * by about a day rather than she wants to wait for years
+         * using vertical blanks...
+         */
-        return 0;
+        DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
-}
+                    (((cur_vblank = atomic_read(&dev->vbl_received)) -
+                      *sequence) <= (1 << 23)));
-void via_disable_vblank(struct drm_device *dev, int crtc)
+        *sequence = cur_vblank;
-{
+        return ret;
-        drm_via_private_t *dev_priv = dev->dev_private;
-        VIA_WRITE8(0x83d4, 0x11);
-        VIA_WRITE8(0x83d5, VIA_READ8(0x83d5) & ~0x30);
-        if (crtc != 0)
-                DRM_ERROR("%s:  bad crtc %d\n", __FUNCTION__, crtc);
 }
 static int
@@ -303,25 +292,23 @@ void via_driver_irq_preinstall(struct drm_device * dev)
        }
 }
-int via_driver_irq_postinstall(struct drm_device * dev)
+void via_driver_irq_postinstall(struct drm_device * dev)
 {
        drm_via_private_t *dev_priv = (drm_via_private_t *) dev->dev_private;
        u32 status;
-        DRM_DEBUG("via_driver_irq_postinstall\n");
+        DRM_DEBUG("\n");
-        if (!dev_priv)
+        if (dev_priv) {
-                return -EINVAL;
+                status = VIA_READ(VIA_REG_INTERRUPT);
+                VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL
+                          | dev_priv->irq_enable_mask);
-        drm_vblank_init(dev, 1);
+                /* Some magic, oh for some data sheets ! */
-        status = VIA_READ(VIA_REG_INTERRUPT);
-        VIA_WRITE(VIA_REG_INTERRUPT, status | VIA_IRQ_GLOBAL
-                  | dev_priv->irq_enable_mask);
-        /* Some magic, oh for some data sheets ! */
+                VIA_WRITE8(0x83d4, 0x11);
-        VIA_WRITE8(0x83d4, 0x11);
+                VIA_WRITE8(0x83d5, VIA_READ8(0x83d5) | 0x30);
-        VIA_WRITE8(0x83d5, VIA_READ8(0x83d5) | 0x30);
-        return 0;
+        }
 }
 void via_driver_irq_uninstall(struct drm_device * dev)
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 19105ec203f7..8096389b0dc2 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -282,16 +282,20 @@ static int opost(unsigned char c, struct tty_struct *tty)
                        if (O_ONLRET(tty))
                                tty->column = 0;
                        if (O_ONLCR(tty)) {
-                                if (space < 2)
+                                if (space < 2) {
+                                        unlock_kernel();
                                        return -1;
+                                }
                                tty_put_char(tty, '\r');
                                tty->column = 0;
                        }
                        tty->canon_column = tty->column;
                        break;
                case '\r':
-                        if (O_ONOCR(tty) && tty->column == 0)
+                        if (O_ONOCR(tty) && tty->column == 0) {
+                                unlock_kernel();
                                return 0;
+                        }
                        if (O_OCRNL(tty)) {
                                c = '\n';
                                if (O_ONLRET(tty))
@@ -303,10 +307,13 @@ static int opost(unsigned char c, struct tty_struct *tty)
                case '\t':
                        spaces = 8 - (tty->column & 7);
                        if (O_TABDLY(tty) == XTABS) {
-                                if (space < spaces)
+                                if (space < spaces) {
+                                        unlock_kernel();
                                        return -1;
+                                }
                                tty->column += spaces;
                                tty->ops->write(tty, "        ", spaces);
+                                unlock_kernel();
                                return 0;
                        }
                        tty->column += spaces;
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c
index 53b3d44f8c06..55a95892ccf9 100644
--- a/drivers/char/snsc_event.c
+++ b/drivers/char/snsc_event.c
@@ -17,7 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
-#include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/unaligned.h>
 #include "snsc.h"
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 9e9bad8bdcf4..dbce1263bdff 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -402,6 +402,7 @@ static struct sysrq_key_op *sysrq_key_table[36] = {
        &sysrq_showstate_blocked_op,    /* w */
        /* x: May be registered on ppc/powerpc for xmon */
        NULL,                           /* x */
+        /* y: May be registered on sparc64 for global register dump */
        NULL,                           /* y */
        NULL                            /* z */
 };
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c
index e122a0e87bb0..f17ac043b551 100644
--- a/drivers/char/vme_scc.c
+++ b/drivers/char/vme_scc.c
@@ -89,9 +89,7 @@ static void scc_break_ctl(struct tty_struct *tty, int break_state);
 static struct tty_driver *scc_driver;
-struct scc_port scc_ports[2];
+static struct scc_port scc_ports[2];
-int scc_initialized = 0;
 /*---------------------------------------------------------------------------
 * Interface from generic_serial.c back here
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 762b729672e0..0ec0f431e6a1 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -821,10 +821,10 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)
        dev_dbg(device->common.dev, "%s\n", __func__);
-        src = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);
+        src = kmalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL);
        if (!src)
                return -ENOMEM;
-        dest = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);
+        dest = kzalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL);
        if (!dest) {
                kfree(src);
                return -ENOMEM;
@@ -834,8 +834,6 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)
        for (i = 0; i < IOP_ADMA_TEST_SIZE; i++)
                ((u8 *) src)[i] = (u8)i;
-        memset(dest, 0, IOP_ADMA_TEST_SIZE);
        /* Start copy, using first DMA channel */
        dma_chan = container_of(device->common.channels.next,
                                struct dma_chan,
diff --git a/drivers/firewire/fw-cdev.c b/drivers/firewire/fw-cdev.c
index 4a541921a14a..dda14015e873 100644
--- a/drivers/firewire/fw-cdev.c
+++ b/drivers/firewire/fw-cdev.c
@@ -113,6 +113,11 @@ static int fw_device_op_open(struct inode *inode, struct file *file)
        if (device == NULL)
                return -ENODEV;
+        if (fw_device_is_shutdown(device)) {
+                fw_device_put(device);
+                return -ENODEV;
+        }
        client = kzalloc(sizeof(*client), GFP_KERNEL);
        if (client == NULL) {
                fw_device_put(device);
@@ -901,6 +906,9 @@ fw_device_op_ioctl(struct file *file,
 {
        struct client *client = file->private_data;
+        if (fw_device_is_shutdown(client->device))
+                return -ENODEV;
        return dispatch_ioctl(client, cmd, (void __user *) arg);
 }
@@ -911,6 +919,9 @@ fw_device_op_compat_ioctl(struct file *file,
 {
        struct client *client = file->private_data;
+        if (fw_device_is_shutdown(client->device))
+                return -ENODEV;
        return dispatch_ioctl(client, cmd, compat_ptr(arg));
 }
 #endif
@@ -922,6 +933,9 @@ static int fw_device_op_mmap(struct file *file, struct vm_area_struct *vma)
        unsigned long size;
        int page_count, retval;
+        if (fw_device_is_shutdown(client->device))
+                return -ENODEV;
        /* FIXME: We could support multiple buffers, but we don't. */
        if (client->buffer.pages != NULL)
                return -EBUSY;
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index f88714b06000..47ac1a7d66e1 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1,6 +1,4 @@
 /*
- * $Id: hid-debug.h,v 1.8 2001/09/25 09:37:57 vojtech Exp $
- *
 *  (c) 1999 Andreas Gal                <gal@cs.uni-magdeburg.de>
 *  (c) 2000-2001 Vojtech Pavlik        <vojtech@ucw.cz>
 *  (c) 2007 Jiri Kosina
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index c3eb3f13e2ca..5c52a20ad344 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -1,6 +1,4 @@
 /*
- * $Id: hid-input.c,v 1.2 2002/04/23 00:59:25 rdamazio Exp $
- *
 *  Copyright (c) 2000-2001 Vojtech Pavlik
 *  Copyright (c) 2006-2007 Jiri Kosina
 *
@@ -218,8 +216,9 @@ int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
                        }
                }
-                if (test_bit(usage->code, hid->pb_pressed_numlock) ||
+                if (hid->quirks & HID_QUIRK_APPLE_NUMLOCK_EMULATION && (
-                                test_bit(LED_NUML, input->led)) {
+                                test_bit(usage->code, hid->pb_pressed_numlock) ||
+                                test_bit(LED_NUML, input->led))) {
                        trans = find_translation(powerbook_numlock_keys, usage->code);
                        if (trans) {
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index d3f8d9194f30..1df832a8fcbc 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -325,6 +325,10 @@
 #define USB_DEVICE_ID_MGE_UPS           0xffff
 #define USB_DEVICE_ID_MGE_UPS1          0x0001
+#define USB_VENDOR_ID_MICROCHIP         0x04d8
+#define USB_DEVICE_ID_PICKIT1           0x0032
+#define USB_DEVICE_ID_PICKIT2           0x0033
 #define USB_VENDOR_ID_MICROSOFT         0x045e
 #define USB_DEVICE_ID_SIDEWINDER_GV     0x003b
 #define USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0 0x009d
@@ -371,6 +375,9 @@
 #define USB_VENDOR_ID_SONY                      0x054c
 #define USB_DEVICE_ID_SONY_PS3_CONTROLLER       0x0268
+#define USB_VENDOR_ID_SOUNDGRAPH        0x15c2
+#define USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD       0x0038
 #define USB_VENDOR_ID_SUN               0x0430
 #define USB_DEVICE_ID_RARITAN_KVM_DONGLE        0xcdab
@@ -567,6 +574,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_SOUNDGRAPH, USB_DEVICE_ID_SOUNDGRAPH_IMON_LCD, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_LABPRO, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_GOTEMP, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_VERNIER, USB_DEVICE_ID_VERNIER_SKIP, HID_QUIRK_IGNORE },
@@ -580,6 +588,9 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_FLAIR, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_ACECAD, USB_DEVICE_ID_ACECAD_302, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT1, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_MICROCHIP, USB_DEVICE_ID_PICKIT2, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_ELITE_KBD, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP },
        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_CORDLESS_DESKTOP_LX500, HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL | HID_QUIRK_LOGITECH_EXPANDED_KEYMAP },
@@ -611,28 +622,28 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SMARTJOY_DUAL_PLUS, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD},
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ANSI, HID_QUIRK_APPLE_HAS_FN },
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
        { USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS },
        { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD, HID_QUIRK_RESET_LEDS },
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index 5d9dbb47e4a8..3cd46d2e53c1 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -1,6 +1,4 @@
 /*
- * $Id: usbkbd.c,v 1.27 2001/12/27 10:37:41 vojtech Exp $
- *
 *  Copyright (c) 1999-2001 Vojtech Pavlik
 *
 *  USB HIDBP Keyboard support
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index df0d96d989de..703e9d0e8714 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -1,6 +1,4 @@
 /*
- * $Id: usbmouse.c,v 1.15 2001/12/27 10:37:41 vojtech Exp $
- *
 *  Copyright (c) 1999-2001 Vojtech Pavlik
 *
 *  USB HIDBP Mouse support
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 2fa43183d375..43508d61eb7c 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -290,7 +290,7 @@ static u32 amd756_func(struct i2c_adapter *adapter)
 {
        return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
            I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
-            I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_PROC_CALL;
+            I2C_FUNC_SMBUS_BLOCK_DATA;
 }
 static const struct i2c_algorithm smbus_algorithm = {
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index 3dac920e53ea..43c9f8df9509 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -50,6 +50,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
+#include <linux/dmi.h>
 #include <asm/io.h>
 MODULE_LICENSE("GPL");
@@ -109,6 +110,18 @@ struct nforce2_smbus {
 /* Misc definitions */
 #define MAX_TIMEOUT     100
+/* We disable the second SMBus channel on these boards */
+static struct dmi_system_id __devinitdata nforce2_dmi_blacklist2[] = {
+        {
+                .ident = "DFI Lanparty NF4 Expert",
+                .matches = {
+                        DMI_MATCH(DMI_BOARD_VENDOR, "DFI Corp,LTD"),
+                        DMI_MATCH(DMI_BOARD_NAME, "LP UT NF4 Expert"),
+                },
+        },
+        { }
+};
 static struct pci_driver nforce2_driver;
 static void nforce2_abort(struct i2c_adapter *adap)
@@ -367,10 +380,17 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_
                smbuses[0].base = 0;    /* to have a check value */
        }
        /* SMBus adapter 2 */
-        res2 = nforce2_probe_smb(dev, 5, NFORCE_PCI_SMB2, &smbuses[1], "SMB2");
+        if (dmi_check_system(nforce2_dmi_blacklist2)) {
-        if (res2 < 0) {
+                dev_err(&dev->dev, "Disabling SMB2 for safety reasons.\n");
-                dev_err(&dev->dev, "Error probing SMB2.\n");
+                res2 = -EPERM;
-                smbuses[1].base = 0;    /* to have a check value */
+                smbuses[1].base = 0;
+        } else {
+                res2 = nforce2_probe_smb(dev, 5, NFORCE_PCI_SMB2, &smbuses[1],
+                                         "SMB2");
+                if (res2 < 0) {
+                        dev_err(&dev->dev, "Error probing SMB2.\n");
+                        smbuses[1].base = 0;    /* to have a check value */
+                }
        }
        if ((res1 < 0) && (res2 < 0)) {
                /* we did not find even one of the SMBuses, so we give up */
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index fb7ea5637eca..cf507b3f60f3 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -207,9 +207,6 @@ static int max6875_detect(struct i2c_adapter *adapter, int address, int kind)
        fake_client->flags = 0;
        strlcpy(fake_client->name, "max6875 subclient", I2C_NAME_SIZE);
-        /* Prevent 24RF08 corruption (in case of user error) */
-        i2c_smbus_write_quick(real_client, 0);
        if ((err = i2c_attach_client(real_client)) != 0)
                goto exit_kfree2;
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index c99ebeadb558..d0175f4f8fc6 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -74,10 +74,7 @@ static int i2c_device_match(struct device *dev, struct device_driver *drv)
        if (driver->id_table)
                return i2c_match_id(driver->id_table, client) != NULL;
-        /* new style drivers use the same kind of driver matching policy
+        return 0;
-         * as platform devices or SPI:  compare device and driver IDs.
-         */
-        return strcmp(client->driver_name, drv->name) == 0;
 }
 #ifdef  CONFIG_HOTPLUG
@@ -91,14 +88,9 @@ static int i2c_device_uevent(struct device *dev, struct kobj_uevent_env *env)
        if (dev->driver)
                return 0;
-        if (client->driver_name[0]) {
+        if (add_uevent_var(env, "MODALIAS=%s%s",
-                if (add_uevent_var(env, "MODALIAS=%s", client->driver_name))
+                           I2C_MODULE_PREFIX, client->name))
-                        return -ENOMEM;
+                return -ENOMEM;
-        } else {
-                if (add_uevent_var(env, "MODALIAS=%s%s",
-                                   I2C_MODULE_PREFIX, client->name))
-                        return -ENOMEM;
-        }
        dev_dbg(dev, "uevent\n");
        return 0;
 }
@@ -206,9 +198,7 @@ static ssize_t show_client_name(struct device *dev, struct device_attribute *att
 static ssize_t show_modalias(struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct i2c_client *client = to_i2c_client(dev);
-        return client->driver_name[0]
+        return sprintf(buf, "%s%s\n", I2C_MODULE_PREFIX, client->name);
-                ? sprintf(buf, "%s\n", client->driver_name)
-                : sprintf(buf, "%s%s\n", I2C_MODULE_PREFIX, client->name);
 }
 static struct device_attribute i2c_dev_attrs[] = {
@@ -282,8 +272,6 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
        client->addr = info->addr;
        client->irq = info->irq;
-        strlcpy(client->driver_name, info->driver_name,
-                sizeof(client->driver_name));
        strlcpy(client->name, info->type, sizeof(client->name));
        /* a new style driver may be bound to this device when we
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 34b0d4f26b58..655ec7ef568a 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -648,13 +648,12 @@ static int ide_register_port(ide_hwif_t *hwif)
        get_device(&hwif->gendev);
-        hwif->portdev = device_create(ide_port_class, &hwif->gendev,
+        hwif->portdev = device_create_drvdata(ide_port_class, &hwif->gendev,
-                                      MKDEV(0, 0), hwif->name);
+                                              MKDEV(0, 0), hwif, hwif->name);
        if (IS_ERR(hwif->portdev)) {
                ret = PTR_ERR(hwif->portdev);
                device_unregister(&hwif->gendev);
        }
-        dev_set_drvdata(hwif->portdev, hwif);
 out:
        return ret;
 }
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 1f527bbf8d96..caa2632dd08e 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -95,6 +95,9 @@ static int __init macide_init(void)
        int irq;
        hw_regs_t hw;
+        if (!MACH_IS_MAC)
+                return -ENODEV;
        switch (macintosh_config->ide_type) {
        case MAC_IDE_QUADRA:
                base = IDE_BASE;
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index 16b9d0ad154e..a5ceff287a28 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -1539,15 +1539,13 @@ static void sbp2_prep_command_orb_sg(struct sbp2_command_orb *orb,
 static void sbp2_create_command_orb(struct sbp2_lu *lu,
                                    struct sbp2_command_info *cmd,
-                                    unchar *scsi_cmd,
+                                    struct scsi_cmnd *SCpnt)
-                                    unsigned int scsi_use_sg,
-                                    unsigned int scsi_request_bufflen,
-                                    struct scatterlist *sg,
-                                    enum dma_data_direction dma_dir)
 {
        struct sbp2_fwhost_info *hi = lu->hi;
        struct sbp2_command_orb *orb = &cmd->command_orb;
        u32 orb_direction;
+        unsigned int scsi_request_bufflen = scsi_bufflen(SCpnt);
+        enum dma_data_direction dma_dir = SCpnt->sc_data_direction;
        /*
         * Set-up our command ORB.
@@ -1580,13 +1578,14 @@ static void sbp2_create_command_orb(struct sbp2_lu *lu,
                orb->data_descriptor_lo = 0x0;
                orb->misc |= ORB_SET_DIRECTION(1);
        } else
-                sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_use_sg, sg,
+                sbp2_prep_command_orb_sg(orb, hi, cmd, scsi_sg_count(SCpnt),
+                                         scsi_sglist(SCpnt),
                                         orb_direction, dma_dir);
        sbp2util_cpu_to_be32_buffer(orb, sizeof(*orb));
-        memset(orb->cdb, 0, 12);
+        memset(orb->cdb, 0, sizeof(orb->cdb));
-        memcpy(orb->cdb, scsi_cmd, COMMAND_SIZE(*scsi_cmd));
+        memcpy(orb->cdb, SCpnt->cmnd, SCpnt->cmd_len);
 }
 static void sbp2_link_orb_command(struct sbp2_lu *lu,
@@ -1669,16 +1668,13 @@ static void sbp2_link_orb_command(struct sbp2_lu *lu,
 static int sbp2_send_command(struct sbp2_lu *lu, struct scsi_cmnd *SCpnt,
                             void (*done)(struct scsi_cmnd *))
 {
-        unchar *scsi_cmd = (unchar *)SCpnt->cmnd;
        struct sbp2_command_info *cmd;
        cmd = sbp2util_allocate_command_orb(lu, SCpnt, done);
        if (!cmd)
                return -EIO;
-        sbp2_create_command_orb(lu, cmd, scsi_cmd, scsi_sg_count(SCpnt),
+        sbp2_create_command_orb(lu, cmd, SCpnt);
-                                scsi_bufflen(SCpnt), scsi_sglist(SCpnt),
-                                SCpnt->sc_data_direction);
        sbp2_link_orb_command(lu, cmd);
        return 0;
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 3aa2db54eae4..840ede9ae965 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -1005,8 +1005,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
        if (cdev_add(port->cdev, base_dev + port->dev_num, 1))
                goto err_cdev;
-        port->dev = device_create(umad_class, device->dma_device,
+        port->dev = device_create_drvdata(umad_class, device->dma_device,
-                                  port->cdev->dev, "umad%d", port->dev_num);
+                                          port->cdev->dev, port,
+                                          "umad%d", port->dev_num);
        if (IS_ERR(port->dev))
                goto err_cdev;
@@ -1024,15 +1025,12 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
        if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1))
                goto err_sm_cdev;
-        port->sm_dev = device_create(umad_class, device->dma_device,
+        port->sm_dev = device_create_drvdata(umad_class, device->dma_device,
-                                     port->sm_cdev->dev,
+                                             port->sm_cdev->dev, port,
-                                     "issm%d", port->dev_num);
+                                             "issm%d", port->dev_num);
        if (IS_ERR(port->sm_dev))
                goto err_sm_cdev;
-        dev_set_drvdata(port->dev,    port);
-        dev_set_drvdata(port->sm_dev, port);
        if (device_create_file(port->sm_dev, &dev_attr_ibdev))
                goto err_sm_dev;
        if (device_create_file(port->sm_dev, &dev_attr_port))
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index cc1afa28c181..f806da184b51 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -755,14 +755,15 @@ static void ib_uverbs_add_one(struct ib_device *device)
        if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1))
                goto err_cdev;
-        uverbs_dev->dev = device_create(uverbs_class, device->dma_device,
+        uverbs_dev->dev = device_create_drvdata(uverbs_class,
-                                        uverbs_dev->cdev->dev,
+                                                device->dma_device,
-                                        "uverbs%d", uverbs_dev->devnum);
+                                                uverbs_dev->cdev->dev,
+                                                uverbs_dev,
+                                                "uverbs%d",
+                                                uverbs_dev->devnum);
        if (IS_ERR(uverbs_dev->dev))
                goto err_cdev;
-        dev_set_drvdata(uverbs_dev->dev, uverbs_dev);
        if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev))
                goto err_class;
        if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version))
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index 50d80ecf0b80..aacf71f3cd44 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -217,6 +217,10 @@ hil_keyb_init(void)
                return -ENOMEM;
 #if defined(CONFIG_HP300)
+        if (!MACH_IS_HP300) {
+                err = -ENODEV;
+                goto err1;
+        }
        if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {
                printk(KERN_ERR "HIL: hardware register was not found\n");
                err = -ENODEV;
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index ab76ea442fa5..45e5d05b01de 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -691,6 +691,11 @@ static int __init hp_sdc_rtc_init(void)
 {
        int ret;
+#ifdef __mc68000__
+        if (!MACH_IS_HP300)
+                return -ENODEV;
+#endif
        init_MUTEX(&i8042tregs);
        if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index f1fd3b638a37..587398f5c9df 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -306,6 +306,11 @@ static int __init hp_sdc_mlc_init(void)
 {
        hil_mlc *mlc = &hp_sdc_mlc;
+#ifdef __mc68000__
+        if (!MACH_IS_HP300)
+                return -ENODEV;
+#endif
        printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n");
        hp_sdc_mlc_priv.emtestmode = 0;
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c
index cb89aff2e160..d962a8d78b14 100644
--- a/drivers/input/serio/q40kbd.c
+++ b/drivers/input/serio/q40kbd.c
@@ -156,7 +156,7 @@ static int __init q40kbd_init(void)
        int error;
        if (!MACH_IS_Q40)
-                return -EIO;
+                return -ENODEV;
        error = platform_driver_register(&q40kbd_driver);
        if (error)
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index b3c54be74556..559a40861c39 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -103,13 +103,11 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev)
 {
        int rc;
-        led_cdev->dev = device_create(leds_class, parent, 0, "%s",
+        led_cdev->dev = device_create_drvdata(leds_class, parent, 0, led_cdev,
-                                            led_cdev->name);
+                                              "%s", led_cdev->name);
        if (IS_ERR(led_cdev->dev))
                return PTR_ERR(led_cdev->dev);
-        dev_set_drvdata(led_cdev->dev, led_cdev);
        /* register the attributes */
        rc = device_create_file(led_cdev->dev, &dev_attr_brightness);
        if (rc)
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index b8b9e44f7f4e..dbaad39020a1 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -334,7 +334,7 @@ int __init adb_init(void)
        return 0;
 }
-__initcall(adb_init);
+device_initcall(adb_init);
 static int
 do_adb_reset_bus(void)
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 2ca3e9cfb2bb..0165aac533bf 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -2613,7 +2613,7 @@ static int vidiocgmbuf(struct file *file, void *priv, struct video_mbuf *mbuf)
        struct bttv_fh *fh = priv;
        mutex_lock(&fh->cap.vb_lock);
-        retval = videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
+        retval = __videobuf_mmap_setup(&fh->cap, gbuffers, gbufsize,
                                     V4L2_MEMORY_MMAP);
        if (retval < 0) {
                mutex_unlock(&fh->cap.vb_lock);
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c
index 2a429f9e32cd..03411503457e 100644
--- a/drivers/media/video/cs5345.c
+++ b/drivers/media/video/cs5345.c
@@ -160,10 +160,17 @@ static int cs5345_probe(struct i2c_client *client,
 /* ----------------------------------------------------------------------- */
+static const struct i2c_device_id cs5345_id[] = {
+        { "cs5345", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, cs5345_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "cs5345",
        .driverid = I2C_DRIVERID_CS5345,
        .command = cs5345_command,
        .probe = cs5345_probe,
+        .id_table = cs5345_id,
 };
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 2dfd0afc62db..d965af860ab2 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -144,7 +144,8 @@ static int cs53l32a_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
-        snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
+        if (!id)
+                strlcpy(client->name, "cs53l32a", sizeof(client->name));
        v4l_info(client, "chip found @ 0x%x (%s)\n",
                        client->addr << 1, client->adapter->name);
@@ -175,10 +176,17 @@ static int cs53l32a_probe(struct i2c_client *client,
        return 0;
 }
+static const struct i2c_device_id cs53l32a_id[] = {
+        { "cs53l32a", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, cs53l32a_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "cs53l32a",
        .driverid = I2C_DRIVERID_CS53L32A,
        .command = cs53l32a_command,
        .probe = cs53l32a_probe,
+        .id_table = cs53l32a_id,
 };
diff --git a/drivers/media/video/cx18/cx18-i2c.c b/drivers/media/video/cx18/cx18-i2c.c
index 4f08a4058d1a..1d6c51a75313 100644
--- a/drivers/media/video/cx18/cx18-i2c.c
+++ b/drivers/media/video/cx18/cx18-i2c.c
@@ -74,7 +74,7 @@ static const u8 hw_bus[] = {
 };
 /* This array should match the CX18_HW_ defines */
-static const char * const hw_drivernames[] = {
+static const char * const hw_devicenames[] = {
        "tuner",
        "tveeprom",
        "cs5345",
@@ -95,8 +95,7 @@ int cx18_i2c_register(struct cx18 *cx, unsigned idx)
        id = hw_driverids[idx];
        bus = hw_bus[idx];
        memset(&info, 0, sizeof(info));
-        strlcpy(info.driver_name, hw_drivernames[idx],
+        strlcpy(info.type, hw_devicenames[idx], sizeof(info.type));
-                        sizeof(info.driver_name));
        info.addr = hw_addrs[idx];
        for (i = 0; i < I2C_CLIENTS_MAX; i++)
                if (cx->i2c_clients[i] == NULL)
@@ -279,7 +278,7 @@ static const char *cx18_i2c_id_name(u32 id)
        for (i = 0; i < ARRAY_SIZE(hw_driverids); i++)
                if (hw_driverids[i] == id)
-                        return hw_drivernames[i];
+                        return hw_devicenames[i];
        return "unknown device";
 }
@@ -290,7 +289,7 @@ static const char *cx18_i2c_hw_name(u32 hw)
        for (i = 0; i < ARRAY_SIZE(hw_driverids); i++)
                if (1 << i == hw)
-                        return hw_drivernames[i];
+                        return hw_devicenames[i];
        return "unknown device";
 }
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 88823810497c..607efdcd22f8 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -1284,10 +1284,17 @@ static int cx25840_remove(struct i2c_client *client)
        return 0;
 }
+static const struct i2c_device_id cx25840_id[] = {
+        { "cx25840", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, cx25840_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "cx25840",
        .driverid = I2C_DRIVERID_CX25840,
        .command = cx25840_command,
        .probe = cx25840_probe,
        .remove = cx25840_remove,
+        .id_table = cx25840_id,
 };
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index 5e749c528a62..15d037ae25c5 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -34,7 +34,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/page-flags.h>
-#include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
diff --git a/drivers/media/video/ivtv/ivtv-i2c.c b/drivers/media/video/ivtv/ivtv-i2c.c
index 771adf47e944..32129f3ea836 100644
--- a/drivers/media/video/ivtv/ivtv-i2c.c
+++ b/drivers/media/video/ivtv/ivtv-i2c.c
@@ -136,7 +136,7 @@ static const u8 hw_addrs[] = {
 };
 /* This array should match the IVTV_HW_ defines */
-static const char * const hw_drivernames[] = {
+static const char * const hw_devicenames[] = {
        "cx25840",
        "saa7115",
        "saa7127",
@@ -145,7 +145,7 @@ static const char * const hw_drivernames[] = {
        "wm8775",
        "cs53l32a",
        "tveeprom",
-        "saa7115",
+        "saa7114",
        "upd64031a",
        "upd64083",
        "saa717x",
@@ -167,8 +167,7 @@ int ivtv_i2c_register(struct ivtv *itv, unsigned idx)
                return -1;
        id = hw_driverids[idx];
        memset(&info, 0, sizeof(info));
-        strlcpy(info.driver_name, hw_drivernames[idx],
+        strlcpy(info.type, hw_devicenames[idx], sizeof(info.type));
-                        sizeof(info.driver_name));
        info.addr = hw_addrs[idx];
        for (i = 0; itv->i2c_clients[i] && i < I2C_CLIENTS_MAX; i++) {}
@@ -657,7 +656,7 @@ static const char *ivtv_i2c_id_name(u32 id)
        for (i = 0; i < ARRAY_SIZE(hw_driverids); i++)
                if (hw_driverids[i] == id)
-                        return hw_drivernames[i];
+                        return hw_devicenames[i];
        return "unknown device";
 }
@@ -668,7 +667,7 @@ static const char *ivtv_i2c_hw_name(u32 hw)
        for (i = 0; i < ARRAY_SIZE(hw_driverids); i++)
                if (1 << i == hw)
-                        return hw_drivernames[i];
+                        return hw_devicenames[i];
        return "unknown device";
 }
@@ -770,7 +769,7 @@ int init_ivtv_i2c(struct ivtv *itv)
         * same size and GPIO must be the last entry.
         */
        if (ARRAY_SIZE(hw_driverids) != ARRAY_SIZE(hw_addrs) ||
-            ARRAY_SIZE(hw_drivernames) != ARRAY_SIZE(hw_addrs) ||
+            ARRAY_SIZE(hw_devicenames) != ARRAY_SIZE(hw_addrs) ||
            IVTV_HW_GPIO != (1 << (ARRAY_SIZE(hw_addrs) - 1)) ||
            hw_driverids[ARRAY_SIZE(hw_addrs) - 1]) {
                IVTV_ERR("Mismatched I2C hardware arrays\n");
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c
index 5b9dfa2c51b4..8e0160d275ca 100644
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
@@ -135,8 +135,6 @@ static int m52790_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
-        snprintf(client->name, sizeof(client->name) - 1, "m52790");
        v4l_info(client, "chip found @ 0x%x (%s)\n",
                        client->addr << 1, client->adapter->name);
@@ -159,11 +157,18 @@ static int m52790_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
+static const struct i2c_device_id m52790_id[] = {
+        { "m52790", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, m52790_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "m52790",
        .driverid = I2C_DRIVERID_M52790,
        .command = m52790_command,
        .probe = m52790_probe,
        .remove = m52790_remove,
+        .id_table = m52790_id,
 };
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index e6273162e123..310dbaba55ff 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -815,7 +815,8 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
        int msp_product, msp_prod_hi, msp_prod_lo;
        int msp_rom;
-        snprintf(client->name, sizeof(client->name) - 1, "msp3400");
+        if (!id)
+                strlcpy(client->name, "msp3400", sizeof(client->name));
        if (msp_reset(client) == -1) {
                v4l_dbg(1, msp_debug, client, "msp3400 not found\n");
@@ -864,9 +865,6 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
        msp_revision = (state->rev1 & 0x0f) + '@';
        msp_hard = ((state->rev1 >> 8) & 0xff) + '@';
        msp_rom = state->rev2 & 0x1f;
-        snprintf(client->name, sizeof(client->name), "MSP%d4%02d%c-%c%d",
-                        msp_family, msp_product,
-                        msp_revision, msp_hard, msp_rom);
        /* Rev B=2, C=3, D=4, G=7 */
        state->ident = msp_family * 10000 + 4000 + msp_product * 10 +
                        msp_revision - '@';
@@ -931,7 +929,9 @@ static int msp_probe(struct i2c_client *client, const struct i2c_device_id *id)
        }
        /* hello world :-) */
-        v4l_info(client, "%s found @ 0x%x (%s)\n", client->name,
+        v4l_info(client, "MSP%d4%02d%c-%c%d found @ 0x%x (%s)\n",
+                        msp_family, msp_product,
+                        msp_revision, msp_hard, msp_rom,
                        client->addr << 1, client->adapter->name);
        v4l_info(client, "%s ", client->name);
        if (state->has_nicam && state->has_radio)
@@ -987,6 +987,12 @@ static int msp_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
+static const struct i2c_device_id msp_id[] = {
+        { "msp3400", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, msp_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "msp3400",
        .driverid = I2C_DRIVERID_MSP3400,
@@ -995,6 +1001,7 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .remove = msp_remove,
        .suspend = msp_suspend,
        .resume = msp_resume,
+        .id_table = msp_id,
 };
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index e684108637ad..435c083cc542 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1456,14 +1456,13 @@ static int saa7115_probe(struct i2c_client *client,
        struct saa711x_state *state;
        int     i;
        char    name[17];
-        u8 chip_id;
+        char chip_id;
+        int autodetect = !id || id->driver_data == 1;
        /* Check if the adapter supports the needed features */
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
-        snprintf(client->name, sizeof(client->name) - 1, "saa7115");
        for (i = 0; i < 0x0f; i++) {
                saa711x_write(client, 0, i);
                name[i] = (saa711x_read(client, 0) & 0x0f) + '0';
@@ -1472,8 +1471,7 @@ static int saa7115_probe(struct i2c_client *client,
        }
        name[i] = '\0';
-        saa711x_write(client, 0, 5);
+        chip_id = name[5];
-        chip_id = saa711x_read(client, 0) & 0x0f;
        /* Check whether this chip is part of the saa711x series */
        if (memcmp(name, "1f711", 5)) {
@@ -1482,8 +1480,14 @@ static int saa7115_probe(struct i2c_client *client,
                return -ENODEV;
        }
-        snprintf(client->name, sizeof(client->name) - 1, "saa711%d",chip_id);
+        /* Safety check */
-        v4l_info(client, "saa711%d found (%s) @ 0x%x (%s)\n", chip_id, name, client->addr << 1, client->adapter->name);
+        if (!autodetect && id->name[6] != chip_id) {
+                v4l_warn(client, "found saa711%c while %s was expected\n",
+                         chip_id, id->name);
+        }
+        snprintf(client->name, sizeof(client->name), "saa711%c", chip_id);
+        v4l_info(client, "saa711%c found (%s) @ 0x%x (%s)\n", chip_id, name,
+                 client->addr << 1, client->adapter->name);
        state = kzalloc(sizeof(struct saa711x_state), GFP_KERNEL);
        i2c_set_clientdata(client, state);
@@ -1499,19 +1503,19 @@ static int saa7115_probe(struct i2c_client *client,
        state->hue = 0;
        state->sat = 64;
        switch (chip_id) {
-        case 1:
+        case '1':
                state->ident = V4L2_IDENT_SAA7111;
                break;
-        case 3:
+        case '3':
                state->ident = V4L2_IDENT_SAA7113;
                break;
-        case 4:
+        case '4':
                state->ident = V4L2_IDENT_SAA7114;
                break;
-        case 5:
+        case '5':
                state->ident = V4L2_IDENT_SAA7115;
                break;
-        case 8:
+        case '8':
                state->ident = V4L2_IDENT_SAA7118;
                break;
        default:
@@ -1553,6 +1557,17 @@ static int saa7115_remove(struct i2c_client *client)
        return 0;
 }
+static const struct i2c_device_id saa7115_id[] = {
+        { "saa711x", 1 }, /* autodetect */
+        { "saa7111", 0 },
+        { "saa7113", 0 },
+        { "saa7114", 0 },
+        { "saa7115", 0 },
+        { "saa7118", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa7115_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "saa7115",
        .driverid = I2C_DRIVERID_SAA711X,
@@ -1560,5 +1575,6 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .probe = saa7115_probe,
        .remove = saa7115_remove,
        .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
+        .id_table = saa7115_id,
 };
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index e750cd65c1c3..79d11a658bdf 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -672,8 +672,6 @@ static int saa7127_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
-        snprintf(client->name, sizeof(client->name) - 1, "saa7127");
        v4l_dbg(1, debug, client, "detecting saa7127 client on address 0x%x\n",
                        client->addr << 1);
@@ -741,11 +739,18 @@ static int saa7127_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
+static struct i2c_device_id saa7127_id[] = {
+        { "saa7127", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa7127_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "saa7127",
        .driverid = I2C_DRIVERID_SAA7127,
        .command = saa7127_command,
        .probe = saa7127_probe,
        .remove = saa7127_remove,
+        .id_table = saa7127_id,
 };
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c
index 72c4081feff5..2220f9569941 100644
--- a/drivers/media/video/saa717x.c
+++ b/drivers/media/video/saa717x.c
@@ -1429,8 +1429,6 @@ static int saa717x_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
-        snprintf(client->name, sizeof(client->name) - 1, "saa717x");
        if (saa717x_write(client, 0x5a4, 0xfe) &&
                        saa717x_write(client, 0x5a5, 0x0f) &&
                        saa717x_write(client, 0x5a6, 0x00) &&
@@ -1507,6 +1505,12 @@ static int saa717x_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
+static const struct i2c_device_id saa717x_id[] = {
+        { "saa717x", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, saa717x_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "saa717x",
        .driverid = I2C_DRIVERID_SAA717X,
@@ -1514,4 +1518,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .probe = saa717x_probe,
        .remove = saa717x_remove,
        .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,
+        .id_table = saa717x_id,
 };
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 5748b1e1a128..7f9c7bcf3c85 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -34,7 +34,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/page-flags.h>
-#include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 5a75788b92ae..198f0afb812e 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -1115,7 +1115,6 @@ static int tuner_probe(struct i2c_client *client,
        if (NULL == t)
                return -ENOMEM;
        t->i2c = client;
-        strlcpy(client->name, "(tuner unset)", sizeof(client->name));
        i2c_set_clientdata(client, t);
        t->type = UNSET;
        t->audmode = V4L2_TUNER_MODE_STEREO;
@@ -1273,11 +1272,26 @@ static int tuner_remove(struct i2c_client *client)
        list_del(&t->list);
        kfree(t);
+        /* The probing code has overwritten the device name, restore it so
+           that reloading the driver will work. Ideally the device name
+           should not be overwritten in the first place, but for now that
+           will do. */
+        strlcpy(client->name, "tuner", I2C_NAME_SIZE);
        return 0;
 }
 /* ----------------------------------------------------------------------- */
+/* This driver supports many devices and the idea is to let the driver
+   detect which device is present. So rather than listing all supported
+   devices here, we pretend to support a single, fake device type. */
+static const struct i2c_device_id tuner_id[] = {
+        { "tuner", }, /* autodetect */
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, tuner_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "tuner",
        .driverid = I2C_DRIVERID_TUNER,
@@ -1287,6 +1301,7 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .suspend = tuner_suspend,
        .resume = tuner_resume,
        .legacy_probe = tuner_legacy_probe,
+        .id_table = tuner_id,
 };
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c
index 93bfd19dec7d..b4628874933b 100644
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
@@ -228,6 +228,11 @@ static int upd64031a_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
+static const struct i2c_device_id upd64031a_id[] = {
+        { "upd64031a", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, upd64031a_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "upd64031a",
@@ -235,4 +240,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .command = upd64031a_command,
        .probe = upd64031a_probe,
        .remove = upd64031a_remove,
+        .id_table = upd64031a_id,
 };
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c
index 9ab712a56ce0..9521ce004dcc 100644
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
@@ -205,6 +205,11 @@ static int upd64083_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
+static const struct i2c_device_id upd64083_id[] = {
+        { "upd64083", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, upd64083_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "upd64083",
@@ -212,4 +217,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .command = upd64083_command,
        .probe = upd64083_probe,
        .remove = upd64083_remove,
+        .id_table = upd64083_id,
 };
diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
index 982f4463896c..0a88c44ace00 100644
--- a/drivers/media/video/videobuf-core.c
+++ b/drivers/media/video/videobuf-core.c
@@ -331,7 +331,7 @@ int videobuf_mmap_free(struct videobuf_queue *q)
 }
 /* Locking: Caller holds q->vb_lock */
-static int __videobuf_mmap_setup(struct videobuf_queue *q,
+int __videobuf_mmap_setup(struct videobuf_queue *q,
                        unsigned int bcount, unsigned int bsize,
                        enum v4l2_memory memory)
 {
@@ -1129,6 +1129,7 @@ EXPORT_SYMBOL_GPL(videobuf_read_stream);
 EXPORT_SYMBOL_GPL(videobuf_read_one);
 EXPORT_SYMBOL_GPL(videobuf_poll_stream);
+EXPORT_SYMBOL_GPL(__videobuf_mmap_setup);
 EXPORT_SYMBOL_GPL(videobuf_mmap_setup);
 EXPORT_SYMBOL_GPL(videobuf_mmap_free);
 EXPORT_SYMBOL_GPL(videobuf_mmap_mapper);
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c
index fac0deba24af..a1f76ee032e7 100644
--- a/drivers/media/video/vp27smpx.c
+++ b/drivers/media/video/vp27smpx.c
@@ -130,8 +130,6 @@ static int vp27smpx_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -EIO;
-        snprintf(client->name, sizeof(client->name) - 1, "vp27smpx");
        v4l_info(client, "chip found @ 0x%x (%s)\n",
                        client->addr << 1, client->adapter->name);
@@ -154,11 +152,18 @@ static int vp27smpx_remove(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
+static const struct i2c_device_id vp27smpx_id[] = {
+        { "vp27smpx", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, vp27smpx_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "vp27smpx",
        .driverid = I2C_DRIVERID_VP27SMPX,
        .command = vp27smpx_command,
        .probe = vp27smpx_probe,
        .remove = vp27smpx_remove,
+        .id_table = vp27smpx_id,
 };
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c
index 0f8ed8461fba..fc50299caa36 100644
--- a/drivers/media/video/wm8739.c
+++ b/drivers/media/video/wm8739.c
@@ -313,11 +313,18 @@ static int wm8739_remove(struct i2c_client *client)
        return 0;
 }
+static const struct i2c_device_id wm8739_id[] = {
+        { "wm8739", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, wm8739_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "wm8739",
        .driverid = I2C_DRIVERID_WM8739,
        .command = wm8739_command,
        .probe = wm8739_probe,
        .remove = wm8739_remove,
+        .id_table = wm8739_id,
 };
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 67a409e60c46..506378a508b9 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -216,11 +216,18 @@ static int wm8775_remove(struct i2c_client *client)
        return 0;
 }
+static const struct i2c_device_id wm8775_id[] = {
+        { "wm8775", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, wm8775_id);
 static struct v4l2_i2c_driver_data v4l2_i2c_data = {
        .name = "wm8775",
        .driverid = I2C_DRIVERID_WM8775,
        .command = wm8775_command,
        .probe = wm8775_probe,
        .remove = wm8775_remove,
+        .id_table = wm8775_id,
 };
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 363dd2b9475c..e5c4e9f5193f 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -38,7 +38,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/page-flags.h>
-#include <linux/byteorder/generic.h>
+#include <asm/byteorder.h>
 #include <asm/page.h>
 #include <asm/uaccess.h>
diff --git a/drivers/media/video/zoran_device.c b/drivers/media/video/zoran_device.c
index 7b60533efe45..37629ffd34c3 100644
--- a/drivers/media/video/zoran_device.c
+++ b/drivers/media/video/zoran_device.c
@@ -31,7 +31,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/vmalloc.h>
-#include <linux/byteorder/generic.h>
 #include <linux/interrupt.h>
 #include <linux/proc_fs.h>
@@ -47,6 +46,7 @@
 #include <linux/delay.h>
 #include <linux/wait.h>
+#include <asm/byteorder.h>
 #include <asm/io.h>
 #include "videocodec.h"
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index 0134bec1e399..345c77e46837 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -52,7 +52,6 @@
 #include <linux/pci.h>
 #include <linux/vmalloc.h>
 #include <linux/wait.h>
-#include <linux/byteorder/generic.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
@@ -74,6 +73,7 @@
 #include <media/v4l2-common.h>
 #include "videocodec.h"
+#include <asm/byteorder.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/proc_fs.h>
diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig
index aa8a4e461942..dd0f398ee2f5 100644
--- a/drivers/mmc/card/Kconfig
+++ b/drivers/mmc/card/Kconfig
@@ -39,3 +39,15 @@ config SDIO_UART
          SDIO function driver for SDIO cards that implements the UART
          class, as well as the GPS class which appears like a UART.
+config MMC_TEST
+        tristate "MMC host test driver"
+        default n
+        help
+          Development driver that performs a series of reads and writes
+          to a memory card in order to expose certain well known bugs
+          in host controllers. The tests are executed by writing to the
+          "test" file in sysfs under each card. Note that whatever is
+          on your card will be overwritten by these tests.
+          This driver is only of interest to those developing or
+          testing a host driver. Most people should say N here.
diff --git a/drivers/mmc/card/Makefile b/drivers/mmc/card/Makefile
index fc5a784cfa1a..0d407514f67d 100644
--- a/drivers/mmc/card/Makefile
+++ b/drivers/mmc/card/Makefile
@@ -8,6 +8,7 @@ endif
 obj-$(CONFIG_MMC_BLOCK)         += mmc_block.o
 mmc_block-objs                  := block.o queue.o
+obj-$(CONFIG_MMC_TEST)          += mmc_test.o
 obj-$(CONFIG_SDIO_UART)         += sdio_uart.o
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
new file mode 100644
index 000000000000..ffadee549a41
--- /dev/null
+++ b/drivers/mmc/card/mmc_test.c
@@ -0,0 +1,892 @@
+/*
+ *  linux/drivers/mmc/card/mmc_test.c
+ *
+ *  Copyright 2007 Pierre Ossman
+ *
+ * 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/mmc/core.h>
+#include <linux/mmc/card.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/mmc.h>
+#include <linux/scatterlist.h>
+#define RESULT_OK               0
+#define RESULT_FAIL             1
+#define RESULT_UNSUP_HOST       2
+#define RESULT_UNSUP_CARD       3
+#define BUFFER_SIZE     (PAGE_SIZE * 4)
+struct mmc_test_card {
+        struct mmc_card *card;
+        u8              *buffer;
+};
+/*******************************************************************/
+/*  Helper functions                                               */
+/*******************************************************************/
+static int mmc_test_set_blksize(struct mmc_test_card *test, unsigned size)
+{
+        struct mmc_command cmd;
+        int ret;
+        cmd.opcode = MMC_SET_BLOCKLEN;
+        cmd.arg = size;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+        ret = mmc_wait_for_cmd(test->card->host, &cmd, 0);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int __mmc_test_transfer(struct mmc_test_card *test, int write,
+        unsigned broken_xfer, u8 *buffer, unsigned addr,
+        unsigned blocks, unsigned blksz)
+{
+        int ret, busy;
+        struct mmc_request mrq;
+        struct mmc_command cmd;
+        struct mmc_command stop;
+        struct mmc_data data;
+        struct scatterlist sg;
+        memset(&mrq, 0, sizeof(struct mmc_request));
+        mrq.cmd = &cmd;
+        mrq.data = &data;
+        memset(&cmd, 0, sizeof(struct mmc_command));
+        if (broken_xfer) {
+                if (blocks > 1) {
+                        cmd.opcode = write ?
+                                MMC_WRITE_BLOCK : MMC_READ_SINGLE_BLOCK;
+                } else {
+                        cmd.opcode = MMC_SEND_STATUS;
+                }
+        } else {
+                if (blocks > 1) {
+                        cmd.opcode = write ?
+                                MMC_WRITE_MULTIPLE_BLOCK : MMC_READ_MULTIPLE_BLOCK;
+                } else {
+                        cmd.opcode = write ?
+                                MMC_WRITE_BLOCK : MMC_READ_SINGLE_BLOCK;
+                }
+        }
+        if (broken_xfer && blocks == 1)
+                cmd.arg = test->card->rca << 16;
+        else
+                cmd.arg = addr;
+        cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC;
+        memset(&stop, 0, sizeof(struct mmc_command));
+        if (!broken_xfer && (blocks > 1)) {
+                stop.opcode = MMC_STOP_TRANSMISSION;
+                stop.arg = 0;
+                stop.flags = MMC_RSP_R1B | MMC_CMD_AC;
+                mrq.stop = &stop;
+        }
+        memset(&data, 0, sizeof(struct mmc_data));
+        data.blksz = blksz;
+        data.blocks = blocks;
+        data.flags = write ? MMC_DATA_WRITE : MMC_DATA_READ;
+        data.sg = &sg;
+        data.sg_len = 1;
+        sg_init_one(&sg, buffer, blocks * blksz);
+        mmc_set_data_timeout(&data, test->card);
+        mmc_wait_for_req(test->card->host, &mrq);
+        ret = 0;
+        if (broken_xfer) {
+                if (!ret && cmd.error)
+                        ret = cmd.error;
+                if (!ret && data.error == 0)
+                        ret = RESULT_FAIL;
+                if (!ret && data.error != -ETIMEDOUT)
+                        ret = data.error;
+                if (!ret && stop.error)
+                        ret = stop.error;
+                if (blocks > 1) {
+                        if (!ret && data.bytes_xfered > blksz)
+                                ret = RESULT_FAIL;
+                } else {
+                        if (!ret && data.bytes_xfered > 0)
+                                ret = RESULT_FAIL;
+                }
+        } else {
+                if (!ret && cmd.error)
+                        ret = cmd.error;
+                if (!ret && data.error)
+                        ret = data.error;
+                if (!ret && stop.error)
+                        ret = stop.error;
+                if (!ret && data.bytes_xfered != blocks * blksz)
+                        ret = RESULT_FAIL;
+        }
+        if (ret == -EINVAL)
+                ret = RESULT_UNSUP_HOST;
+        busy = 0;
+        do {
+                int ret2;
+                memset(&cmd, 0, sizeof(struct mmc_command));
+                cmd.opcode = MMC_SEND_STATUS;
+                cmd.arg = test->card->rca << 16;
+                cmd.flags = MMC_RSP_R1 | MMC_CMD_AC;
+                ret2 = mmc_wait_for_cmd(test->card->host, &cmd, 0);
+                if (ret2)
+                        break;
+                if (!busy && !(cmd.resp[0] & R1_READY_FOR_DATA)) {
+                        busy = 1;
+                        printk(KERN_INFO "%s: Warning: Host did not "
+                                "wait for busy state to end.\n",
+                                mmc_hostname(test->card->host));
+                }
+        } while (!(cmd.resp[0] & R1_READY_FOR_DATA));
+        return ret;
+}
+static int mmc_test_transfer(struct mmc_test_card *test, int write,
+        u8 *buffer, unsigned addr, unsigned blocks, unsigned blksz)
+{
+        return __mmc_test_transfer(test, write, 0, buffer,
+                        addr, blocks, blksz);
+}
+static int mmc_test_prepare_verify(struct mmc_test_card *test, int write)
+{
+        int ret, i;
+        ret = mmc_test_set_blksize(test, 512);
+        if (ret)
+                return ret;
+        if (write)
+                memset(test->buffer, 0xDF, BUFFER_SIZE);
+        else {
+                for (i = 0;i < BUFFER_SIZE;i++)
+                        test->buffer[i] = i;
+        }
+        for (i = 0;i < BUFFER_SIZE / 512;i++) {
+                ret = mmc_test_transfer(test, 1, test->buffer + i * 512,
+                        i * 512, 1, 512);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_prepare_verify_write(struct mmc_test_card *test)
+{
+        return mmc_test_prepare_verify(test, 1);
+}
+static int mmc_test_prepare_verify_read(struct mmc_test_card *test)
+{
+        return mmc_test_prepare_verify(test, 0);
+}
+static int mmc_test_verified_transfer(struct mmc_test_card *test, int write,
+        u8 *buffer, unsigned addr, unsigned blocks, unsigned blksz)
+{
+        int ret, i, sectors;
+        /*
+         * It is assumed that the above preparation has been done.
+         */
+        memset(test->buffer, 0, BUFFER_SIZE);
+        if (write) {
+                for (i = 0;i < blocks * blksz;i++)
+                        buffer[i] = i;
+        }
+        ret = mmc_test_set_blksize(test, blksz);
+        if (ret)
+                return ret;
+        ret = mmc_test_transfer(test, write, buffer, addr, blocks, blksz);
+        if (ret)
+                return ret;
+        if (write) {
+                ret = mmc_test_set_blksize(test, 512);
+                if (ret)
+                        return ret;
+                sectors = (blocks * blksz + 511) / 512;
+                if ((sectors * 512) == (blocks * blksz))
+                        sectors++;
+                if ((sectors * 512) > BUFFER_SIZE)
+                        return -EINVAL;
+                memset(test->buffer, 0, sectors * 512);
+                for (i = 0;i < sectors;i++) {
+                        ret = mmc_test_transfer(test, 0,
+                                test->buffer + i * 512,
+                                addr + i * 512, 1, 512);
+                        if (ret)
+                                return ret;
+                }
+                for (i = 0;i < blocks * blksz;i++) {
+                        if (test->buffer[i] != (u8)i)
+                                return RESULT_FAIL;
+                }
+                for (;i < sectors * 512;i++) {
+                        if (test->buffer[i] != 0xDF)
+                                return RESULT_FAIL;
+                }
+        } else {
+                for (i = 0;i < blocks * blksz;i++) {
+                        if (buffer[i] != (u8)i)
+                                return RESULT_FAIL;
+                }
+        }
+        return 0;
+}
+static int mmc_test_cleanup_verify(struct mmc_test_card *test)
+{
+        int ret, i;
+        ret = mmc_test_set_blksize(test, 512);
+        if (ret)
+                return ret;
+        memset(test->buffer, 0, BUFFER_SIZE);
+        for (i = 0;i < BUFFER_SIZE / 512;i++) {
+                ret = mmc_test_transfer(test, 1, test->buffer + i * 512,
+                        i * 512, 1, 512);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+/*******************************************************************/
+/*  Tests                                                          */
+/*******************************************************************/
+struct mmc_test_case {
+        const char *name;
+        int (*prepare)(struct mmc_test_card *);
+        int (*run)(struct mmc_test_card *);
+        int (*cleanup)(struct mmc_test_card *);
+};
+static int mmc_test_basic_write(struct mmc_test_card *test)
+{
+        int ret;
+        ret = mmc_test_set_blksize(test, 512);
+        if (ret)
+                return ret;
+        ret = mmc_test_transfer(test, 1, test->buffer, 0, 1, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_basic_read(struct mmc_test_card *test)
+{
+        int ret;
+        ret = mmc_test_set_blksize(test, 512);
+        if (ret)
+                return ret;
+        ret = mmc_test_transfer(test, 0, test->buffer, 0, 1, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_verify_write(struct mmc_test_card *test)
+{
+        int ret;
+        ret = mmc_test_verified_transfer(test, 1, test->buffer, 0, 1, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_verify_read(struct mmc_test_card *test)
+{
+        int ret;
+        ret = mmc_test_verified_transfer(test, 0, test->buffer, 0, 1, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_multi_write(struct mmc_test_card *test)
+{
+        int ret;
+        unsigned int size;
+        if (test->card->host->max_blk_count == 1)
+                return RESULT_UNSUP_HOST;
+        size = PAGE_SIZE * 2;
+        size = min(size, test->card->host->max_req_size);
+        size = min(size, test->card->host->max_seg_size);
+        size = min(size, test->card->host->max_blk_count * 512);
+        if (size < 1024)
+                return RESULT_UNSUP_HOST;
+        ret = mmc_test_verified_transfer(test, 1, test->buffer, 0,
+                size / 512, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_multi_read(struct mmc_test_card *test)
+{
+        int ret;
+        unsigned int size;
+        if (test->card->host->max_blk_count == 1)
+                return RESULT_UNSUP_HOST;
+        size = PAGE_SIZE * 2;
+        size = min(size, test->card->host->max_req_size);
+        size = min(size, test->card->host->max_seg_size);
+        size = min(size, test->card->host->max_blk_count * 512);
+        if (size < 1024)
+                return RESULT_UNSUP_HOST;
+        ret = mmc_test_verified_transfer(test, 0, test->buffer, 0,
+                size / 512, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_pow2_write(struct mmc_test_card *test)
+{
+        int ret, i;
+        if (!test->card->csd.write_partial)
+                return RESULT_UNSUP_CARD;
+        for (i = 1; i < 512;i <<= 1) {
+                ret = mmc_test_verified_transfer(test, 1,
+                        test->buffer, 0, 1, i);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_pow2_read(struct mmc_test_card *test)
+{
+        int ret, i;
+        if (!test->card->csd.read_partial)
+                return RESULT_UNSUP_CARD;
+        for (i = 1; i < 512;i <<= 1) {
+                ret = mmc_test_verified_transfer(test, 0,
+                        test->buffer, 0, 1, i);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_weird_write(struct mmc_test_card *test)
+{
+        int ret, i;
+        if (!test->card->csd.write_partial)
+                return RESULT_UNSUP_CARD;
+        for (i = 3; i < 512;i += 7) {
+                ret = mmc_test_verified_transfer(test, 1,
+                        test->buffer, 0, 1, i);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_weird_read(struct mmc_test_card *test)
+{
+        int ret, i;
+        if (!test->card->csd.read_partial)
+                return RESULT_UNSUP_CARD;
+        for (i = 3; i < 512;i += 7) {
+                ret = mmc_test_verified_transfer(test, 0,
+                        test->buffer, 0, 1, i);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_align_write(struct mmc_test_card *test)
+{
+        int ret, i;
+        for (i = 1;i < 4;i++) {
+                ret = mmc_test_verified_transfer(test, 1, test->buffer + i,
+                        0, 1, 512);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_align_read(struct mmc_test_card *test)
+{
+        int ret, i;
+        for (i = 1;i < 4;i++) {
+                ret = mmc_test_verified_transfer(test, 0, test->buffer + i,
+                        0, 1, 512);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_align_multi_write(struct mmc_test_card *test)
+{
+        int ret, i;
+        unsigned int size;
+        if (test->card->host->max_blk_count == 1)
+                return RESULT_UNSUP_HOST;
+        size = PAGE_SIZE * 2;
+        size = min(size, test->card->host->max_req_size);
+        size = min(size, test->card->host->max_seg_size);
+        size = min(size, test->card->host->max_blk_count * 512);
+        if (size < 1024)
+                return RESULT_UNSUP_HOST;
+        for (i = 1;i < 4;i++) {
+                ret = mmc_test_verified_transfer(test, 1, test->buffer + i,
+                        0, size / 512, 512);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_align_multi_read(struct mmc_test_card *test)
+{
+        int ret, i;
+        unsigned int size;
+        if (test->card->host->max_blk_count == 1)
+                return RESULT_UNSUP_HOST;
+        size = PAGE_SIZE * 2;
+        size = min(size, test->card->host->max_req_size);
+        size = min(size, test->card->host->max_seg_size);
+        size = min(size, test->card->host->max_blk_count * 512);
+        if (size < 1024)
+                return RESULT_UNSUP_HOST;
+        for (i = 1;i < 4;i++) {
+                ret = mmc_test_verified_transfer(test, 0, test->buffer + i,
+                        0, size / 512, 512);
+                if (ret)
+                        return ret;
+        }
+        return 0;
+}
+static int mmc_test_xfersize_write(struct mmc_test_card *test)
+{
+        int ret;
+        ret = mmc_test_set_blksize(test, 512);
+        if (ret)
+                return ret;
+        ret = __mmc_test_transfer(test, 1, 1, test->buffer, 0, 1, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_xfersize_read(struct mmc_test_card *test)
+{
+        int ret;
+        ret = mmc_test_set_blksize(test, 512);
+        if (ret)
+                return ret;
+        ret = __mmc_test_transfer(test, 0, 1, test->buffer, 0, 1, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_multi_xfersize_write(struct mmc_test_card *test)
+{
+        int ret;
+        if (test->card->host->max_blk_count == 1)
+                return RESULT_UNSUP_HOST;
+        ret = mmc_test_set_blksize(test, 512);
+        if (ret)
+                return ret;
+        ret = __mmc_test_transfer(test, 1, 1, test->buffer, 0, 2, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static int mmc_test_multi_xfersize_read(struct mmc_test_card *test)
+{
+        int ret;
+        if (test->card->host->max_blk_count == 1)
+                return RESULT_UNSUP_HOST;
+        ret = mmc_test_set_blksize(test, 512);
+        if (ret)
+                return ret;
+        ret = __mmc_test_transfer(test, 0, 1, test->buffer, 0, 2, 512);
+        if (ret)
+                return ret;
+        return 0;
+}
+static const struct mmc_test_case mmc_test_cases[] = {
+        {
+                .name = "Basic write (no data verification)",
+                .run = mmc_test_basic_write,
+        },
+        {
+                .name = "Basic read (no data verification)",
+                .run = mmc_test_basic_read,
+        },
+        {
+                .name = "Basic write (with data verification)",
+                .prepare = mmc_test_prepare_verify_write,
+                .run = mmc_test_verify_write,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Basic read (with data verification)",
+                .prepare = mmc_test_prepare_verify_read,
+                .run = mmc_test_verify_read,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Multi-block write",
+                .prepare = mmc_test_prepare_verify_write,
+                .run = mmc_test_multi_write,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Multi-block read",
+                .prepare = mmc_test_prepare_verify_read,
+                .run = mmc_test_multi_read,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Power of two block writes",
+                .prepare = mmc_test_prepare_verify_write,
+                .run = mmc_test_pow2_write,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Power of two block reads",
+                .prepare = mmc_test_prepare_verify_read,
+                .run = mmc_test_pow2_read,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Weird sized block writes",
+                .prepare = mmc_test_prepare_verify_write,
+                .run = mmc_test_weird_write,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Weird sized block reads",
+                .prepare = mmc_test_prepare_verify_read,
+                .run = mmc_test_weird_read,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Badly aligned write",
+                .prepare = mmc_test_prepare_verify_write,
+                .run = mmc_test_align_write,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Badly aligned read",
+                .prepare = mmc_test_prepare_verify_read,
+                .run = mmc_test_align_read,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Badly aligned multi-block write",
+                .prepare = mmc_test_prepare_verify_write,
+                .run = mmc_test_align_multi_write,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Badly aligned multi-block read",
+                .prepare = mmc_test_prepare_verify_read,
+                .run = mmc_test_align_multi_read,
+                .cleanup = mmc_test_cleanup_verify,
+        },
+        {
+                .name = "Correct xfer_size at write (start failure)",
+                .run = mmc_test_xfersize_write,
+        },
+        {
+                .name = "Correct xfer_size at read (start failure)",
+                .run = mmc_test_xfersize_read,
+        },
+        {
+                .name = "Correct xfer_size at write (midway failure)",
+                .run = mmc_test_multi_xfersize_write,
+        },
+        {
+                .name = "Correct xfer_size at read (midway failure)",
+                .run = mmc_test_multi_xfersize_read,
+        },
+};
+static struct mutex mmc_test_lock;
+static void mmc_test_run(struct mmc_test_card *test)
+{
+        int i, ret;
+        printk(KERN_INFO "%s: Starting tests of card %s...\n",
+                mmc_hostname(test->card->host), mmc_card_id(test->card));
+        mmc_claim_host(test->card->host);
+        for (i = 0;i < ARRAY_SIZE(mmc_test_cases);i++) {
+                printk(KERN_INFO "%s: Test case %d. %s...\n",
+                        mmc_hostname(test->card->host), i + 1,
+                        mmc_test_cases[i].name);
+                if (mmc_test_cases[i].prepare) {
+                        ret = mmc_test_cases[i].prepare(test);
+                        if (ret) {
+                                printk(KERN_INFO "%s: Result: Prepare "
+                                        "stage failed! (%d)\n",
+                                        mmc_hostname(test->card->host),
+                                        ret);
+                                continue;
+                        }
+                }
+                ret = mmc_test_cases[i].run(test);
+                switch (ret) {
+                case RESULT_OK:
+                        printk(KERN_INFO "%s: Result: OK\n",
+                                mmc_hostname(test->card->host));
+                        break;
+                case RESULT_FAIL:
+                        printk(KERN_INFO "%s: Result: FAILED\n",
+                                mmc_hostname(test->card->host));
+                        break;
+                case RESULT_UNSUP_HOST:
+                        printk(KERN_INFO "%s: Result: UNSUPPORTED "
+                                "(by host)\n",
+                                mmc_hostname(test->card->host));
+                        break;
+                case RESULT_UNSUP_CARD:
+                        printk(KERN_INFO "%s: Result: UNSUPPORTED "
+                                "(by card)\n",
+                                mmc_hostname(test->card->host));
+                        break;
+                default:
+                        printk(KERN_INFO "%s: Result: ERROR (%d)\n",
+                                mmc_hostname(test->card->host), ret);
+                }
+                if (mmc_test_cases[i].cleanup) {
+                        ret = mmc_test_cases[i].cleanup(test);
+                        if (ret) {
+                                printk(KERN_INFO "%s: Warning: Cleanup "
+                                        "stage failed! (%d)\n",
+                                        mmc_hostname(test->card->host),
+                                        ret);
+                        }
+                }
+        }
+        mmc_release_host(test->card->host);
+        printk(KERN_INFO "%s: Tests completed.\n",
+                mmc_hostname(test->card->host));
+}
+static ssize_t mmc_test_show(struct device *dev,
+        struct device_attribute *attr, char *buf)
+{
+        mutex_lock(&mmc_test_lock);
+        mutex_unlock(&mmc_test_lock);
+        return 0;
+}
+static ssize_t mmc_test_store(struct device *dev,
+        struct device_attribute *attr, const char *buf, size_t count)
+{
+        struct mmc_card *card;
+        struct mmc_test_card *test;
+        card = container_of(dev, struct mmc_card, dev);
+        test = kzalloc(sizeof(struct mmc_test_card), GFP_KERNEL);
+        if (!test)
+                return -ENOMEM;
+        test->card = card;
+        test->buffer = kzalloc(BUFFER_SIZE, GFP_KERNEL);
+        if (test->buffer) {
+                mutex_lock(&mmc_test_lock);
+                mmc_test_run(test);
+                mutex_unlock(&mmc_test_lock);
+        }
+        kfree(test->buffer);
+        kfree(test);
+        return count;
+}
+static DEVICE_ATTR(test, S_IWUSR | S_IRUGO, mmc_test_show, mmc_test_store);
+static int mmc_test_probe(struct mmc_card *card)
+{
+        int ret;
+        mutex_init(&mmc_test_lock);
+        ret = device_create_file(&card->dev, &dev_attr_test);
+        if (ret)
+                return ret;
+        return 0;
+}
+static void mmc_test_remove(struct mmc_card *card)
+{
+        device_remove_file(&card->dev, &dev_attr_test);
+}
+static struct mmc_driver mmc_driver = {
+        .drv            = {
+                .name   = "mmc_test",
+        },
+        .probe          = mmc_test_probe,
+        .remove         = mmc_test_remove,
+};
+static int __init mmc_test_init(void)
+{
+        return mmc_register_driver(&mmc_driver);
+}
+static void __exit mmc_test_exit(void)
+{
+        mmc_unregister_driver(&mmc_driver);
+}
+module_init(mmc_test_init);
+module_exit(mmc_test_exit);
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("Multimedia Card (MMC) host test driver");
+MODULE_AUTHOR("Pierre Ossman");
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index a28fc2f68ce2..8979ad330a4d 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -663,9 +663,12 @@ static void at91_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                                gpio_set_value(host->board->vcc_pin, 0);
                                break;
                        case MMC_POWER_UP:
-                        case MMC_POWER_ON:
                                gpio_set_value(host->board->vcc_pin, 1);
                                break;
+                        case MMC_POWER_ON:
+                                break;
+                        default:
+                                WARN_ON(1);
                }
        }
 }
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 14759e9f42ad..549517c35675 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1003,7 +1003,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data)
 static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data *data)
 {
-        const char *dev_name;
+        const char *dma_dev_name;
        int sync_dev, dma_ch, is_read, r;
        is_read = !(data->flags & MMC_DATA_WRITE);
@@ -1018,21 +1018,21 @@ static int mmc_omap_get_dma_channel(struct mmc_omap_host *host, struct mmc_data
        if (is_read) {
                if (host->id == 1) {
                        sync_dev = OMAP_DMA_MMC_RX;
-                        dev_name = "MMC1 read";
+                        dma_dev_name = "MMC1 read";
                } else {
                        sync_dev = OMAP_DMA_MMC2_RX;
-                        dev_name = "MMC2 read";
+                        dma_dev_name = "MMC2 read";
                }
        } else {
                if (host->id == 1) {
                        sync_dev = OMAP_DMA_MMC_TX;
-                        dev_name = "MMC1 write";
+                        dma_dev_name = "MMC1 write";
                } else {
                        sync_dev = OMAP_DMA_MMC2_TX;
-                        dev_name = "MMC2 write";
+                        dma_dev_name = "MMC2 write";
                }
        }
-        r = omap_request_dma(sync_dev, dev_name, mmc_omap_dma_cb,
+        r = omap_request_dma(sync_dev, dma_dev_name, mmc_omap_dma_cb,
                             host, &dma_ch);
        if (r != 0) {
                dev_dbg(mmc_dev(host->mmc), "omap_request_dma() failed with %d\n", r);
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index 2797da7eeee6..da292e647eb1 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1162,6 +1162,7 @@ struct net_device * __init i82596_probe(int unit)
                memcpy(eth_addr, (void *) 0xfffc1f2c, 6);       /* YUCK! Get addr from NOVRAM */
                dev->base_addr = MVME_I596_BASE;
                dev->irq = (unsigned) MVME16x_IRQ_I596;
+                goto found;
        }
 #endif
 #ifdef ENABLE_BVME6000_NET
@@ -1176,6 +1177,7 @@ struct net_device * __init i82596_probe(int unit)
                rtc[3] = msr;
                dev->base_addr = BVME_I596_BASE;
                dev->irq = (unsigned) BVME_IRQ_I596;
+                goto found;
        }
 #endif
 #ifdef ENABLE_APRICOT
@@ -1212,8 +1214,13 @@ struct net_device * __init i82596_probe(int unit)
                }
                dev->irq = 10;
+                goto found;
        }
 #endif
+        err = -ENODEV;
+        goto out;
+found:
        dev->mem_start = (int)__get_free_pages(GFP_ATOMIC, 0);
        if (!dev->mem_start) {
                err = -ENOMEM;
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 47a8275d3962..867f6fff543c 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -127,6 +127,9 @@ struct net_device * __init apne_probe(int unit)
 #endif
        int err;
+        if (!MACH_IS_AMIGA)
+                return ERR_PTR(-ENODEV);
        if (apne_owned)
                return ERR_PTR(-ENODEV);
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 2a66e5b7cebc..4ce8afd481c3 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -183,6 +183,9 @@ struct net_device * __init mac89x0_probe(int unit)
        int err = -ENODEV;
        DECLARE_MAC_BUF(mac);
+        if (!MACH_IS_MAC)
+                return ERR_PTR(-ENODEV);
        dev = alloc_etherdev(sizeof(struct net_local));
        if (!dev)
                return ERR_PTR(-ENOMEM);
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 18770527df99..51ad3765e075 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -781,6 +781,9 @@ static int __init mac_mace_init_module(void)
 {
        int err;
+        if (!MACH_IS_MAC)
+                return -ENODEV;
        if ((err = platform_driver_register(&mac_mace_driver))) {
                printk(KERN_ERR "Driver registration failed\n");
                return err;
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index f8d46134daca..359452a06c67 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -250,6 +250,9 @@ struct net_device * __init sun3lance_probe(int unit)
        static int found;
        int err = -ENODEV;
+        if (!MACH_IS_SUN3 && !MACH_IS_SUN3X)
+                return ERR_PTR(-ENODEV);
        /* check that this machine has an onboard lance */
        switch(idprom->id_machtype) {
        case SM_SUN3|SM_3_50:
diff --git a/drivers/net/usb/cdc_subset.c b/drivers/net/usb/cdc_subset.c
index 0ec7936cbe21..c66b9c324f54 100644
--- a/drivers/net/usb/cdc_subset.c
+++ b/drivers/net/usb/cdc_subset.c
@@ -218,7 +218,7 @@ static const struct driver_info	blob_info = {
 /*-------------------------------------------------------------------------*/
 #ifndef HAVE_HARDWARE
-#error You need to configure some hardware for this driver
+#warning You need to configure some hardware for this driver
 #endif
 /*
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index ef2da4023d68..438e63ecccf1 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -47,6 +47,7 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/timer.h>
+#include <asm/byteorder.h>
 #include <asm/io.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -60,7 +61,6 @@
 #include <linux/delay.h>
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
-#include <linux/byteorder/generic.h>
 #include <linux/crc32.h>
 #include <linux/proc_fs.h>
 #include <linux/device.h>
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 9bd7c4a31253..23ffb7c0caf2 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -65,6 +65,9 @@ struct property *of_find_property(const struct device_node *np,
 {
        struct property *pp;
+        if (!np)
+                return NULL;
        read_lock(&devtree_lock);
        for (pp = np->properties; pp != 0; pp = pp->next) {
                if (of_prop_cmp(pp->name, name) == 0) {
diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c
index 558420bc9f88..821369135369 100644
--- a/drivers/parisc/asp.c
+++ b/drivers/parisc/asp.c
@@ -88,7 +88,7 @@ asp_init_chip(struct parisc_device *dev)
        ret = -EBUSY;
        dev->irq = gsc_claim_irq(&gsc_irq, ASP_GSC_IRQ);
        if (dev->irq < 0) {
-                printk(KERN_ERR "%s(): cannot get GSC irq\n", __FUNCTION__);
+                printk(KERN_ERR "%s(): cannot get GSC irq\n", __func__);
                goto out;
        }
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 07d2a8d4498f..b30e38f3a50d 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -359,7 +359,7 @@ ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
        BUG_ON((pages_needed * IOVP_SIZE) > DMA_CHUNK_SIZE);
     
        DBG_RES("%s() size: %d pages_needed %d\n", 
-                __FUNCTION__, size, pages_needed);
+                __func__, size, pages_needed);
        /*
        ** "seek and ye shall find"...praying never hurts either...
@@ -395,16 +395,16 @@ ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
 #endif
        } else {
                panic("%s: %s() Too many pages to map. pages_needed: %u\n",
-                       __FILE__,  __FUNCTION__, pages_needed);
+                       __FILE__,  __func__, pages_needed);
        }
        panic("%s: %s() I/O MMU is out of mapping resources.\n", __FILE__,
-              __FUNCTION__);
+              __func__);
        
 resource_found:
        
        DBG_RES("%s() res_idx %d res_hint: %d\n",
-                __FUNCTION__, res_idx, ioc->res_hint);
+                __func__, res_idx, ioc->res_hint);
 #ifdef CCIO_SEARCH_TIME
        {
@@ -450,7 +450,7 @@ ccio_free_range(struct ioc *ioc, dma_addr_t iova, unsigned long pages_mapped)
        BUG_ON(pages_mapped > BITS_PER_LONG);
        DBG_RES("%s():  res_idx: %d pages_mapped %d\n", 
-                __FUNCTION__, res_idx, pages_mapped);
+                __func__, res_idx, pages_mapped);
 #ifdef CCIO_MAP_STATS
        ioc->used_pages -= pages_mapped;
@@ -474,7 +474,7 @@ ccio_free_range(struct ioc *ioc, dma_addr_t iova, unsigned long pages_mapped)
 #endif
        } else {
                panic("%s:%s() Too many pages to unmap.\n", __FILE__,
-                      __FUNCTION__);
+                      __func__);
        }
 }
@@ -775,7 +775,7 @@ ccio_map_single(struct device *dev, void *addr, size_t size,
        pdir_start = &(ioc->pdir_base[idx]);
        DBG_RUN("%s() 0x%p -> 0x%lx size: %0x%x\n",
-                __FUNCTION__, addr, (long)iovp | offset, size);
+                __func__, addr, (long)iovp | offset, size);
        /* If not cacheline aligned, force SAFE_DMA on the whole mess */
        if((size % L1_CACHE_BYTES) || ((unsigned long)addr % L1_CACHE_BYTES))
@@ -820,7 +820,7 @@ ccio_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
        ioc = GET_IOC(dev);
        DBG_RUN("%s() iovp 0x%lx/%x\n",
-                __FUNCTION__, (long)iova, size);
+                __func__, (long)iova, size);
        iova ^= offset;        /* clear offset bits */
        size += offset;
@@ -922,7 +922,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
        BUG_ON(!dev);
        ioc = GET_IOC(dev);
        
-        DBG_RUN_SG("%s() START %d entries\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
        /* Fast path single entry scatterlists. */
        if (nents == 1) {
@@ -966,7 +966,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
        BUG_ON(coalesced != filled);
-        DBG_RUN_SG("%s() DONE %d mappings\n", __FUNCTION__, filled);
+        DBG_RUN_SG("%s() DONE %d mappings\n", __func__, filled);
        for (i = 0; i < filled; i++)
                current_len += sg_dma_len(sglist + i);
@@ -995,7 +995,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
        ioc = GET_IOC(dev);
        DBG_RUN_SG("%s() START %d entries,  %08lx,%x\n",
-                __FUNCTION__, nents, sg_virt_addr(sglist), sglist->length);
+                __func__, nents, sg_virt_addr(sglist), sglist->length);
 #ifdef CCIO_MAP_STATS
        ioc->usg_calls++;
@@ -1011,7 +1011,7 @@ ccio_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
                ++sglist;
        }
-        DBG_RUN_SG("%s() DONE (nents %d)\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() DONE (nents %d)\n", __func__, nents);
 }
 static struct hppa_dma_ops ccio_ops = {
@@ -1225,7 +1225,7 @@ static int
 ccio_get_iotlb_size(struct parisc_device *dev)
 {
        if (dev->spa_shift == 0) {
-                panic("%s() : Can't determine I/O TLB size.\n", __FUNCTION__);
+                panic("%s() : Can't determine I/O TLB size.\n", __func__);
        }
        return (1 << dev->spa_shift);
 }
@@ -1315,7 +1315,7 @@ ccio_ioc_init(struct ioc *ioc)
        BUG_ON((1 << get_order(ioc->pdir_size)) != (ioc->pdir_size >> PAGE_SHIFT));
        DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n",
-                        __FUNCTION__, ioc->ioc_regs,
+                        __func__, ioc->ioc_regs,
                        (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
                        iova_space_size>>20,
                        iov_order + PAGE_SHIFT);
@@ -1323,7 +1323,7 @@ ccio_ioc_init(struct ioc *ioc)
        ioc->pdir_base = (u64 *)__get_free_pages(GFP_KERNEL, 
                                                 get_order(ioc->pdir_size));
        if(NULL == ioc->pdir_base) {
-                panic("%s() could not allocate I/O Page Table\n", __FUNCTION__);
+                panic("%s() could not allocate I/O Page Table\n", __func__);
        }
        memset(ioc->pdir_base, 0, ioc->pdir_size);
@@ -1332,12 +1332,12 @@ ccio_ioc_init(struct ioc *ioc)
        /* resource map size dictated by pdir_size */
        ioc->res_size = (ioc->pdir_size / sizeof(u64)) >> 3;
-        DBG_INIT("%s() res_size 0x%x\n", __FUNCTION__, ioc->res_size);
+        DBG_INIT("%s() res_size 0x%x\n", __func__, ioc->res_size);
        
        ioc->res_map = (u8 *)__get_free_pages(GFP_KERNEL, 
                                              get_order(ioc->res_size));
        if(NULL == ioc->res_map) {
-                panic("%s() could not allocate resource map\n", __FUNCTION__);
+                panic("%s() could not allocate resource map\n", __func__);
        }
        memset(ioc->res_map, 0, ioc->res_size);
@@ -1409,7 +1409,7 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr)
        result = insert_resource(&iomem_resource, res);
        if (result < 0) {
                printk(KERN_ERR "%s() failed to claim CCIO bus address space (%08lx,%08lx)\n", 
-                        __FUNCTION__, res->start, res->end);
+                        __func__, res->start, res->end);
        }
 }
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index d9c6322a721b..fd56128525d1 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -180,7 +180,7 @@ static int dino_cfg_read(struct pci_bus *bus, unsigned int devfn, int where,
        void __iomem *base_addr = d->hba.base_addr;
        unsigned long flags;
-        DBG("%s: %p, %d, %d, %d\n", __FUNCTION__, base_addr, devfn, where,
+        DBG("%s: %p, %d, %d, %d\n", __func__, base_addr, devfn, where,
                                                                        size);
        spin_lock_irqsave(&d->dinosaur_pen, flags);
@@ -215,7 +215,7 @@ static int dino_cfg_write(struct pci_bus *bus, unsigned int devfn, int where,
        void __iomem *base_addr = d->hba.base_addr;
        unsigned long flags;
-        DBG("%s: %p, %d, %d, %d\n", __FUNCTION__, base_addr, devfn, where,
+        DBG("%s: %p, %d, %d, %d\n", __func__, base_addr, devfn, where,
                                                                        size);
        spin_lock_irqsave(&d->dinosaur_pen, flags);
@@ -301,7 +301,7 @@ static void dino_disable_irq(unsigned int irq)
        struct dino_device *dino_dev = irq_desc[irq].chip_data;
        int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq);
+        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq);
        /* Clear the matching bit in the IMR register */
        dino_dev->imr &= ~(DINO_MASK_IRQ(local_irq));
@@ -314,7 +314,7 @@ static void dino_enable_irq(unsigned int irq)
        int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS);
        u32 tmp;
-        DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq);
+        DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq);
        /*
        ** clear pending IRQ bits
@@ -340,7 +340,7 @@ static void dino_enable_irq(unsigned int irq)
        tmp = __raw_readl(dino_dev->hba.base_addr+DINO_ILR);
        if (tmp & DINO_MASK_IRQ(local_irq)) {
                DBG(KERN_WARNING "%s(): IRQ asserted! (ILR 0x%x)\n",
-                                __FUNCTION__, tmp);
+                                __func__, tmp);
                gsc_writel(dino_dev->txn_data, dino_dev->txn_addr);
        }
 }
@@ -388,7 +388,7 @@ ilr_again:
                int local_irq = __ffs(mask);
                int irq = dino_dev->global_irq[local_irq];
                DBG(KERN_DEBUG "%s(%d, %p) mask 0x%x\n",
-                        __FUNCTION__, irq, intr_dev, mask);
+                        __func__, irq, intr_dev, mask);
                __do_IRQ(irq);
                mask &= ~(1 << local_irq);
        } while (mask);
@@ -566,7 +566,7 @@ dino_fixup_bus(struct pci_bus *bus)
        int port_base = HBA_PORT_BASE(dino_dev->hba.hba_num);
        DBG(KERN_WARNING "%s(0x%p) bus %d platform_data 0x%p\n",
-            __FUNCTION__, bus, bus->secondary, 
+            __func__, bus, bus->secondary,
            bus->bridge->platform_data);
        /* Firmware doesn't set up card-mode dino, so we have to */
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 1b3e3fd12d95..f7d088b897ee 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -112,7 +112,7 @@ static void gsc_asic_disable_irq(unsigned int irq)
        int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
        u32 imr;
-        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __FUNCTION__, irq,
+        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
                        irq_dev->name, imr);
        /* Disable the IRQ line by clearing the bit in the IMR */
@@ -127,7 +127,7 @@ static void gsc_asic_enable_irq(unsigned int irq)
        int local_irq = gsc_find_local_irq(irq, irq_dev->global_irq, 32);
        u32 imr;
-        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __FUNCTION__, irq,
+        DEBPRINTK(KERN_DEBUG "%s(%d) %s: IMR 0x%x\n", __func__, irq,
                        irq_dev->name, imr);
        /* Enable the IRQ line by setting the bit in the IMR */
diff --git a/drivers/parisc/lasi.c b/drivers/parisc/lasi.c
index cb3d28176129..bee510098ce8 100644
--- a/drivers/parisc/lasi.c
+++ b/drivers/parisc/lasi.c
@@ -193,7 +193,7 @@ lasi_init_chip(struct parisc_device *dev)
        dev->irq = gsc_alloc_irq(&gsc_irq);
        if (dev->irq < 0) {
                printk(KERN_ERR "%s(): cannot get GSC irq\n",
-                                __FUNCTION__);
+                                __func__);
                kfree(lasi);
                return -EBUSY;
        }
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 66ce61048361..a28c8946deaa 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -377,12 +377,12 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int
                /* original - Generate config cycle on broken elroy
                  with risk we will miss PCI bus errors. */
                *data = lba_rd_cfg(d, tok, pos, size);
-                DBG_CFG("%s(%x+%2x) -> 0x%x (a)\n", __FUNCTION__, tok, pos, *data);
+                DBG_CFG("%s(%x+%2x) -> 0x%x (a)\n", __func__, tok, pos, *data);
                return 0;
        }
        if (LBA_SKIP_PROBE(d) && !lba_device_present(bus->secondary, devfn, d)) {
-                DBG_CFG("%s(%x+%2x) -> -1 (b)\n", __FUNCTION__, tok, pos);
+                DBG_CFG("%s(%x+%2x) -> -1 (b)\n", __func__, tok, pos);
                /* either don't want to look or know device isn't present. */
                *data = ~0U;
                return(0);
@@ -398,7 +398,7 @@ static int elroy_cfg_read(struct pci_bus *bus, unsigned int devfn, int pos, int
        case 2: *data = READ_REG16(data_reg + (pos & 2)); break;
        case 4: *data = READ_REG32(data_reg); break;
        }
-        DBG_CFG("%s(%x+%2x) -> 0x%x (c)\n", __FUNCTION__, tok, pos, *data);
+        DBG_CFG("%s(%x+%2x) -> 0x%x (c)\n", __func__, tok, pos, *data);
        return 0;
 }
@@ -441,16 +441,16 @@ static int elroy_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, int
        if (!LBA_SKIP_PROBE(d)) {
                /* Original Workaround */
                lba_wr_cfg(d, tok, pos, (u32) data, size);
-                DBG_CFG("%s(%x+%2x) = 0x%x (a)\n", __FUNCTION__, tok, pos,data);
+                DBG_CFG("%s(%x+%2x) = 0x%x (a)\n", __func__, tok, pos,data);
                return 0;
        }
        if (LBA_SKIP_PROBE(d) && (!lba_device_present(bus->secondary, devfn, d))) {
-                DBG_CFG("%s(%x+%2x) = 0x%x (b)\n", __FUNCTION__, tok, pos,data);
+                DBG_CFG("%s(%x+%2x) = 0x%x (b)\n", __func__, tok, pos,data);
                return 1; /* New Workaround */
        }
-        DBG_CFG("%s(%x+%2x) = 0x%x (c)\n", __FUNCTION__, tok, pos, data);
+        DBG_CFG("%s(%x+%2x) = 0x%x (c)\n", __func__, tok, pos, data);
        /* Basic Algorithm */
        LBA_CFG_ADDR_SETUP(d, tok | pos);
@@ -521,7 +521,7 @@ static int mercury_cfg_write(struct pci_bus *bus, unsigned int devfn, int pos, i
        if ((pos > 255) || (devfn > 255))
                return -EINVAL;
-        DBG_CFG("%s(%x+%2x) <- 0x%x (c)\n", __FUNCTION__, tok, pos, data);
+        DBG_CFG("%s(%x+%2x) <- 0x%x (c)\n", __func__, tok, pos, data);
        LBA_CFG_TR4_ADDR_SETUP(d, tok | pos);
        switch(size) {
@@ -890,7 +890,7 @@ LBA_PORT_IN(32, 0)
 #define LBA_PORT_OUT(size, mask) \
 static void lba_astro_out##size (struct pci_hba_data *d, u16 addr, u##size val) \
 { \
-        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __FUNCTION__, d, addr, val); \
+        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __func__, d, addr, val); \
        WRITE_REG##size(val, astro_iop_base + addr); \
        if (LBA_DEV(d)->hw_rev < 3) \
                lba_t32 = READ_U32(d->base_addr + LBA_FUNC_ID); \
@@ -932,7 +932,7 @@ static struct pci_port_ops lba_astro_port_ops = {
 static u##size lba_pat_in##size (struct pci_hba_data *l, u16 addr) \
 { \
        u##size t; \
-        DBG_PORT("%s(0x%p, 0x%x) ->", __FUNCTION__, l, addr); \
+        DBG_PORT("%s(0x%p, 0x%x) ->", __func__, l, addr); \
        t = READ_REG##size(PIOP_TO_GMMIO(LBA_DEV(l), addr)); \
        DBG_PORT(" 0x%x\n", t); \
        return (t); \
@@ -948,7 +948,7 @@ LBA_PORT_IN(32, 0)
 static void lba_pat_out##size (struct pci_hba_data *l, u16 addr, u##size val) \
 { \
        void __iomem *where = PIOP_TO_GMMIO(LBA_DEV(l), addr); \
-        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __FUNCTION__, l, addr, val); \
+        DBG_PORT("%s(0x%p, 0x%x, 0x%x)\n", __func__, l, addr, val); \
        WRITE_REG##size(val, where); \
        /* flush the I/O down to the elroy at least */ \
        lba_t32 = READ_U32(l->base_addr + LBA_FUNC_ID); \
@@ -1584,7 +1584,7 @@ void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask)
        WARN_ON((ibase & 0x001fffff) != 0);
        WARN_ON((imask & 0x001fffff) != 0);
        
-        DBG("%s() ibase 0x%x imask 0x%x\n", __FUNCTION__, ibase, imask);
+        DBG("%s() ibase 0x%x imask 0x%x\n", __func__, ibase, imask);
        WRITE_REG32( imask, base_addr + LBA_IMASK);
        WRITE_REG32( ibase, base_addr + LBA_IBASE);
        iounmap(base_addr);
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 703b85edb004..f9b12664f9fb 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -569,7 +569,7 @@ int __init register_led_driver(int model, unsigned long cmd_reg, unsigned long d
        default:
                printk(KERN_ERR "%s: Wrong LCD/LED model %d !\n",
-                       __FUNCTION__, lcd_info.model);
+                       __func__, lcd_info.model);
                return 1;
        }
        
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index afc849bd3f58..bc73b96346ff 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -384,7 +384,7 @@ sba_search_bitmap(struct ioc *ioc, struct device *dev,
                }
                mask = RESMAP_MASK(bits_wanted) >> bitshiftcnt;
-                DBG_RES("%s() o %ld %p", __FUNCTION__, o, res_ptr);
+                DBG_RES("%s() o %ld %p", __func__, o, res_ptr);
                while(res_ptr < res_end)
                { 
                        DBG_RES("    %p %lx %lx\n", res_ptr, mask, *res_ptr);
@@ -454,7 +454,7 @@ sba_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
 #endif
        DBG_RES("%s(%x) %d -> %lx hint %x/%x\n",
-                __FUNCTION__, size, pages_needed, pide,
+                __func__, size, pages_needed, pide,
                (uint) ((unsigned long) ioc->res_hint - (unsigned long) ioc->res_map),
                ioc->res_bitshift );
@@ -497,7 +497,7 @@ sba_free_range(struct ioc *ioc, dma_addr_t iova, size_t size)
        unsigned long m = RESMAP_MASK(bits_not_wanted) >> (pide & (BITS_PER_LONG - 1));
        DBG_RES("%s( ,%x,%x) %x/%lx %x %p %lx\n",
-                __FUNCTION__, (uint) iova, size,
+                __func__, (uint) iova, size,
                bits_not_wanted, m, pide, res_ptr, *res_ptr);
 #ifdef SBA_COLLECT_STATS
@@ -740,7 +740,7 @@ sba_map_single(struct device *dev, void *addr, size_t size,
        iovp = (dma_addr_t) pide << IOVP_SHIFT;
        DBG_RUN("%s() 0x%p -> 0x%lx\n",
-                __FUNCTION__, addr, (long) iovp | offset);
+                __func__, addr, (long) iovp | offset);
        pdir_start = &(ioc->pdir_base[pide]);
@@ -798,7 +798,7 @@ sba_unmap_single(struct device *dev, dma_addr_t iova, size_t size,
        unsigned long flags; 
        dma_addr_t offset;
-        DBG_RUN("%s() iovp 0x%lx/%x\n", __FUNCTION__, (long) iova, size);
+        DBG_RUN("%s() iovp 0x%lx/%x\n", __func__, (long) iova, size);
        ioc = GET_IOC(dev);
        offset = iova & ~IOVP_MASK;
@@ -937,7 +937,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
        int coalesced, filled = 0;
        unsigned long flags;
-        DBG_RUN_SG("%s() START %d entries\n", __FUNCTION__, nents);
+        DBG_RUN_SG("%s() START %d entries\n", __func__, nents);
        ioc = GET_IOC(dev);
@@ -998,7 +998,7 @@ sba_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
        spin_unlock_irqrestore(&ioc->res_lock, flags);
-        DBG_RUN_SG("%s() DONE %d mappings\n", __FUNCTION__, filled);
+        DBG_RUN_SG("%s() DONE %d mappings\n", __func__, filled);
        return filled;
 }
@@ -1023,7 +1023,7 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
 #endif
        DBG_RUN_SG("%s() START %d entries,  %p,%x\n",
-                __FUNCTION__, nents, sg_virt_addr(sglist), sglist->length);
+                __func__, nents, sg_virt_addr(sglist), sglist->length);
        ioc = GET_IOC(dev);
@@ -1047,7 +1047,7 @@ sba_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents,
                ++sglist;
        }
-        DBG_RUN_SG("%s() DONE (nents %d)\n", __FUNCTION__,  nents);
+        DBG_RUN_SG("%s() DONE (nents %d)\n", __func__,  nents);
 #ifdef ASSERT_PDIR_SANITY
        spin_lock_irqsave(&ioc->res_lock, flags);
@@ -1118,7 +1118,7 @@ sba_alloc_pdir(unsigned int pdir_size)
        pdir_base = __get_free_pages(GFP_KERNEL, pdir_order);
        if (NULL == (void *) pdir_base) {
                panic("%s() could not allocate I/O Page Table\n",
-                        __FUNCTION__);
+                        __func__);
        }
        /* If this is not PA8700 (PCX-W2)
@@ -1261,7 +1261,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        ioc->pdir_size = (iova_space_size / IOVP_SIZE) * sizeof(u64);
        DBG_INIT("%s() hpa 0x%p IOV %dMB (%d bits)\n",
-                __FUNCTION__, ioc->ioc_hpa, iova_space_size >> 20,
+                __func__, ioc->ioc_hpa, iova_space_size >> 20,
                iov_order + PAGE_SHIFT);
        ioc->pdir_base = (void *) __get_free_pages(GFP_KERNEL,
@@ -1272,7 +1272,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        memset(ioc->pdir_base, 0, ioc->pdir_size);
        DBG_INIT("%s() pdir %p size %x\n",
-                        __FUNCTION__, ioc->pdir_base, ioc->pdir_size);
+                        __func__, ioc->pdir_base, ioc->pdir_size);
 #ifdef SBA_HINT_SUPPORT
        ioc->hint_shift_pdir = iov_order + PAGE_SHIFT;
@@ -1354,7 +1354,7 @@ sba_ioc_init_pluto(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        if (agp_found && sba_reserve_agpgart) {
                printk(KERN_INFO "%s: reserving %dMb of IOVA space for agpgart\n",
-                       __FUNCTION__, (iova_space_size/2) >> 20);
+                       __func__, (iova_space_size/2) >> 20);
                ioc->pdir_size /= 2;
                ioc->pdir_base[PDIR_INDEX(iova_space_size/2)] = SBA_AGPGART_COOKIE;
        }
@@ -1406,7 +1406,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        ioc->pdir_size = pdir_size = (iova_space_size/IOVP_SIZE) * sizeof(u64);
        DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n",
-                        __FUNCTION__,
+                        __func__,
                        ioc->ioc_hpa,
                        (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
                        iova_space_size>>20,
@@ -1415,7 +1415,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        ioc->pdir_base = sba_alloc_pdir(pdir_size);
        DBG_INIT("%s() pdir %p size %x\n",
-                        __FUNCTION__, ioc->pdir_base, pdir_size);
+                        __func__, ioc->pdir_base, pdir_size);
 #ifdef SBA_HINT_SUPPORT
        /* FIXME : DMA HINTs not used */
@@ -1443,7 +1443,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
 #endif
        DBG_INIT("%s() IOV base 0x%lx mask 0x%0lx\n",
-                __FUNCTION__, ioc->ibase, ioc->imask);
+                __func__, ioc->ibase, ioc->imask);
        /*
        ** FIXME: Hint registers are programmed with default hint
@@ -1470,7 +1470,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
        ioc->ibase = 0; /* used by SBA_IOVA and related macros */       
-        DBG_INIT("%s() DONE\n", __FUNCTION__);
+        DBG_INIT("%s() DONE\n", __func__);
 }
@@ -1544,7 +1544,7 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
        if (!IS_PLUTO(sba_dev->dev)) {
                ioc_ctl = READ_REG(sba_dev->sba_hpa+IOC_CTRL);
                DBG_INIT("%s() hpa 0x%lx ioc_ctl 0x%Lx ->",
-                        __FUNCTION__, sba_dev->sba_hpa, ioc_ctl);
+                        __func__, sba_dev->sba_hpa, ioc_ctl);
                ioc_ctl &= ~(IOC_CTRL_RM | IOC_CTRL_NC | IOC_CTRL_CE);
                ioc_ctl |= IOC_CTRL_DD | IOC_CTRL_D4 | IOC_CTRL_TC;
                        /* j6700 v1.6 firmware sets 0x294f */
@@ -1675,7 +1675,7 @@ sba_common_init(struct sba_device *sba_dev)
                res_size >>= 3;  /* convert bit count to byte count */
                DBG_INIT("%s() res_size 0x%x\n",
-                        __FUNCTION__, res_size);
+                        __func__, res_size);
                sba_dev->ioc[i].res_size = res_size;
                sba_dev->ioc[i].res_map = (char *) __get_free_pages(GFP_KERNEL, get_order(res_size));
@@ -1688,7 +1688,7 @@ sba_common_init(struct sba_device *sba_dev)
                if (NULL == sba_dev->ioc[i].res_map)
                {
                        panic("%s:%s() could not allocate resource map\n",
-                              __FILE__, __FUNCTION__ );
+                              __FILE__, __func__ );
                }
                memset(sba_dev->ioc[i].res_map, 0, res_size);
@@ -1725,7 +1725,7 @@ sba_common_init(struct sba_device *sba_dev)
 #endif
                DBG_INIT("%s() %d res_map %x %p\n",
-                        __FUNCTION__, i, res_size, sba_dev->ioc[i].res_map);
+                        __func__, i, res_size, sba_dev->ioc[i].res_map);
        }
        spin_lock_init(&sba_dev->sba_lock);
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index 813c2c24ab1e..892a83bbe73d 100644
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
@@ -93,7 +93,7 @@ wax_init_chip(struct parisc_device *dev)
        dev->irq = gsc_claim_irq(&gsc_irq, WAX_GSC_IRQ);
        if (dev->irq < 0) {
                printk(KERN_ERR "%s(): cannot get GSC irq\n",
-                                __FUNCTION__);
+                                __func__);
                kfree(wax);
                return -EBUSY;
        }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index f2d9c770f51a..dabb563f51d9 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1503,8 +1503,7 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_f
                    (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
 #ifdef DEBUG
                        dev_dbg(&dev->dev, "calling ");
-                        print_fn_descriptor_symbol("%s()\n",
+                        print_fn_descriptor_symbol("%s\n", f->hook);
-                                (unsigned long) f->hook);
 #endif
                        f->hook(dev);
                }
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index ffdb12a59c40..e2b7de4cb05e 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -331,8 +331,7 @@ void pnp_fixup_device(struct pnp_dev *dev)
                        continue;
 #ifdef DEBUG
                dev_dbg(&dev->dev, "%s: calling ", f->id);
-                print_fn_descriptor_symbol("%s\n",
+                print_fn_descriptor_symbol("%s\n", f->quirk_function);
-                                (unsigned long) f->quirk_function);
 #endif
                f->quirk_function(dev);
        }
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
index 138dd76ee347..af1633eb3b70 100644
--- a/drivers/power/power_supply_core.c
+++ b/drivers/power/power_supply_core.c
@@ -91,15 +91,13 @@ int power_supply_register(struct device *parent, struct power_supply *psy)
 {
        int rc = 0;
-        psy->dev = device_create(power_supply_class, parent, 0,
+        psy->dev = device_create_drvdata(power_supply_class, parent, 0,
-                                 "%s", psy->name);
+                                         psy, "%s", psy->name);
        if (IS_ERR(psy->dev)) {
                rc = PTR_ERR(psy->dev);
                goto dev_create_failed;
        }
-        dev_set_drvdata(psy->dev, psy);
        INIT_WORK(&psy->changed_work, power_supply_changed_work);
        rc = power_supply_create_attrs(psy);
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index ac6d4d3218b3..8ba3f135da22 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -925,6 +925,8 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
        struct dasd_ccw_req *cqr;
        struct dasd_device *device;
+        if (!intparm)
+                return;
        cqr = (struct dasd_ccw_req *) intparm;
        if (cqr->status != DASD_CQR_IN_IO) {
                MESSAGE(KERN_DEBUG,
@@ -976,17 +978,16 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
        if (IS_ERR(irb)) {
                switch (PTR_ERR(irb)) {
                case -EIO:
-                        dasd_handle_killed_request(cdev, intparm);
                        break;
                case -ETIMEDOUT:
                        printk(KERN_WARNING"%s(%s): request timed out\n",
                               __func__, cdev->dev.bus_id);
-                        //FIXME - dasd uses own timeout interface...
                        break;
                default:
                        printk(KERN_WARNING"%s(%s): unknown error %ld\n",
                               __func__, cdev->dev.bus_id, PTR_ERR(irb));
                }
+                dasd_handle_killed_request(cdev, intparm);
                return;
        }
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index f4fb40257348..d774e79476fe 100644
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -86,10 +86,10 @@ static DEFINE_SPINLOCK(dasd_devmap_lock);
 static struct list_head dasd_hashlists[256];
 int dasd_max_devindex;
-static struct dasd_devmap *dasd_add_busid(char *, int);
+static struct dasd_devmap *dasd_add_busid(const char *, int);
 static inline int
-dasd_hash_busid(char *bus_id)
+dasd_hash_busid(const char *bus_id)
 {
        int hash, i;
@@ -394,7 +394,7 @@ dasd_parse(void)
 * devices.
 */
 static struct dasd_devmap *
-dasd_add_busid(char *bus_id, int features)
+dasd_add_busid(const char *bus_id, int features)
 {
        struct dasd_devmap *devmap, *new, *tmp;
        int hash;
@@ -430,7 +430,7 @@ dasd_add_busid(char *bus_id, int features)
 * Find devmap for device with given bus_id.
 */
 static struct dasd_devmap *
-dasd_find_busid(char *bus_id)
+dasd_find_busid(const char *bus_id)
 {
        struct dasd_devmap *devmap, *tmp;
        int hash;
@@ -452,7 +452,7 @@ dasd_find_busid(char *bus_id)
 * Check if busid has been added to the list of dasd ranges.
 */
 int
-dasd_busid_known(char *bus_id)
+dasd_busid_known(const char *bus_id)
 {
        return IS_ERR(dasd_find_busid(bus_id)) ? -ENOENT : 0;
 }
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 6c624bf44617..fb2f931cf844 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -598,7 +598,7 @@ struct dasd_device *dasd_device_from_cdev_locked(struct ccw_device *);
 struct dasd_device *dasd_device_from_devindex(int);
 int dasd_parse(void);
-int dasd_busid_known(char *);
+int dasd_busid_known(const char *);
 /* externals in dasd_gendisk.c */
 int  dasd_gendisk_init(void);
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 7ad8cf157641..76e44eb7c47f 100644
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -76,32 +76,9 @@ const char *tape_op_verbose[TO_SIZE] =
        [TO_KEKL_QUERY] = "KLQ",[TO_RDC] = "RDC",
 };
-static int
+static int devid_to_int(struct ccw_dev_id *dev_id)
-busid_to_int(char *bus_id)
 {
-        int     dec;
+        return dev_id->devno + (dev_id->ssid << 16);
-        int     d;
-        char *  s;
-        for(s = bus_id, d = 0; *s != '\0' && *s != '.'; s++)
-                d = (d * 10) + (*s - '0');
-        dec = d;
-        for(s++, d = 0; *s != '\0' && *s != '.'; s++)
-                d = (d * 10) + (*s - '0');
-        dec = (dec << 8) + d;
-        for(s++; *s != '\0'; s++) {
-                if (*s >= '0' && *s <= '9') {
-                        d = *s - '0';
-                } else if (*s >= 'a' && *s <= 'f') {
-                        d = *s - 'a' + 10;
-                } else {
-                        d = *s - 'A' + 10;
-                }
-                dec = (dec << 4) + d;
-        }
-        return dec;
 }
 /*
@@ -551,6 +528,7 @@ tape_generic_probe(struct ccw_device *cdev)
 {
        struct tape_device *device;
        int ret;
+        struct ccw_dev_id dev_id;
        device = tape_alloc_device();
        if (IS_ERR(device))
@@ -565,7 +543,8 @@ tape_generic_probe(struct ccw_device *cdev)
        cdev->dev.driver_data = device;
        cdev->handler = __tape_do_irq;
        device->cdev = cdev;
-        device->cdev_id = busid_to_int(cdev->dev.bus_id);
+        ccw_device_get_id(cdev, &dev_id);
+        device->cdev_id = devid_to_int(&dev_id);
        PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
        return ret;
 }
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index d364e0bfae12..2c2428cc05d8 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -762,10 +762,10 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
                device_unregister(dev);
                return ret;
        }
-        priv->class_device = device_create(vmlogrdr_class, dev,
+        priv->class_device = device_create_drvdata(vmlogrdr_class, dev,
-                                           MKDEV(vmlogrdr_major,
+                                                   MKDEV(vmlogrdr_major,
-                                                 priv->minor_num),
+                                                         priv->minor_num),
-                                           "%s", dev->bus_id);
+                                                   priv, "%s", dev->bus_id);
        if (IS_ERR(priv->class_device)) {
                ret = PTR_ERR(priv->class_device);
                priv->class_device=NULL;
@@ -773,7 +773,6 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
                device_unregister(dev);
                return ret;
        }
-        dev->driver_data = priv;
        priv->device = dev;
        return 0;
 }
@@ -858,7 +857,7 @@ static int __init vmlogrdr_init(void)
        for (i=0; i < MAXMINOR; ++i ) {
                sys_ser[i].buffer = (char *) get_zeroed_page(GFP_KERNEL);
                if (!sys_ser[i].buffer) {
-                        rc = ENOMEM;
+                        rc = -ENOMEM;
                        break;
                }
                sys_ser[i].current_position = sys_ser[i].buffer;
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 9c21b8f43f9b..a4a5f2efea48 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -19,7 +19,6 @@
 #include <asm/cio.h>
 #include <asm/uaccess.h>
-#include <asm/cio.h>
 #include "blacklist.h"
 #include "cio.h"
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index ba559053402e..5cf7be008e98 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -243,16 +243,10 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)
        /* Setup sense path group id channel program. */
        cdev->private->pgid[0].inf.fc = func;
        ccw = cdev->private->iccws;
-        if (!cdev->private->flags.pgid_single) {
+        if (cdev->private->flags.pgid_single)
-                cdev->private->pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;
-                ccw->cmd_code = CCW_CMD_SUSPEND_RECONN;
-                ccw->cda = 0;
-                ccw->count = 0;
-                ccw->flags = CCW_FLAG_SLI | CCW_FLAG_CC;
-                ccw++;
-        } else
                cdev->private->pgid[0].inf.fc |= SPID_FUNC_SINGLE_PATH;
+        else
+                cdev->private->pgid[0].inf.fc |= SPID_FUNC_MULTI_PATH;
        ccw->cmd_code = CCW_CMD_SET_PGID;
        ccw->cda = (__u32) __pa (&cdev->private->pgid[0]);
        ccw->count = sizeof (struct pgid);
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c
index 47a7e6200b26..9f55ce6f3c78 100644
--- a/drivers/s390/kvm/kvm_virtio.c
+++ b/drivers/s390/kvm/kvm_virtio.c
@@ -78,27 +78,32 @@ static unsigned desc_size(const struct kvm_device_desc *desc)
                + desc->config_len;
 }
-/*
+/* This gets the device's feature bits. */
- * This tests (and acknowleges) a feature bit.
+static u32 kvm_get_features(struct virtio_device *vdev)
- */
-static bool kvm_feature(struct virtio_device *vdev, unsigned fbit)
 {
+        unsigned int i;
+        u32 features = 0;
        struct kvm_device_desc *desc = to_kvmdev(vdev)->desc;
-        u8 *features;
+        u8 *in_features = kvm_vq_features(desc);
-        if (fbit / 8 > desc->feature_len)
+        for (i = 0; i < min(desc->feature_len * 8, 32); i++)
-                return false;
+                if (in_features[i / 8] & (1 << (i % 8)))
+                        features |= (1 << i);
+        return features;
+}
-        features = kvm_vq_features(desc);
+static void kvm_set_features(struct virtio_device *vdev, u32 features)
-        if (!(features[fbit / 8] & (1 << (fbit % 8))))
+{
-                return false;
+        unsigned int i;
+        struct kvm_device_desc *desc = to_kvmdev(vdev)->desc;
+        /* Second half of bitmap is features we accept. */
+        u8 *out_features = kvm_vq_features(desc) + desc->feature_len;
-        /*
+        memset(out_features, 0, desc->feature_len);
-         * We set the matching bit in the other half of the bitmap to tell the
+        for (i = 0; i < min(desc->feature_len * 8, 32); i++) {
-         * Host we want to use this feature.
+                if (features & (1 << i))
-         */
+                        out_features[i / 8] |= (1 << (i % 8));
-        features[desc->feature_len + fbit / 8] |= (1 << (fbit % 8));
+        }
-        return true;
 }
 /*
@@ -221,7 +226,8 @@ static void kvm_del_vq(struct virtqueue *vq)
 * The config ops structure as defined by virtio config
 */
 static struct virtio_config_ops kvm_vq_configspace_ops = {
-        .feature = kvm_feature,
+        .get_features = kvm_get_features,
+        .set_features = kvm_set_features,
        .get = kvm_get,
        .set = kvm_set,
        .get_status = kvm_get_status,
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c
index 75c84d7b9ce8..c4b938bc30d3 100644
--- a/drivers/scsi/ch.c
+++ b/drivers/scsi/ch.c
@@ -910,9 +910,9 @@ static int ch_probe(struct device *dev)
        ch->minor = minor;
        sprintf(ch->name,"ch%d",ch->minor);
-        class_dev = device_create(ch_sysfs_class, dev,
+        class_dev = device_create_drvdata(ch_sysfs_class, dev,
-                                  MKDEV(SCSI_CHANGER_MAJOR,ch->minor),
+                                          MKDEV(SCSI_CHANGER_MAJOR, ch->minor),
-                                  "s%s", ch->name);
+                                          ch, "s%s", ch->name);
        if (IS_ERR(class_dev)) {
                printk(KERN_WARNING "ch%d: device_create failed\n",
                       ch->minor);
@@ -926,7 +926,6 @@ static int ch_probe(struct device *dev)
        if (init)
                ch_init_elem(ch);
-        dev_set_drvdata(dev, ch);
        sdev_printk(KERN_INFO, sd, "Attached scsi changer %s\n", ch->name);
        return 0;
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 31f7aec44d90..243d8becd30f 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5695,13 +5695,12 @@ static int osst_sysfs_add(dev_t dev, struct device *device, struct osst_tape * S
        struct device *osst_member;
        int err;
-        osst_member = device_create(osst_sysfs_class, device, dev, "%s", name);
+        osst_member = device_create_drvdata(osst_sysfs_class, device, dev, STp, "%s", name);
        if (IS_ERR(osst_member)) {
                printk(KERN_WARNING "osst :W: Unable to add sysfs class member %s\n", name);
                return PTR_ERR(osst_member);
        }
-        dev_set_drvdata(osst_member, STp);
        err = device_create_file(osst_member, &dev_attr_ADR_rev);
        if (err)
                goto err_out;
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index c9d7f721b9e2..ea0edd1b2e76 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1441,17 +1441,18 @@ sg_add(struct device *cl_dev, struct class_interface *cl_intf)
        if (sg_sysfs_valid) {
                struct device *sg_class_member;
-                sg_class_member = device_create(sg_sysfs_class, cl_dev->parent,
+                sg_class_member = device_create_drvdata(sg_sysfs_class,
-                                                MKDEV(SCSI_GENERIC_MAJOR,
+                                                        cl_dev->parent,
-                                                      sdp->index),
+                                                        MKDEV(SCSI_GENERIC_MAJOR,
-                                                "%s", disk->disk_name);
+                                                              sdp->index),
+                                                        sdp,
+                                                        "%s", disk->disk_name);
                if (IS_ERR(sg_class_member)) {
                        printk(KERN_ERR "sg_add: "
                               "device_create failed\n");
                        error = PTR_ERR(sg_class_member);
                        goto cdev_add_err;
                }
-                dev_set_drvdata(sg_class_member, sdp);
                error = sysfs_create_link(&scsidp->sdev_gendev.kobj,
                                          &sg_class_member->kobj, "generic");
                if (error)
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index e8db66ad0bde..6e5a5bb31311 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4424,17 +4424,19 @@ static int do_create_class_files(struct scsi_tape *STp, int dev_num, int mode)
                snprintf(name, 10, "%s%s%s", rew ? "n" : "",
                         STp->disk->disk_name, st_formats[i]);
                st_class_member =
-                        device_create(st_sysfs_class, &STp->device->sdev_gendev,
+                        device_create_drvdata(st_sysfs_class,
-                                      MKDEV(SCSI_TAPE_MAJOR,
+                                              &STp->device->sdev_gendev,
-                                                TAPE_MINOR(dev_num, mode, rew)),
+                                              MKDEV(SCSI_TAPE_MAJOR,
-                                      "%s", name);
+                                                    TAPE_MINOR(dev_num,
+                                                              mode, rew)),
+                                              &STp->modes[mode],
+                                              "%s", name);
                if (IS_ERR(st_class_member)) {
                        printk(KERN_WARNING "st%d: device_create failed\n",
                               dev_num);
                        error = PTR_ERR(st_class_member);
                        goto out;
                }
-                dev_set_drvdata(st_class_member, &STp->modes[mode]);
                error = device_create_file(st_class_member,
                                           &dev_attr_defined);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index a1ca9b7bf2d5..1400ea6a2491 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -43,6 +43,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/serial.h>
 #include "8250.h"
@@ -92,8 +93,6 @@ static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
 */
 #define CONFIG_HUB6 1
-#include <asm/serial.h>
 /*
 * SERIAL_PORT_DFNS tells us about built-in ports that have no
 * standard enumeration mechanism.   Platforms that can find all
@@ -1548,6 +1547,8 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
                i->head = &up->list;
                spin_unlock_irq(&i->lock);
+                irq_flags |= SERIAL_EXTRA_IRQ_FLAGS;
                ret = request_irq(up->port.irq, serial8250_interrupt,
                                  irq_flags, "serial", i);
                if (ret < 0)
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index 91bd28f2bb47..a10a40cc0d9e 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -78,3 +78,8 @@ struct serial8250_config {
 #else
 #define ALPHA_KLUDGE_MCR 0
 #endif
+#ifndef SERIAL_EXTRA_IRQ_FLAGS
+#define SERIAL_EXTRA_IRQ_FLAGS 0
+#endif
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 62e6eb136a3c..9bc42763623c 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1361,7 +1361,7 @@ config SERIAL_SC26XX_CONSOLE
 config SERIAL_BFIN_SPORT
        tristate "Blackfin SPORT emulate UART (EXPERIMENTAL)"
-        depends on BFIN && EXPERIMENTAL
+        depends on BLACKFIN && EXPERIMENTAL
        select SERIAL_CORE
        help
          Enble support SPORT emulate UART on Blackfin series.
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 8fdafc27fce8..ce6ee92b3a1b 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -184,15 +184,15 @@ static void put_string(struct sci_port *sci_port, const char *buffer, int count)
                        int h, l;
                        c = *p++;
-                        h = highhex(c);
+                        h = hex_asc_hi(c);
-                        l = lowhex(c);
+                        l = hex_asc_lo(c);
                        put_char(port, h);
                        put_char(port, l);
                        checksum += h + l;
                }
                put_char(port, '#');
-                put_char(port, highhex(checksum));
+                put_char(port, hex_asc_hi(checksum));
-                put_char(port, lowhex(checksum));
+                put_char(port, hex_asc_lo(checksum));
            } while  (get_char(port) != '+');
        } else
 #endif /* CONFIG_SH_STANDARD_BIOS || CONFIG_SH_KGDB */
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 55cc7b80422a..0a12e90ad416 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -649,15 +649,14 @@ int __uio_register_device(struct module *owner,
        if (ret)
                goto err_get_minor;
-        idev->dev = device_create(uio_class->class, parent,
+        idev->dev = device_create_drvdata(uio_class->class, parent,
-                                  MKDEV(uio_major, idev->minor),
+                                          MKDEV(uio_major, idev->minor), idev,
-                                  "uio%d", idev->minor);
+                                          "uio%d", idev->minor);
        if (IS_ERR(idev->dev)) {
                printk(KERN_ERR "UIO: device register failed\n");
                ret = PTR_ERR(idev->dev);
                goto err_device_create;
        }
-        dev_set_drvdata(idev->dev, idev);
        ret = uio_dev_add_attributes(idev);
        if (ret)
diff --git a/drivers/usb/class/Kconfig b/drivers/usb/class/Kconfig
index 3a9102d2591b..66f17ed88cb5 100644
--- a/drivers/usb/class/Kconfig
+++ b/drivers/usb/class/Kconfig
@@ -29,3 +29,14 @@ config USB_PRINTER
          To compile this driver as a module, choose M here: the
          module will be called usblp.
+config USB_WDM
+        tristate "USB Wireless Device Management support"
+        depends on USB
+        ---help---
+          This driver supports the WMC Device Management functionality
+          of cell phones compliant to the CDC WMC specification. You can use
+          AT commands over this device.
+          To compile this driver as a module, choose M here: the
+          module will be called cdc-wdm.
diff --git a/drivers/usb/class/Makefile b/drivers/usb/class/Makefile
index cc391e6c2af8..535d59a30600 100644
--- a/drivers/usb/class/Makefile
+++ b/drivers/usb/class/Makefile
@@ -5,3 +5,4 @@
 obj-$(CONFIG_USB_ACM)           += cdc-acm.o
 obj-$(CONFIG_USB_PRINTER)       += usblp.o
+obj-$(CONFIG_USB_WDM)           += cdc-wdm.o
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
new file mode 100644
index 000000000000..107666d4e2ec
--- /dev/null
+++ b/drivers/usb/class/cdc-wdm.c
@@ -0,0 +1,740 @@
+/*
+ * cdc-wdm.c
+ *
+ * This driver supports USB CDC WCM Device Management.
+ *
+ * Copyright (c) 2007-2008 Oliver Neukum
+ *
+ * Some code taken from cdc-acm.c
+ *
+ * Released under the GPLv2.
+ *
+ * Many thanks to Carl Nordbeck
+ */
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/smp_lock.h>
+#include <linux/mutex.h>
+#include <linux/uaccess.h>
+#include <linux/bitops.h>
+#include <linux/poll.h>
+#include <linux/usb.h>
+#include <linux/usb/cdc.h>
+#include <asm/byteorder.h>
+#include <asm/unaligned.h>
+/*
+ * Version Information
+ */
+#define DRIVER_VERSION "v0.02"
+#define DRIVER_AUTHOR "Oliver Neukum"
+static struct usb_device_id wdm_ids[] = {
+        {
+                .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS |
+                                 USB_DEVICE_ID_MATCH_INT_SUBCLASS,
+                .bInterfaceClass = USB_CLASS_COMM,
+                .bInterfaceSubClass = USB_CDC_SUBCLASS_DMM
+        },
+        { }
+};
+#define WDM_MINOR_BASE  176
+#define WDM_IN_USE              1
+#define WDM_DISCONNECTING       2
+#define WDM_RESULT              3
+#define WDM_READ                4
+#define WDM_INT_STALL           5
+#define WDM_POLL_RUNNING        6
+#define WDM_MAX                 16
+static DEFINE_MUTEX(wdm_mutex);
+/* --- method tables --- */
+struct wdm_device {
+        u8                      *inbuf; /* buffer for response */
+        u8                      *outbuf; /* buffer for command */
+        u8                      *sbuf; /* buffer for status */
+        u8                      *ubuf; /* buffer for copy to user space */
+        struct urb              *command;
+        struct urb              *response;
+        struct urb              *validity;
+        struct usb_interface    *intf;
+        struct usb_ctrlrequest  *orq;
+        struct usb_ctrlrequest  *irq;
+        spinlock_t              iuspin;
+        unsigned long           flags;
+        u16                     bufsize;
+        u16                     wMaxCommand;
+        u16                     wMaxPacketSize;
+        u16                     bMaxPacketSize0;
+        __le16                  inum;
+        int                     reslength;
+        int                     length;
+        int                     read;
+        int                     count;
+        dma_addr_t              shandle;
+        dma_addr_t              ihandle;
+        struct mutex            wlock;
+        struct mutex            rlock;
+        wait_queue_head_t       wait;
+        struct work_struct      rxwork;
+        int                     werr;
+        int                     rerr;
+};
+static struct usb_driver wdm_driver;
+/* --- callbacks --- */
+static void wdm_out_callback(struct urb *urb)
+{
+        struct wdm_device *desc;
+        desc = urb->context;
+        spin_lock(&desc->iuspin);
+        desc->werr = urb->status;
+        spin_unlock(&desc->iuspin);
+        clear_bit(WDM_IN_USE, &desc->flags);
+        kfree(desc->outbuf);
+        wake_up(&desc->wait);
+}
+static void wdm_in_callback(struct urb *urb)
+{
+        struct wdm_device *desc = urb->context;
+        int status = urb->status;
+        spin_lock(&desc->iuspin);
+        if (status) {
+                switch (status) {
+                case -ENOENT:
+                        dev_dbg(&desc->intf->dev,
+                                "nonzero urb status received: -ENOENT");
+                        break;
+                case -ECONNRESET:
+                        dev_dbg(&desc->intf->dev,
+                                "nonzero urb status received: -ECONNRESET");
+                        break;
+                case -ESHUTDOWN:
+                        dev_dbg(&desc->intf->dev,
+                                "nonzero urb status received: -ESHUTDOWN");
+                        break;
+                case -EPIPE:
+                        err("nonzero urb status received: -EPIPE");
+                        break;
+                default:
+                        err("Unexpected error %d", status);
+                        break;
+                }
+        }
+        desc->rerr = status;
+        desc->reslength = urb->actual_length;
+        memmove(desc->ubuf + desc->length, desc->inbuf, desc->reslength);
+        desc->length += desc->reslength;
+        wake_up(&desc->wait);
+        set_bit(WDM_READ, &desc->flags);
+        spin_unlock(&desc->iuspin);
+}
+static void wdm_int_callback(struct urb *urb)
+{
+        int rv = 0;
+        int status = urb->status;
+        struct wdm_device *desc;
+        struct usb_ctrlrequest *req;
+        struct usb_cdc_notification *dr;
+        desc = urb->context;
+        req = desc->irq;
+        dr = (struct usb_cdc_notification *)desc->sbuf;
+        if (status) {
+                switch (status) {
+                case -ESHUTDOWN:
+                case -ENOENT:
+                case -ECONNRESET:
+                        return; /* unplug */
+                case -EPIPE:
+                        set_bit(WDM_INT_STALL, &desc->flags);
+                        err("Stall on int endpoint");
+                        goto sw; /* halt is cleared in work */
+                default:
+                        err("nonzero urb status received: %d", status);
+                        break;
+                }
+        }
+        if (urb->actual_length < sizeof(struct usb_cdc_notification)) {
+                err("wdm_int_callback - %d bytes", urb->actual_length);
+                goto exit;
+        }
+        switch (dr->bNotificationType) {
+        case USB_CDC_NOTIFY_RESPONSE_AVAILABLE:
+                dev_dbg(&desc->intf->dev,
+                        "NOTIFY_RESPONSE_AVAILABLE received: index %d len %d",
+                        dr->wIndex, dr->wLength);
+                break;
+        case USB_CDC_NOTIFY_NETWORK_CONNECTION:
+                dev_dbg(&desc->intf->dev,
+                        "NOTIFY_NETWORK_CONNECTION %s network",
+                        dr->wValue ? "connected to" : "disconnected from");
+                goto exit;
+        default:
+                clear_bit(WDM_POLL_RUNNING, &desc->flags);
+                err("unknown notification %d received: index %d len %d",
+                        dr->bNotificationType, dr->wIndex, dr->wLength);
+                goto exit;
+        }
+        req->bRequestType = (USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE);
+        req->bRequest = USB_CDC_GET_ENCAPSULATED_RESPONSE;
+        req->wValue = 0;
+        req->wIndex = desc->inum;
+        req->wLength = cpu_to_le16(desc->bMaxPacketSize0);
+        usb_fill_control_urb(
+                desc->response,
+                interface_to_usbdev(desc->intf),
+                /* using common endpoint 0 */
+                usb_rcvctrlpipe(interface_to_usbdev(desc->intf), 0),
+                (unsigned char *)req,
+                desc->inbuf,
+                desc->bMaxPacketSize0,
+                wdm_in_callback,
+                desc
+        );
+        desc->response->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+        spin_lock(&desc->iuspin);
+        clear_bit(WDM_READ, &desc->flags);
+        if (!test_bit(WDM_DISCONNECTING, &desc->flags)) {
+                rv = usb_submit_urb(desc->response, GFP_ATOMIC);
+                dev_dbg(&desc->intf->dev, "%s: usb_submit_urb %d",
+                        __func__, rv);
+        }
+        spin_unlock(&desc->iuspin);
+        if (rv < 0) {
+                if (rv == -EPERM)
+                        return;
+                if (rv == -ENOMEM) {
+sw:
+                        rv = schedule_work(&desc->rxwork);
+                        if (rv)
+                                err("Cannot schedule work");
+                }
+        }
+exit:
+        rv = usb_submit_urb(urb, GFP_ATOMIC);
+        if (rv)
+                err("%s - usb_submit_urb failed with result %d",
+                     __func__, rv);
+}
+static void kill_urbs(struct wdm_device *desc)
+{
+        usb_kill_urb(desc->command);
+        usb_kill_urb(desc->validity);
+        usb_kill_urb(desc->response);
+}
+static void free_urbs(struct wdm_device *desc)
+{
+        usb_free_urb(desc->validity);
+        usb_free_urb(desc->response);
+        usb_free_urb(desc->command);
+}
+static void cleanup(struct wdm_device *desc)
+{
+        usb_buffer_free(interface_to_usbdev(desc->intf),
+                        desc->wMaxPacketSize,
+                        desc->sbuf,
+                        desc->validity->transfer_dma);
+        usb_buffer_free(interface_to_usbdev(desc->intf),
+                        desc->wMaxPacketSize,
+                        desc->inbuf,
+                        desc->response->transfer_dma);
+        kfree(desc->orq);
+        kfree(desc->irq);
+        kfree(desc->ubuf);
+        free_urbs(desc);
+        kfree(desc);
+}
+static ssize_t wdm_write
+(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
+{
+        u8 *buf;
+        int rv = -EMSGSIZE, r, we;
+        struct wdm_device *desc = file->private_data;
+        struct usb_ctrlrequest *req;
+        if (count > desc->wMaxCommand)
+                count = desc->wMaxCommand;
+        spin_lock_irq(&desc->iuspin);
+        we = desc->werr;
+        desc->werr = 0;
+        spin_unlock_irq(&desc->iuspin);
+        if (we < 0)
+                return -EIO;
+        r = mutex_lock_interruptible(&desc->wlock); /* concurrent writes */
+        rv = -ERESTARTSYS;
+        if (r)
+                goto outnl;
+        r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
+                                                           &desc->flags));
+        if (r < 0)
+                goto out;
+        if (test_bit(WDM_DISCONNECTING, &desc->flags)) {
+                rv = -ENODEV;
+                goto out;
+        }
+        desc->outbuf = buf = kmalloc(count, GFP_KERNEL);
+        if (!buf) {
+                rv = -ENOMEM;
+                goto out;
+        }
+        r = copy_from_user(buf, buffer, count);
+        if (r > 0) {
+                kfree(buf);
+                rv = -EFAULT;
+                goto out;
+        }
+        req = desc->orq;
+        usb_fill_control_urb(
+                desc->command,
+                interface_to_usbdev(desc->intf),
+                /* using common endpoint 0 */
+                usb_sndctrlpipe(interface_to_usbdev(desc->intf), 0),
+                (unsigned char *)req,
+                buf,
+                count,
+                wdm_out_callback,
+                desc
+        );
+        req->bRequestType = (USB_DIR_OUT | USB_TYPE_CLASS |
+                             USB_RECIP_INTERFACE);
+        req->bRequest = USB_CDC_SEND_ENCAPSULATED_COMMAND;
+        req->wValue = 0;
+        req->wIndex = desc->inum;
+        req->wLength = cpu_to_le16(count);
+        set_bit(WDM_IN_USE, &desc->flags);
+        rv = usb_submit_urb(desc->command, GFP_KERNEL);
+        if (rv < 0) {
+                kfree(buf);
+                clear_bit(WDM_IN_USE, &desc->flags);
+        } else {
+                dev_dbg(&desc->intf->dev, "Tx URB has been submitted index=%d",
+                        req->wIndex);
+        }
+out:
+        mutex_unlock(&desc->wlock);
+outnl:
+        return rv < 0 ? rv : count;
+}
+static ssize_t wdm_read
+(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
+{
+        int rv, cntr;
+        int i = 0;
+        struct wdm_device *desc = file->private_data;
+        rv = mutex_lock_interruptible(&desc->rlock); /*concurrent reads */
+        if (rv < 0)
+                return -ERESTARTSYS;
+        if (desc->length == 0) {
+                desc->read = 0;
+retry:
+                i++;
+                rv = wait_event_interruptible(desc->wait,
+                                              test_bit(WDM_READ, &desc->flags));
+                if (rv < 0) {
+                        rv = -ERESTARTSYS;
+                        goto err;
+                }
+                spin_lock_irq(&desc->iuspin);
+                if (desc->rerr) { /* read completed, error happened */
+                        int t = desc->rerr;
+                        desc->rerr = 0;
+                        spin_unlock_irq(&desc->iuspin);
+                        err("reading had resulted in %d", t);
+                        rv = -EIO;
+                        goto err;
+                }
+                /*
+                 * recheck whether we've lost the race
+                 * against the completion handler
+                 */
+                if (!test_bit(WDM_READ, &desc->flags)) { /* lost race */
+                        spin_unlock_irq(&desc->iuspin);
+                        goto retry;
+                }
+                if (!desc->reslength) { /* zero length read */
+                        spin_unlock_irq(&desc->iuspin);
+                        goto retry;
+                }
+                clear_bit(WDM_READ, &desc->flags);
+                spin_unlock_irq(&desc->iuspin);
+        }
+        cntr = count > desc->length ? desc->length : count;
+        rv = copy_to_user(buffer, desc->ubuf, cntr);
+        if (rv > 0) {
+                rv = -EFAULT;
+                goto err;
+        }
+        for (i = 0; i < desc->length - cntr; i++)
+                desc->ubuf[i] = desc->ubuf[i + cntr];
+        desc->length -= cntr;
+        rv = cntr;
+err:
+        mutex_unlock(&desc->rlock);
+        if (rv < 0)
+                err("wdm_read: exit error");
+        return rv;
+}
+static int wdm_flush(struct file *file, fl_owner_t id)
+{
+        struct wdm_device *desc = file->private_data;
+        wait_event(desc->wait, !test_bit(WDM_IN_USE, &desc->flags));
+        if (desc->werr < 0)
+                err("Error in flush path: %d", desc->werr);
+        return desc->werr;
+}
+static unsigned int wdm_poll(struct file *file, struct poll_table_struct *wait)
+{
+        struct wdm_device *desc = file->private_data;
+        unsigned long flags;
+        unsigned int mask = 0;
+        spin_lock_irqsave(&desc->iuspin, flags);
+        if (test_bit(WDM_DISCONNECTING, &desc->flags)) {
+                mask = POLLERR;
+                spin_unlock_irqrestore(&desc->iuspin, flags);
+                goto desc_out;
+        }
+        if (test_bit(WDM_READ, &desc->flags))
+                mask = POLLIN | POLLRDNORM;
+        if (desc->rerr || desc->werr)
+                mask |= POLLERR;
+        if (!test_bit(WDM_IN_USE, &desc->flags))
+                mask |= POLLOUT | POLLWRNORM;
+        spin_unlock_irqrestore(&desc->iuspin, flags);
+        poll_wait(file, &desc->wait, wait);
+desc_out:
+        return mask;
+}
+static int wdm_open(struct inode *inode, struct file *file)
+{
+        int minor = iminor(inode);
+        int rv = -ENODEV;
+        struct usb_interface *intf;
+        struct wdm_device *desc;
+        mutex_lock(&wdm_mutex);
+        intf = usb_find_interface(&wdm_driver, minor);
+        if (!intf)
+                goto out;
+        desc = usb_get_intfdata(intf);
+        if (test_bit(WDM_DISCONNECTING, &desc->flags))
+                goto out;
+        desc->count++;
+        file->private_data = desc;
+        rv = usb_submit_urb(desc->validity, GFP_KERNEL);
+        if (rv < 0) {
+                desc->count--;
+                err("Error submitting int urb - %d", rv);
+                goto out;
+        }
+        rv = 0;
+out:
+        mutex_unlock(&wdm_mutex);
+        return rv;
+}
+static int wdm_release(struct inode *inode, struct file *file)
+{
+        struct wdm_device *desc = file->private_data;
+        mutex_lock(&wdm_mutex);
+        desc->count--;
+        if (!desc->count) {
+                dev_dbg(&desc->intf->dev, "wdm_release: cleanup");
+                kill_urbs(desc);
+        }
+        mutex_unlock(&wdm_mutex);
+        return 0;
+}
+static const struct file_operations wdm_fops = {
+        .owner =        THIS_MODULE,
+        .read =         wdm_read,
+        .write =        wdm_write,
+        .open =         wdm_open,
+        .flush =        wdm_flush,
+        .release =      wdm_release,
+        .poll =         wdm_poll
+};
+static struct usb_class_driver wdm_class = {
+        .name =         "cdc-wdm%d",
+        .fops =         &wdm_fops,
+        .minor_base =   WDM_MINOR_BASE,
+};
+/* --- error handling --- */
+static void wdm_rxwork(struct work_struct *work)
+{
+        struct wdm_device *desc = container_of(work, struct wdm_device, rxwork);
+        unsigned long flags;
+        int rv;
+        spin_lock_irqsave(&desc->iuspin, flags);
+        if (test_bit(WDM_DISCONNECTING, &desc->flags)) {
+                spin_unlock_irqrestore(&desc->iuspin, flags);
+        } else {
+                spin_unlock_irqrestore(&desc->iuspin, flags);
+                rv = usb_submit_urb(desc->response, GFP_KERNEL);
+                if (rv < 0 && rv != -EPERM) {
+                        spin_lock_irqsave(&desc->iuspin, flags);
+                        if (!test_bit(WDM_DISCONNECTING, &desc->flags))
+                                schedule_work(&desc->rxwork);
+                        spin_unlock_irqrestore(&desc->iuspin, flags);
+                }
+        }
+}
+/* --- hotplug --- */
+static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id)
+{
+        int rv = -EINVAL;
+        struct usb_device *udev = interface_to_usbdev(intf);
+        struct wdm_device *desc;
+        struct usb_host_interface *iface;
+        struct usb_endpoint_descriptor *ep;
+        struct usb_cdc_dmm_desc *dmhd;
+        u8 *buffer = intf->altsetting->extra;
+        int buflen = intf->altsetting->extralen;
+        u16 maxcom = 0;
+        if (!buffer)
+                goto out;
+        while (buflen > 0) {
+                if (buffer [1] != USB_DT_CS_INTERFACE) {
+                        err("skipping garbage");
+                        goto next_desc;
+                }
+                switch (buffer [2]) {
+                case USB_CDC_HEADER_TYPE:
+                        break;
+                case USB_CDC_DMM_TYPE:
+                        dmhd = (struct usb_cdc_dmm_desc *)buffer;
+                        maxcom = le16_to_cpu(dmhd->wMaxCommand);
+                        dev_dbg(&intf->dev,
+                                "Finding maximum buffer length: %d", maxcom);
+                        break;
+                default:
+                        err("Ignoring extra header, type %d, length %d",
+                                buffer[2], buffer[0]);
+                        break;
+                }
+next_desc:
+                buflen -= buffer[0];
+                buffer += buffer[0];
+        }
+        rv = -ENOMEM;
+        desc = kzalloc(sizeof(struct wdm_device), GFP_KERNEL);
+        if (!desc)
+                goto out;
+        mutex_init(&desc->wlock);
+        mutex_init(&desc->rlock);
+        spin_lock_init(&desc->iuspin);
+        init_waitqueue_head(&desc->wait);
+        desc->wMaxCommand = maxcom;
+        desc->inum = cpu_to_le16((u16)intf->cur_altsetting->desc.bInterfaceNumber);
+        desc->intf = intf;
+        INIT_WORK(&desc->rxwork, wdm_rxwork);
+        iface = &intf->altsetting[0];
+        ep = &iface->endpoint[0].desc;
+        if (!usb_endpoint_is_int_in(ep)) {
+                rv = -EINVAL;
+                goto err;
+        }
+        desc->wMaxPacketSize = ep->wMaxPacketSize;
+        desc->bMaxPacketSize0 = cpu_to_le16(udev->descriptor.bMaxPacketSize0);
+        desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
+        if (!desc->orq)
+                goto err;
+        desc->irq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
+        if (!desc->irq)
+                goto err;
+        desc->validity = usb_alloc_urb(0, GFP_KERNEL);
+        if (!desc->validity)
+                goto err;
+        desc->response = usb_alloc_urb(0, GFP_KERNEL);
+        if (!desc->response)
+                goto err;
+        desc->command = usb_alloc_urb(0, GFP_KERNEL);
+        if (!desc->command)
+                goto err;
+        desc->ubuf = kmalloc(desc->wMaxCommand, GFP_KERNEL);
+        if (!desc->ubuf)
+                goto err;
+        desc->sbuf = usb_buffer_alloc(interface_to_usbdev(intf),
+                                        desc->wMaxPacketSize,
+                                        GFP_KERNEL,
+                                        &desc->validity->transfer_dma);
+        if (!desc->sbuf)
+                goto err;
+        desc->inbuf = usb_buffer_alloc(interface_to_usbdev(intf),
+                                        desc->bMaxPacketSize0,
+                                        GFP_KERNEL,
+                                        &desc->response->transfer_dma);
+        if (!desc->inbuf)
+                goto err2;
+        usb_fill_int_urb(
+                desc->validity,
+                interface_to_usbdev(intf),
+                usb_rcvintpipe(interface_to_usbdev(intf), ep->bEndpointAddress),
+                desc->sbuf,
+                desc->wMaxPacketSize,
+                wdm_int_callback,
+                desc,
+                ep->bInterval
+        );
+        desc->validity->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
+        usb_set_intfdata(intf, desc);
+        rv = usb_register_dev(intf, &wdm_class);
+        dev_info(&intf->dev, "cdc-wdm%d: USB WDM device\n",
+                 intf->minor - WDM_MINOR_BASE);
+        if (rv < 0)
+                goto err;
+out:
+        return rv;
+err2:
+        usb_buffer_free(interface_to_usbdev(desc->intf),
+                        desc->wMaxPacketSize,
+                        desc->sbuf,
+                        desc->validity->transfer_dma);
+err:
+        free_urbs(desc);
+        kfree(desc->ubuf);
+        kfree(desc->orq);
+        kfree(desc->irq);
+        kfree(desc);
+        return rv;
+}
+static void wdm_disconnect(struct usb_interface *intf)
+{
+        struct wdm_device *desc;
+        unsigned long flags;
+        usb_deregister_dev(intf, &wdm_class);
+        mutex_lock(&wdm_mutex);
+        desc = usb_get_intfdata(intf);
+        /* the spinlock makes sure no new urbs are generated in the callbacks */
+        spin_lock_irqsave(&desc->iuspin, flags);
+        set_bit(WDM_DISCONNECTING, &desc->flags);
+        set_bit(WDM_READ, &desc->flags);
+        clear_bit(WDM_IN_USE, &desc->flags);
+        spin_unlock_irqrestore(&desc->iuspin, flags);
+        cancel_work_sync(&desc->rxwork);
+        kill_urbs(desc);
+        wake_up_all(&desc->wait);
+        if (!desc->count)
+                cleanup(desc);
+        mutex_unlock(&wdm_mutex);
+}
+static struct usb_driver wdm_driver = {
+        .name =         "cdc_wdm",
+        .probe =        wdm_probe,
+        .disconnect =   wdm_disconnect,
+        .id_table =     wdm_ids,
+};
+/* --- low level module stuff --- */
+static int __init wdm_init(void)
+{
+        int rv;
+        rv = usb_register(&wdm_driver);
+        return rv;
+}
+static void __exit wdm_exit(void)
+{
+        usb_deregister(&wdm_driver);
+}
+module_init(wdm_init);
+module_exit(wdm_exit);
+MODULE_AUTHOR(DRIVER_AUTHOR);
+MODULE_DESCRIPTION("USB Abstract Control Model driver for "
+                   "USB WCM Device Management");
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index bf10e9c4195e..09a53e7f3327 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -818,12 +818,12 @@ static int usb_register_bus(struct usb_bus *bus)
        set_bit (busnum, busmap.busmap);
        bus->busnum = busnum;
-        bus->dev = device_create(usb_host_class, bus->controller, MKDEV(0, 0),
+        bus->dev = device_create_drvdata(usb_host_class, bus->controller,
-                                 "usb_host%d", busnum);
+                                         MKDEV(0, 0), bus,
+                                         "usb_host%d", busnum);
        result = PTR_ERR(bus->dev);
        if (IS_ERR(bus->dev))
                goto error_create_class_dev;
-        dev_set_drvdata(bus->dev, bus);
        /* Add it to the local list of buses */
        list_add (&bus->bus_list, &usb_bus_list);
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 499b7a23f351..e02bfd4df3a6 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1526,7 +1526,8 @@ static void udc_disable(struct pxa_udc *udc)
        ep0_idle(udc);
        udc->gadget.speed = USB_SPEED_UNKNOWN;
-        udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
+        if (udc->mach->udc_command)
+                udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
 }
 /**
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index d187d0313742..3adfda813a7b 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -115,6 +115,8 @@ static int ehci_orion_setup(struct usb_hcd *hcd)
        if (retval)
                return retval;
+        hcd->has_tt = 1;
        ehci_reset(ehci);
        ehci_port_power(ehci, 0);
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c
index 24230c638b8e..4cfa25b0f44e 100644
--- a/drivers/usb/misc/phidgetkit.c
+++ b/drivers/usb/misc/phidgetkit.c
@@ -595,14 +595,14 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic
        } while(value);
        kit->dev_no = bit;
-        kit->dev = device_create(phidget_class, &kit->udev->dev, 0,
+        kit->dev = device_create_drvdata(phidget_class, &kit->udev->dev,
-                        "interfacekit%d", kit->dev_no);
+                                        MKDEV(0, 0), kit,
+                                        "interfacekit%d", kit->dev_no);
        if (IS_ERR(kit->dev)) {
                rc = PTR_ERR(kit->dev);
                kit->dev = NULL;
                goto out;
        }
-        dev_set_drvdata(kit->dev, kit);
        if (usb_submit_urb(kit->irq, GFP_KERNEL)) {
                rc = -EIO;
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index f0113c17cc5a..9b4696f21b22 100644
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -365,16 +365,15 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic
        } while(value);
        mc->dev_no = bit;
-        mc->dev = device_create(phidget_class, &mc->udev->dev, 0,
+        mc->dev = device_create_drvdata(phidget_class, &mc->udev->dev,
-                                "motorcontrol%d", mc->dev_no);
+                                        MKDEV(0, 0), mc,
+                                        "motorcontrol%d", mc->dev_no);
        if (IS_ERR(mc->dev)) {
                rc = PTR_ERR(mc->dev);
                mc->dev = NULL;
                goto out;
        }
-        dev_set_drvdata(mc->dev, mc);
        if (usb_submit_urb(mc->irq, GFP_KERNEL)) {
                rc = -EIO;
                goto out;
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 7d590c09434a..1ca7ddb41d4d 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -275,14 +275,14 @@ servo_probe(struct usb_interface *interface, const struct usb_device_id *id)
        } while (value);
        dev->dev_no = bit;
-        dev->dev = device_create(phidget_class, &dev->udev->dev, 0,
+        dev->dev = device_create_drvdata(phidget_class, &dev->udev->dev,
-                                 "servo%d", dev->dev_no);
+                                         MKDEV(0, 0), dev,
+                                         "servo%d", dev->dev_no);
        if (IS_ERR(dev->dev)) {
                rc = PTR_ERR(dev->dev);
                dev->dev = NULL;
                goto out;
        }
-        dev_set_drvdata(dev->dev, dev);
        servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1;
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index ba28fdc9ccd2..1f7c86bd8297 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -28,6 +28,7 @@ static int debug;
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(0x4348, 0x5523) },
+        { USB_DEVICE(0x1a86, 0x7523) },
        { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 5b349ece7247..3cee6feac174 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -374,6 +374,7 @@ static struct usb_device_id id_table_combined [] = {
                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
        { USB_DEVICE(FTDI_VID, FTDI_OOCDLINK_PID),
                .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+        { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
        { },                                    /* Optional parameter entry */
        { }                                     /* Terminating entry */
 };
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index 504edf8c3a3f..a72f2c81d664 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -592,6 +592,12 @@
 #define FIC_NEO1973_DEBUG_PID   0x5118
 /*
+ * RATOC REX-USB60F
+ */
+#define RATOC_VENDOR_ID         0x0584
+#define RATOC_PRODUCT_ID_USB60F 0xb020
+/*
 *   BmRequestType:  1100 0000b
 *   bRequest:       FTDI_E2_READ
 *   wValue:         0
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index e7e016e60333..6cecd2c12b1d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -183,6 +183,7 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define AXESSTEL_PRODUCT_MV110H                 0x1000
 #define ONDA_VENDOR_ID                          0x19d2
+#define ONDA_PRODUCT_MSA501HS                   0x0001
 #define ONDA_PRODUCT_ET502HS                    0x0002
 #define BANDRICH_VENDOR_ID                      0x1A8D
@@ -196,6 +197,9 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define MAXON_VENDOR_ID                         0x16d8
+#define TELIT_VENDOR_ID                         0x1bc7
+#define TELIT_PRODUCT_UC864E                    0x1003
 static struct usb_device_id option_ids[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -297,13 +301,14 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },
        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
        { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },
+        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) },
        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) },
        { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
        { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
        { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
        { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
        { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
-        { USB_DEVICE(0x19d2, 0x0001) },         /* Telstra NextG CDMA */
+        { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
        { } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index c605fb68f807..234c5eea95a2 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -66,7 +66,6 @@ static struct usb_device_id id_table [] = {
        { USB_DEVICE(ITEGNO_VENDOR_ID, ITEGNO_PRODUCT_ID_2080) },
        { USB_DEVICE(MA620_VENDOR_ID, MA620_PRODUCT_ID) },
        { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID) },
-        { USB_DEVICE(RATOC_VENDOR_ID, RATOC_PRODUCT_ID_USB60F) },
        { USB_DEVICE(TRIPP_VENDOR_ID, TRIPP_PRODUCT_ID) },
        { USB_DEVICE(RADIOSHACK_VENDOR_ID, RADIOSHACK_PRODUCT_ID) },
        { USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) },
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 10cf872e5ecb..3bdefe020501 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -36,7 +36,6 @@
 #define RATOC_VENDOR_ID         0x0584
 #define RATOC_PRODUCT_ID        0xb000
-#define RATOC_PRODUCT_ID_USB60F 0xb020
 #define TRIPP_VENDOR_ID         0x2478
 #define TRIPP_PRODUCT_ID        0x2008
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 2cdaf1ff8315..002b61b4f0f6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -627,11 +627,9 @@ config FB_MAC
        select FB_CFB_IMAGEBLIT
        select FB_MACMODES
-#      bool '  Apple DAFB display support' CONFIG_FB_DAFB
 config FB_HP300
        bool
-        depends on (FB = y) && HP300
+        depends on (FB = y) && DIO
-        select FB_CFB_FILLRECT
        select FB_CFB_IMAGEBLIT
        default y
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index e6492c1048bf..05a328c11a8b 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -2261,7 +2261,7 @@ int __init amifb_init(void)
        amifb_setup(option);
 #endif
        if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
-                return -ENXIO;
+                return -ENODEV;
        /*
         * We request all registers starting from bplpt[0]
@@ -2333,7 +2333,7 @@ default_chipset:
                        strcat(fb_info.fix.id, "Unknown");
                        goto default_chipset;
 #else /* CONFIG_FB_AMIGA_OCS */
-                        err = -ENXIO;
+                        err = -ENODEV;
                        goto amifb_error;
 #endif /* CONFIG_FB_AMIGA_OCS */
                        break;
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
index 35477177bef4..6ef800bdf482 100644
--- a/drivers/video/display/display-sysfs.c
+++ b/drivers/video/display/display-sysfs.c
@@ -26,6 +26,7 @@
 #include <linux/ctype.h>
 #include <linux/idr.h>
 #include <linux/err.h>
+#include <linux/kdev_t.h>
 static ssize_t display_show_name(struct device *dev,
                                struct device_attribute *attr, char *buf)
@@ -152,10 +153,13 @@ struct display_device *display_device_register(struct display_driver *driver,
                mutex_unlock(&allocated_dsp_lock);
                if (!ret) {
-                        new_dev->dev = device_create(display_class, parent, 0,
+                        new_dev->dev = device_create_drvdata(display_class,
-                                                "display%d", new_dev->idx);
+                                                             parent,
+                                                             MKDEV(0,0),
+                                                             new_dev,
+                                                             "display%d",
+                                                             new_dev->idx);
                        if (!IS_ERR(new_dev->dev)) {
-                                dev_set_drvdata(new_dev->dev, new_dev);
                                new_dev->parent = parent;
                                new_dev->driver = driver;
                                mutex_init(&new_dev->lock);
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c
index b083ea7e9c69..606da043f4b4 100644
--- a/drivers/video/dnfb.c
+++ b/drivers/video/dnfb.c
@@ -284,6 +284,9 @@ int __init dnfb_init(void)
 {
        int ret;
+        if (!MACH_IS_APOLLO)
+                return -ENODEV;
        if (fb_get_options("dnfb", NULL))
                return -ENODEV;
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c
index 2eb4fb159084..b8ebff1e8493 100644
--- a/drivers/video/hpfb.c
+++ b/drivers/video/hpfb.c
@@ -382,7 +382,7 @@ int __init hpfb_init(void)
 #define INTFBPADDR 0x560000
        if (!MACH_IS_HP300)
-                return -ENXIO;
+                return -ENODEV;
        if (fb_get_options("hpfb", NULL))
                return -ENODEV;
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 48aea39c35a5..3ee314beacc1 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -355,9 +355,8 @@ static int pxafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
        }
 #ifdef CONFIG_CPU_FREQ
-        pr_debug("pxafb: dma period = %d ps, clock = %d kHz\n",
+        pr_debug("pxafb: dma period = %d ps\n",
-                 pxafb_display_dma_period(var),
+                 pxafb_display_dma_period(var));
-                 get_clk_frequency_khz(0));
 #endif
        return 0;