184 files changed, 1965 insertions, 1954 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index d3f0a62efcc1..ee68ac54c0d4 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -138,7 +138,7 @@ static struct dmi_system_id __cpuinitdata processor_idle_dmi_table[] = {
        {
        set_no_mwait, "Extensa 5220", {
        DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
-        DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
+        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
        DMI_MATCH(DMI_PRODUCT_VERSION, "0100"),
        DMI_MATCH(DMI_BOARD_NAME, "Columbia") }, NULL},
        {},
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index ef3e5522e1a4..c729e6988bbb 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -486,6 +486,8 @@ static const struct pci_device_id ahci_pci_tbl[] = {
        { PCI_VDEVICE(INTEL, 0x502b), board_ahci }, /* Tolapai */
        { PCI_VDEVICE(INTEL, 0x3a05), board_ahci }, /* ICH10 */
        { PCI_VDEVICE(INTEL, 0x3a25), board_ahci }, /* ICH10 */
+        { PCI_VDEVICE(INTEL, 0x3b24), board_ahci }, /* PCH RAID */
+        { PCI_VDEVICE(INTEL, 0x3b2b), board_ahci }, /* PCH RAID */
        /* JMicron 360/1/3/5/6, match class to avoid IDE function */
        { PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
@@ -575,9 +577,9 @@ static const struct pci_device_id ahci_pci_tbl[] = {
        { PCI_VDEVICE(NVIDIA, 0x0bc7), board_ahci },            /* MCP7B */
        /* SiS */
-        { PCI_VDEVICE(SI, 0x1184), board_ahci_nopmp },          /* SiS 966 */
+        { PCI_VDEVICE(SI, 0x1184), board_ahci },                /* SiS 966 */
-        { PCI_VDEVICE(SI, 0x1185), board_ahci_nopmp },          /* SiS 968 */
+        { PCI_VDEVICE(SI, 0x1185), board_ahci },                /* SiS 968 */
-        { PCI_VDEVICE(SI, 0x0186), board_ahci_nopmp },          /* SiS 968 */
+        { PCI_VDEVICE(SI, 0x0186), board_ahci },                /* SiS 968 */
        /* Marvell */
        { PCI_VDEVICE(MARVELL, 0x6145), board_ahci_mv },        /* 6145 */
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index c294121fd69e..b1d08a8f5003 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -275,6 +275,14 @@ static const struct pci_device_id piix_pci_tbl[] = {
        { 0x8086, 0x3a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
        /* SATA Controller IDE (ICH10) */
        { 0x8086, 0x3a26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+        /* SATA Controller IDE (PCH) */
+        { 0x8086, 0x3b20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
+        /* SATA Controller IDE (PCH) */
+        { 0x8086, 0x3b26, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+        /* SATA Controller IDE (PCH) */
+        { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
+        /* SATA Controller IDE (PCH) */
+        { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata },
        { }     /* terminate list */
 };
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 5ba96c5052c8..79e3a8e7a84a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -104,6 +104,7 @@ struct ata_force_param {
        unsigned long   xfer_mask;
        unsigned int    horkage_on;
        unsigned int    horkage_off;
+        unsigned int    lflags;
 };
 struct ata_force_ent {
@@ -196,22 +197,23 @@ void ata_force_cbl(struct ata_port *ap)
 }
 /**
- *      ata_force_spd_limit - force SATA spd limit according to libata.force
+ *      ata_force_link_limits - force link limits according to libata.force
 *      @link: ATA link of interest
 *
- *      Force SATA spd limit according to libata.force and whine about
+ *      Force link flags and SATA spd limit according to libata.force
- *      it.  When only the port part is specified (e.g. 1:), the limit
+ *      and whine about it.  When only the port part is specified
- *      applies to all links connected to both the host link and all
+ *      (e.g. 1:), the limit applies to all links connected to both
- *      fan-out ports connected via PMP.  If the device part is
+ *      the host link and all fan-out ports connected via PMP.  If the
- *      specified as 0 (e.g. 1.00:), it specifies the first fan-out
+ *      device part is specified as 0 (e.g. 1.00:), it specifies the
- *      link not the host link.  Device number 15 always points to the
+ *      first fan-out link not the host link.  Device number 15 always
- *      host link whether PMP is attached or not.
+ *      points to the host link whether PMP is attached or not.
 *
 *      LOCKING:
 *      EH context.
 */
-static void ata_force_spd_limit(struct ata_link *link)
+static void ata_force_link_limits(struct ata_link *link)
 {
+        bool did_spd = false;
        int linkno, i;
        if (ata_is_host_link(link))
@@ -228,13 +230,22 @@ static void ata_force_spd_limit(struct ata_link *link)
                if (fe->device != -1 && fe->device != linkno)
                        continue;
-                if (!fe->param.spd_limit)
+                /* only honor the first spd limit */
-                        continue;
+                if (!did_spd && fe->param.spd_limit) {
+                        link->hw_sata_spd_limit = (1 << fe->param.spd_limit) - 1;
+                        ata_link_printk(link, KERN_NOTICE,
+                                        "FORCE: PHY spd limit set to %s\n",
+                                        fe->param.name);
+                        did_spd = true;
+                }
-                link->hw_sata_spd_limit = (1 << fe->param.spd_limit) - 1;
+                /* let lflags stack */
-                ata_link_printk(link, KERN_NOTICE,
+                if (fe->param.lflags) {
-                        "FORCE: PHY spd limit set to %s\n", fe->param.name);
+                        link->flags |= fe->param.lflags;
-                return;
+                        ata_link_printk(link, KERN_NOTICE,
+                                        "FORCE: link flag 0x%x forced -> 0x%x\n",
+                                        fe->param.lflags, link->flags);
+                }
        }
 }
@@ -3277,7 +3288,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
                dev->dma_mode = ata_xfer_mask2mode(dma_mask);
                found = 1;
-                if (dev->dma_mode != 0xff)
+                if (ata_dma_enabled(dev))
                        used_dma = 1;
        }
        if (!found)
@@ -3302,7 +3313,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
        /* step 3: set host DMA timings */
        ata_link_for_each_dev(dev, link) {
-                if (!ata_dev_enabled(dev) || dev->dma_mode == 0xff)
+                if (!ata_dev_enabled(dev) || !ata_dma_enabled(dev))
                        continue;
                dev->xfer_mode = dev->dma_mode;
@@ -5188,19 +5199,18 @@ void ata_link_init(struct ata_port *ap, struct ata_link *link, int pmp)
 */
 int sata_link_init_spd(struct ata_link *link)
 {
-        u32 scontrol;
        u8 spd;
        int rc;
-        rc = sata_scr_read(link, SCR_CONTROL, &scontrol);
+        rc = sata_scr_read(link, SCR_CONTROL, &link->saved_scontrol);
        if (rc)
                return rc;
-        spd = (scontrol >> 4) & 0xf;
+        spd = (link->saved_scontrol >> 4) & 0xf;
        if (spd)
                link->hw_sata_spd_limit &= (1 << spd) - 1;
-        ata_force_spd_limit(link);
+        ata_force_link_limits(link);
        link->sata_spd_limit = link->hw_sata_spd_limit;
@@ -5783,9 +5793,10 @@ static void ata_port_detach(struct ata_port *ap)
        ata_port_wait_eh(ap);
        /* EH is now guaranteed to see UNLOADING - EH context belongs
-         * to us.  Disable all existing devices.
+         * to us.  Restore SControl and disable all existing devices.
         */
-        ata_port_for_each_link(link, ap) {
+        __ata_port_for_each_link(link, ap) {
+                sata_scr_write(link, SCR_CONTROL, link->saved_scontrol);
                ata_link_for_each_dev(dev, link)
                        ata_dev_disable(dev);
        }
@@ -5991,6 +6002,9 @@ static int __init ata_parse_force_one(char **cur,
                { "udma133",    .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 6) },
                { "udma/133",   .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 6) },
                { "udma7",      .xfer_mask      = 1 << (ATA_SHIFT_UDMA + 7) },
+                { "nohrst",     .lflags         = ATA_LFLAG_NO_HRST },
+                { "nosrst",     .lflags         = ATA_LFLAG_NO_SRST },
+                { "norst",      .lflags         = ATA_LFLAG_NO_HRST | ATA_LFLAG_NO_SRST },
        };
        char *start = *cur, *p = *cur;
        char *id, *val, *endp;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 58bdc538d229..c1db2f234d2e 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2040,7 +2040,7 @@ static void ata_eh_link_report(struct ata_link *link)
        }
        if (ehc->i.serror)
-                ata_port_printk(ap, KERN_ERR,
+                ata_link_printk(link, KERN_ERR,
                  "SError: { %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s}\n",
                  ehc->i.serror & SERR_DATA_RECOVERED ? "RecovData " : "",
                  ehc->i.serror & SERR_COMM_RECOVERED ? "RecovComm " : "",
@@ -2171,18 +2171,12 @@ static int ata_do_reset(struct ata_link *link, ata_reset_fn_t reset,
 }
 static int ata_eh_followup_srst_needed(struct ata_link *link,
-                                       int rc, int classify,
+                                       int rc, const unsigned int *classes)
-                                       const unsigned int *classes)
 {
        if ((link->flags & ATA_LFLAG_NO_SRST) || ata_link_offline(link))
                return 0;
-        if (rc == -EAGAIN) {
+        if (rc == -EAGAIN)
-                if (classify)
+                return 1;
-                        return 1;
-                rc = 0;
-        }
-        if (rc != 0)
-                return 0;
        if (sata_pmp_supported(link->ap) && ata_is_host_link(link))
                return 1;
        return 0;
@@ -2210,6 +2204,10 @@ int ata_eh_reset(struct ata_link *link, int classify,
         */
        while (ata_eh_reset_timeouts[max_tries] != ULONG_MAX)
                max_tries++;
+        if (link->flags & ATA_LFLAG_NO_HRST)
+                hardreset = NULL;
+        if (link->flags & ATA_LFLAG_NO_SRST)
+                softreset = NULL;
        now = jiffies;
        deadline = ata_deadline(ehc->last_reset, ATA_EH_RESET_COOL_DOWN);
@@ -2247,10 +2245,10 @@ int ata_eh_reset(struct ata_link *link, int classify,
        ehc->i.action &= ~ATA_EH_RESET;
        if (hardreset) {
                reset = hardreset;
-                ehc->i.action = ATA_EH_HARDRESET;
+                ehc->i.action |= ATA_EH_HARDRESET;
        } else if (softreset) {
                reset = softreset;
-                ehc->i.action = ATA_EH_SOFTRESET;
+                ehc->i.action |= ATA_EH_SOFTRESET;
        }
        if (prereset) {
@@ -2305,9 +2303,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
                        ehc->i.flags |= ATA_EHI_DID_SOFTRESET;
                rc = ata_do_reset(link, reset, classes, deadline);
+                if (rc && rc != -EAGAIN)
+                        goto fail;
                if (reset == hardreset &&
-                    ata_eh_followup_srst_needed(link, rc, classify, classes)) {
+                    ata_eh_followup_srst_needed(link, rc, classes)) {
                        /* okay, let's do follow-up softreset */
                        reset = softreset;
@@ -2322,10 +2322,6 @@ int ata_eh_reset(struct ata_link *link, int classify,
                        ata_eh_about_to_do(link, NULL, ATA_EH_RESET);
                        rc = ata_do_reset(link, reset, classes, deadline);
                }
-                /* -EAGAIN can happen if we skipped followup SRST */
-                if (rc && rc != -EAGAIN)
-                        goto fail;
        } else {
                if (verbose)
                        ata_link_printk(link, KERN_INFO, "no reset method "
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index fbe605711554..eb919c16a03e 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -181,7 +181,7 @@ static unsigned int pacpi_qc_issue(struct ata_queued_cmd *qc)
        if (adev != acpi->last) {
                pacpi_set_piomode(ap, adev);
-                if (adev->dma_mode)
+                if (ata_dma_enabled(adev))
                        pacpi_set_dmamode(ap, adev);
                acpi->last = adev;
        }
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index d7de7baf58a8..e8a0d99d7356 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -183,7 +183,7 @@ static void atiixp_bmdma_start(struct ata_queued_cmd *qc)
        u16 tmp16;
        pci_read_config_word(pdev, ATIIXP_IDE_UDMA_CONTROL, &tmp16);
-        if (adev->dma_mode >= XFER_UDMA_0)
+        if (ata_using_udma(adev))
                tmp16 |= (1 << dn);
        else
                tmp16 &= ~(1 << dn);
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 744beebaaf49..0c4b271a9d5a 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -149,10 +149,10 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc)
        struct ata_device *prev = ap->private_data;
        /* See if the DMA settings could be wrong */
-        if (adev->dma_mode != 0 && adev != prev && prev != NULL) {
+        if (ata_dma_enabled(adev) && adev != prev && prev != NULL) {
                /* Maybe, but do the channels match MWDMA/UDMA ? */
-                if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) ||
+                if ((ata_using_udma(adev) && !ata_using_udma(prev)) ||
-                    (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0))
+                    (ata_using_udma(prev) && !ata_using_udma(adev)))
                        /* Switch the mode bits */
                        cs5530_set_dmamode(ap, adev);
        }
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 27843c70eb9d..0221c9a46769 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -606,7 +606,7 @@ static void it821x_display_disk(int n, u8 *buf)
 {
        unsigned char id[41];
        int mode = 0;
-        char *mtype;
+        char *mtype = "";
        char mbuf[8];
        char *cbl = "(40 wire cable)";
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index e678af383d13..df64f2443001 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -198,7 +198,7 @@ static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)
        if (adev != ap->private_data) {
                oldpiix_set_piomode(ap, adev);
-                if (adev->dma_mode)
+                if (ata_dma_enabled(adev))
                        oldpiix_set_dmamode(ap, adev);
        }
        return ata_sff_qc_issue(qc);
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index cbab397e3db7..0278fd2b8fb1 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -167,10 +167,10 @@ static unsigned int sc1200_qc_issue(struct ata_queued_cmd *qc)
        struct ata_device *prev = ap->private_data;
        /* See if the DMA settings could be wrong */
-        if (adev->dma_mode != 0 && adev != prev && prev != NULL) {
+        if (ata_dma_enabled(adev) && adev != prev && prev != NULL) {
                /* Maybe, but do the channels match MWDMA/UDMA ? */
-                if ((adev->dma_mode >= XFER_UDMA_0 && prev->dma_mode < XFER_UDMA_0) ||
+                if ((ata_using_udma(adev) && !ata_using_udma(prev)) ||
-                    (adev->dma_mode < XFER_UDMA_0 && prev->dma_mode >= XFER_UDMA_0))
+                    (ata_using_udma(prev) && !ata_using_udma(adev)))
                        /* Switch the mode bits */
                        sc1200_set_dmamode(ap, adev);
        }
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 57d951b11f2d..8fdb2ce73210 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -324,62 +324,26 @@ static void via_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 }
 /**
- *      via_ata_sff_tf_load - send taskfile registers to host controller
+ *      via_tf_load - send taskfile registers to host controller
 *      @ap: Port to which output is sent
 *      @tf: ATA taskfile register set
 *
 *      Outputs ATA taskfile to standard ATA host controller.
 *
 *      Note: This is to fix the internal bug of via chipsets, which
- *  will reset the device register after changing the IEN bit on
+ *      will reset the device register after changing the IEN bit on
- *  ctl register
+ *      ctl register
 */
-static void via_ata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
+static void via_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
 {
-        struct ata_ioports *ioaddr = &ap->ioaddr;
+        struct ata_taskfile tmp_tf;
-        unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
-        if (tf->ctl != ap->last_ctl) {
-                iowrite8(tf->ctl, ioaddr->ctl_addr);
-                iowrite8(tf->device, ioaddr->device_addr);
-                ap->last_ctl = tf->ctl;
-                ata_wait_idle(ap);
-        }
-        if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
-                iowrite8(tf->hob_feature, ioaddr->feature_addr);
-                iowrite8(tf->hob_nsect, ioaddr->nsect_addr);
-                iowrite8(tf->hob_lbal, ioaddr->lbal_addr);
-                iowrite8(tf->hob_lbam, ioaddr->lbam_addr);
-                iowrite8(tf->hob_lbah, ioaddr->lbah_addr);
-                VPRINTK("hob: feat 0x%X nsect 0x%X, lba 0x%X 0x%X 0x%X\n",
-                        tf->hob_feature,
-                        tf->hob_nsect,
-                        tf->hob_lbal,
-                        tf->hob_lbam,
-                        tf->hob_lbah);
-        }
-        if (is_addr) {
+        if (ap->ctl != ap->last_ctl && !(tf->flags & ATA_TFLAG_DEVICE)) {
-                iowrite8(tf->feature, ioaddr->feature_addr);
+                tmp_tf = *tf;
-                iowrite8(tf->nsect, ioaddr->nsect_addr);
+                tmp_tf.flags |= ATA_TFLAG_DEVICE;
-                iowrite8(tf->lbal, ioaddr->lbal_addr);
+                tf = &tmp_tf;
-                iowrite8(tf->lbam, ioaddr->lbam_addr);
-                iowrite8(tf->lbah, ioaddr->lbah_addr);
-                VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n",
-                        tf->feature,
-                        tf->nsect,
-                        tf->lbal,
-                        tf->lbam,
-                        tf->lbah);
        }
+        ata_sff_tf_load(ap, tf);
-        if (tf->flags & ATA_TFLAG_DEVICE) {
-                iowrite8(tf->device, ioaddr->device_addr);
-                VPRINTK("device 0x%X\n", tf->device);
-        }
-        ata_wait_idle(ap);
 }
 static struct scsi_host_template via_sht = {
@@ -392,13 +356,12 @@ static struct ata_port_operations via_port_ops = {
        .set_piomode    = via_set_piomode,
        .set_dmamode    = via_set_dmamode,
        .prereset       = via_pre_reset,
-        .sff_tf_load = via_ata_tf_load,
+        .sff_tf_load    = via_tf_load,
 };
 static struct ata_port_operations via_port_ops_noirq = {
        .inherits       = &via_port_ops,
        .sff_data_xfer  = ata_sff_data_xfer_noirq,
-        .sff_tf_load = via_ata_tf_load,
 };
 /**
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index ad169ffbc4cb..13c1d2af18ac 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1134,30 +1134,16 @@ static int mv_qc_defer(struct ata_queued_cmd *qc)
        if (ap->nr_active_links == 0)
                return 0;
-        if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
+        /*
-                /*
+         * The port is operating in host queuing mode (EDMA) with NCQ
-                 * The port is operating in host queuing mode (EDMA).
+         * enabled, allow multiple NCQ commands.  EDMA also allows
-                 * It can accomodate a new qc if the qc protocol
+         * queueing multiple DMA commands but libata core currently
-                 * is compatible with the current host queue mode.
+         * doesn't allow it.
-                 */
+         */
-                if (pp->pp_flags & MV_PP_FLAG_NCQ_EN) {
+        if ((pp->pp_flags & MV_PP_FLAG_EDMA_EN) &&
-                        /*
+            (pp->pp_flags & MV_PP_FLAG_NCQ_EN) && ata_is_ncq(qc->tf.protocol))
-                         * The host queue (EDMA) is in NCQ mode.
+                return 0;
-                         * If the new qc is also an NCQ command,
-                         * then allow the new qc.
-                         */
-                        if (qc->tf.protocol == ATA_PROT_NCQ)
-                                return 0;
-                } else {
-                        /*
-                         * The host queue (EDMA) is in non-NCQ, DMA mode.
-                         * If the new qc is also a non-NCQ, DMA command,
-                         * then allow the new qc.
-                         */
-                        if (qc->tf.protocol == ATA_PROT_DMA)
-                                return 0;
-                }
-        }
        return ATA_DEFER_PORT;
 }
@@ -3036,7 +3022,8 @@ static int mv_chip_id(struct ata_host *host, unsigned int board_idx)
                break;
        case chip_soc:
                hpriv->ops = &mv_soc_ops;
-                hp_flags |= MV_HP_FLAG_SOC | MV_HP_ERRATA_60X1C0;
+                hp_flags |= MV_HP_FLAG_SOC | MV_HP_GEN_IIE |
+                        MV_HP_ERRATA_60X1C0;
                break;
        default:
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
index 2ebd07f2ef81..5effec6f5458 100644
--- a/drivers/atm/adummy.c
+++ b/drivers/atm/adummy.c
@@ -3,7 +3,6 @@
 */
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/skbuff.h>
 #include <linux/errno.h>
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 5667c2f02c51..cc5e28c8885c 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -295,6 +295,12 @@ int class_for_each_device(struct class *class, struct device *start,
        if (!class)
                return -EINVAL;
+        if (!class->p) {
+                WARN(1, "%s called for class '%s' before it was initialized",
+                     __func__, class->name);
+                return -EINVAL;
+        }
        mutex_lock(&class->p->class_mutex);
        list_for_each_entry(dev, &class->p->class_devices, node) {
                if (start) {
@@ -344,6 +350,11 @@ struct device *class_find_device(struct class *class, struct device *start,
        if (!class)
                return NULL;
+        if (!class->p) {
+                WARN(1, "%s called for class '%s' before it was initialized",
+                     __func__, class->name);
+                return NULL;
+        }
        mutex_lock(&class->p->class_mutex);
        list_for_each_entry(dev, &class->p->class_devices, node) {
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 068aa1c9538c..d021c98605b3 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -53,7 +53,7 @@ static inline int device_is_not_partition(struct device *dev)
 * it is attached to.  If it is not attached to a bus either, an empty
 * string will be returned.
 */
-const char *dev_driver_string(struct device *dev)
+const char *dev_driver_string(const struct device *dev)
 {
        return dev->driver ? dev->driver->name :
                        (dev->bus ? dev->bus->name :
@@ -541,6 +541,7 @@ void device_initialize(struct device *dev)
        spin_lock_init(&dev->devres_lock);
        INIT_LIST_HEAD(&dev->devres_head);
        device_init_wakeup(dev, 0);
+        device_pm_init(dev);
        set_dev_node(dev, -1);
 }
@@ -843,13 +844,19 @@ int device_add(struct device *dev)
 {
        struct device *parent = NULL;
        struct class_interface *class_intf;
-        int error;
+        int error = -EINVAL;
        dev = get_device(dev);
-        if (!dev || !strlen(dev->bus_id)) {
+        if (!dev)
-                error = -EINVAL;
+                goto done;
-                goto Done;
-        }
+        /* Temporarily support init_name if it is set.
+         * It will override bus_id for now */
+        if (dev->init_name)
+                dev_set_name(dev, "%s", dev->init_name);
+        if (!strlen(dev->bus_id))
+                goto done;
        pr_debug("device: '%s': %s\n", dev->bus_id, __func__);
@@ -897,9 +904,10 @@ int device_add(struct device *dev)
        error = bus_add_device(dev);
        if (error)
                goto BusError;
-        error = device_pm_add(dev);
+        error = dpm_sysfs_add(dev);
        if (error)
-                goto PMError;
+                goto DPMError;
+        device_pm_add(dev);
        kobject_uevent(&dev->kobj, KOBJ_ADD);
        bus_attach_device(dev);
        if (parent)
@@ -917,10 +925,10 @@ int device_add(struct device *dev)
                                class_intf->add_dev(dev, class_intf);
                mutex_unlock(&dev->class->p->class_mutex);
        }
- Done:
+done:
        put_device(dev);
        return error;
- PMError:
+ DPMError:
        bus_remove_device(dev);
 BusError:
        if (dev->bus)
@@ -944,7 +952,7 @@ int device_add(struct device *dev)
        cleanup_device_parent(dev);
        if (parent)
                put_device(parent);
-        goto Done;
+        goto done;
 }
 /**
@@ -1007,6 +1015,7 @@ void device_del(struct device *dev)
        struct class_interface *class_intf;
        device_pm_remove(dev);
+        dpm_sysfs_remove(dev);
        if (parent)
                klist_del(&dev->knode_parent);
        if (MAJOR(dev->devt)) {
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 2ef5acf4368b..1e2bda780e48 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -16,9 +16,6 @@
 #include <linux/string.h>
 #include "base.h"
-#define to_dev(node) container_of(node, struct device, driver_list)
 static struct device *next_device(struct klist_iter *i)
 {
        struct klist_node *n = klist_next(i);
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 3250c5257b74..273a944d4040 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -67,20 +67,16 @@ void device_pm_unlock(void)
 *      device_pm_add - add a device to the list of active devices
 *      @dev:   Device to be added to the list
 */
-int device_pm_add(struct device *dev)
+void device_pm_add(struct device *dev)
 {
-        int error;
        pr_debug("PM: Adding info for %s:%s\n",
                 dev->bus ? dev->bus->name : "No Bus",
                 kobject_name(&dev->kobj));
        mutex_lock(&dpm_list_mtx);
        if (dev->parent) {
-                if (dev->parent->power.status >= DPM_SUSPENDING) {
+                if (dev->parent->power.status >= DPM_SUSPENDING)
-                        dev_warn(dev, "parent %s is sleeping, will not add\n",
+                        dev_warn(dev, "parent %s should not be sleeping\n",
                                dev->parent->bus_id);
-                        WARN_ON(true);
-                }
        } else if (transition_started) {
                /*
                 * We refuse to register parentless devices while a PM
@@ -89,13 +85,9 @@ int device_pm_add(struct device *dev)
                 */
                WARN_ON(true);
        }
-        error = dpm_sysfs_add(dev);
-        if (!error) {
+        list_add_tail(&dev->power.entry, &dpm_list);
-                dev->power.status = DPM_ON;
-                list_add_tail(&dev->power.entry, &dpm_list);
-        }
        mutex_unlock(&dpm_list_mtx);
-        return error;
 }
 /**
@@ -110,7 +102,6 @@ void device_pm_remove(struct device *dev)
                 dev->bus ? dev->bus->name : "No Bus",
                 kobject_name(&dev->kobj));
        mutex_lock(&dpm_list_mtx);
-        dpm_sysfs_remove(dev);
        list_del_init(&dev->power.entry);
        mutex_unlock(&dpm_list_mtx);
 }
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index a3252c0e2887..41f51fae042f 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,3 +1,8 @@
+static inline void device_pm_init(struct device *dev)
+{
+        dev->power.status = DPM_ON;
+}
 #ifdef CONFIG_PM_SLEEP
 /*
@@ -11,12 +16,12 @@ static inline struct device *to_device(struct list_head *entry)
        return container_of(entry, struct device, power.entry);
 }
-extern int device_pm_add(struct device *);
+extern void device_pm_add(struct device *);
 extern void device_pm_remove(struct device *);
 #else /* CONFIG_PM_SLEEP */
-static inline int device_pm_add(struct device *dev) { return 0; }
+static inline void device_pm_add(struct device *dev) {}
 static inline void device_pm_remove(struct device *dev) {}
 #endif
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 158eed4d5161..29b7a648cc6e 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -49,7 +49,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
 #include <linux/file.h>
@@ -2798,14 +2797,9 @@ out_mem:
        return ret;
 }
-static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static int pkt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct pktcdvd_device *pd = inode->i_bdev->bd_disk->private_data;
-        struct pktcdvd_device *pd;
-        long ret;
-        lock_kernel();
-        pd = inode->i_bdev->bd_disk->private_data;
        VPRINTK("pkt_ioctl: cmd %x, dev %d:%d\n", cmd, imajor(inode), iminor(inode));
@@ -2818,8 +2812,7 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case CDROM_LAST_WRITTEN:
        case CDROM_SEND_PACKET:
        case SCSI_IOCTL_SEND_COMMAND:
-                ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+                return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
-                break;
        case CDROMEJECT:
                /*
@@ -2828,15 +2821,14 @@ static long pkt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                 */
                if (pd->refcnt == 1)
                        pkt_lock_door(pd, 0);
-                ret = blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
+                return blkdev_ioctl(pd->bdev->bd_inode, file, cmd, arg);
-                break;
        default:
                VPRINTK(DRIVER_NAME": Unknown ioctl for %s (%x)\n", pd->name, cmd);
-                ret = -ENOTTY;
+                return -ENOTTY;
        }
-        unlock_kernel();
-        return ret;
+        return 0;
 }
 static int pkt_media_changed(struct gendisk *disk)
@@ -2858,7 +2850,7 @@ static struct block_device_operations pktcdvd_ops = {
        .owner =                THIS_MODULE,
        .open =                 pkt_open,
        .release =              pkt_close,
-        .unlocked_ioctl =       pkt_ioctl,
+        .ioctl =                pkt_ioctl,
        .media_changed =        pkt_media_changed,
 };
@@ -3023,8 +3015,7 @@ static void pkt_get_status(struct pkt_ctrl_command *ctrl_cmd)
        mutex_unlock(&ctl_mutex);
 }
-static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,
+static int pkt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg)
-                                                unsigned long arg)
 {
        void __user *argp = (void __user *)arg;
        struct pkt_ctrl_command ctrl_cmd;
@@ -3041,22 +3032,16 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,
        case PKT_CTRL_CMD_SETUP:
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
-                lock_kernel();
                ret = pkt_setup_dev(new_decode_dev(ctrl_cmd.dev), &pkt_dev);
                ctrl_cmd.pkt_dev = new_encode_dev(pkt_dev);
-                unlock_kernel();
                break;
        case PKT_CTRL_CMD_TEARDOWN:
                if (!capable(CAP_SYS_ADMIN))
                        return -EPERM;
-                lock_kernel();
                ret = pkt_remove_dev(new_decode_dev(ctrl_cmd.pkt_dev));
-                unlock_kernel();
                break;
        case PKT_CTRL_CMD_STATUS:
-                lock_kernel();
                pkt_get_status(&ctrl_cmd);
-                unlock_kernel();
                break;
        default:
                return -ENOTTY;
@@ -3069,7 +3054,7 @@ static long pkt_ctl_ioctl(struct file *file, unsigned int cmd,
 static const struct file_operations pkt_ctl_fops = {
-        .unlocked_ioctl  = pkt_ctl_ioctl,
+        .ioctl   = pkt_ctl_ioctl,
        .owner   = THIS_MODULE,
 };
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 1838aa3d24fe..7ce1ac4baa6d 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -407,7 +407,7 @@ struct entropy_store {
        /* read-write data: */
        spinlock_t lock;
        unsigned add_ptr;
-        int entropy_count;
+        int entropy_count;      /* Must at no time exceed ->POOLBITS! */
        int input_rotate;
 };
@@ -520,6 +520,7 @@ static void mix_pool_bytes(struct entropy_store *r, const void *in, int bytes)
 static void credit_entropy_bits(struct entropy_store *r, int nbits)
 {
        unsigned long flags;
+        int entropy_count;
        if (!nbits)
                return;
@@ -527,20 +528,20 @@ static void credit_entropy_bits(struct entropy_store *r, int nbits)
        spin_lock_irqsave(&r->lock, flags);
        DEBUG_ENT("added %d entropy credits to %s\n", nbits, r->name);
-        r->entropy_count += nbits;
+        entropy_count = r->entropy_count;
-        if (r->entropy_count < 0) {
+        entropy_count += nbits;
+        if (entropy_count < 0) {
                DEBUG_ENT("negative entropy/overflow\n");
-                r->entropy_count = 0;
+                entropy_count = 0;
-        } else if (r->entropy_count > r->poolinfo->POOLBITS)
+        } else if (entropy_count > r->poolinfo->POOLBITS)
-                r->entropy_count = r->poolinfo->POOLBITS;
+                entropy_count = r->poolinfo->POOLBITS;
+        r->entropy_count = entropy_count;
        /* should we wake readers? */
-        if (r == &input_pool &&
+        if (r == &input_pool && entropy_count >= random_read_wakeup_thresh) {
-            r->entropy_count >= random_read_wakeup_thresh) {
                wake_up_interruptible(&random_read_wait);
                kill_fasync(&fasync, SIGIO, POLL_IN);
        }
        spin_unlock_irqrestore(&r->lock, flags);
 }
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index a27160ba21d7..daeb8f766971 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2498,7 +2498,7 @@ static int tiocgwinsz(struct tty_struct *tty, struct winsize __user *arg)
 /**
 *      tty_do_resize           -       resize event
 *      @tty: tty being resized
- *      @real_tty: real tty (if using a pty/tty pair)
+ *      @real_tty: real tty (not the same as tty if using a pty/tty pair)
 *      @rows: rows (character)
 *      @cols: cols (character)
 *
@@ -2512,7 +2512,8 @@ int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,
        struct pid *pgrp, *rpgrp;
        unsigned long flags;
-        mutex_lock(&tty->termios_mutex);
+        /* For a PTY we need to lock the tty side */
+        mutex_lock(&real_tty->termios_mutex);
        if (!memcmp(ws, &tty->winsize, sizeof(*ws)))
                goto done;
        /* Get the PID values and reference them so we can
@@ -2533,7 +2534,7 @@ int tty_do_resize(struct tty_struct *tty, struct tty_struct *real_tty,
        tty->winsize = *ws;
        real_tty->winsize = *ws;
 done:
-        mutex_unlock(&tty->termios_mutex);
+        mutex_unlock(&real_tty->termios_mutex);
        return 0;
 }
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index ea9fc5d03b99..bf34e4597421 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -937,12 +937,14 @@ int tty_mode_ioctl(struct tty_struct *tty, struct file *file,
                        return 0;
 #endif
        case TIOCGSOFTCAR:
-                return put_user(C_CLOCAL(tty) ? 1 : 0,
+                /* FIXME: for correctness we may need to take the termios
+                   lock here - review */
+                return put_user(C_CLOCAL(real_tty) ? 1 : 0,
                                                (int __user *)arg);
        case TIOCSSOFTCAR:
                if (get_user(arg, (unsigned int __user *) arg))
                        return -EFAULT;
-                return tty_change_softcar(tty, arg);
+                return tty_change_softcar(real_tty, arg);
        default:
                return -ENOIOCTLCMD;
        }
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h
index c5b1840906b2..8b0252bf06e2 100644
--- a/drivers/char/xilinx_hwicap/buffer_icap.h
+++ b/drivers/char/xilinx_hwicap/buffer_icap.h
@@ -38,7 +38,6 @@
 #include <linux/types.h>
 #include <linux/cdev.h>
-#include <linux/version.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h
index ffabd3ba2bd8..62bda453c90b 100644
--- a/drivers/char/xilinx_hwicap/fifo_icap.h
+++ b/drivers/char/xilinx_hwicap/fifo_icap.h
@@ -38,7 +38,6 @@
 #include <linux/types.h>
 #include <linux/cdev.h>
-#include <linux/version.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
index 1f9c8b082dbe..24d0d9b938fb 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -38,7 +38,6 @@
 #include <linux/types.h>
 #include <linux/cdev.h>
-#include <linux/version.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index b27b13c5eb5a..4b55ec607a88 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -34,7 +34,6 @@
 #include <linux/platform_device.h>
 #include <linux/sysdev.h>
 #include <linux/workqueue.h>
-#include <linux/version.h>
 #define EDAC_MC_LABEL_LEN       31
 #define EDAC_DEVICE_NAME_LEN    31
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 8024e3bfd877..b91ef63126ed 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -669,8 +669,7 @@ static int __init ibft_register_kobjects(struct ibft_table_header *header,
        control = (void *)header + sizeof(*header);
        end = (void *)control + control->hdr.length;
-        eot_offset = (void *)header + header->length -
+        eot_offset = (void *)header + header->length - (void *)control;
-                     (void *)control - sizeof(*header);
        rc = ibft_verify_hdr("control", (struct ibft_hdr *)control, id_control,
                             sizeof(*control));
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 089c015c01d1..53f0e5af1cc8 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -400,27 +400,31 @@ static void drm_locked_tasklet_func(unsigned long data)
 {
        struct drm_device *dev = (struct drm_device *)data;
        unsigned long irqflags;
+        void (*tasklet_func)(struct drm_device *);
+        
        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
+        tasklet_func = dev->locked_tasklet_func;
+        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
-        if (!dev->locked_tasklet_func ||
+        if (!tasklet_func ||
            !drm_lock_take(&dev->lock,
                           DRM_KERNEL_CONTEXT)) {
-                spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
                return;
        }
        dev->lock.lock_time = jiffies;
        atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
-        dev->locked_tasklet_func(dev);
+        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
+        tasklet_func = dev->locked_tasklet_func;
+        dev->locked_tasklet_func = NULL;
+        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
+        
+        if (tasklet_func != NULL)
+                tasklet_func(dev);
        drm_lock_free(&dev->lock,
                      DRM_KERNEL_CONTEXT);
-        dev->locked_tasklet_func = NULL;
-        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
 }
 /**
diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
index 0998723cde79..a4caf95485d7 100644
--- a/drivers/gpu/drm/drm_lock.c
+++ b/drivers/gpu/drm/drm_lock.c
@@ -105,14 +105,19 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                  ret ? "interrupted" : "has lock");
        if (ret) return ret;
-        sigemptyset(&dev->sigmask);
+        /* don't set the block all signals on the master process for now 
-        sigaddset(&dev->sigmask, SIGSTOP);
+         * really probably not the correct answer but lets us debug xkb
-        sigaddset(&dev->sigmask, SIGTSTP);
+         * xserver for now */
-        sigaddset(&dev->sigmask, SIGTTIN);
+        if (!file_priv->master) {
-        sigaddset(&dev->sigmask, SIGTTOU);
+                sigemptyset(&dev->sigmask);
-        dev->sigdata.context = lock->context;
+                sigaddset(&dev->sigmask, SIGSTOP);
-        dev->sigdata.lock = dev->lock.hw_lock;
+                sigaddset(&dev->sigmask, SIGTSTP);
-        block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
+                sigaddset(&dev->sigmask, SIGTTIN);
+                sigaddset(&dev->sigmask, SIGTTOU);
+                dev->sigdata.context = lock->context;
+                dev->sigdata.lock = dev->lock.hw_lock;
+                block_all_signals(drm_notifier, &dev->sigdata, &dev->sigmask);
+        }
        if (dev->driver->dma_ready && (lock->flags & _DRM_LOCK_READY))
                dev->driver->dma_ready(dev);
@@ -150,6 +155,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
 {
        struct drm_lock *lock = data;
        unsigned long irqflags;
+        void (*tasklet_func)(struct drm_device *);
        if (lock->context == DRM_KERNEL_CONTEXT) {
                DRM_ERROR("Process %d using kernel context %d\n",
@@ -158,14 +164,11 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
        }
        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
+        tasklet_func = dev->locked_tasklet_func;
-        if (dev->locked_tasklet_func) {
+        dev->locked_tasklet_func = NULL;
-                dev->locked_tasklet_func(dev);
-                dev->locked_tasklet_func = NULL;
-        }
        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
+        if (tasklet_func != NULL)
+                tasklet_func(dev);
        atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
diff --git a/drivers/gpu/drm/radeon/r300_cmdbuf.c b/drivers/gpu/drm/radeon/r300_cmdbuf.c
index 702df45320f7..4b27d9abb7bc 100644
--- a/drivers/gpu/drm/radeon/r300_cmdbuf.c
+++ b/drivers/gpu/drm/radeon/r300_cmdbuf.c
@@ -77,6 +77,9 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
                                return -EFAULT;
                        }
+                        box.x2--; /* Hardware expects inclusive bottom-right corner */
+                        box.y2--;
                        if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RV515) {
                                box.x1 = (box.x1) &
                                        R300_CLIPRECT_MASK;
@@ -95,8 +98,8 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
                                        R300_CLIPRECT_MASK;
                                box.y2 = (box.y2 + R300_CLIPRECT_OFFSET) &
                                        R300_CLIPRECT_MASK;
                        }
                        OUT_RING((box.x1 << R300_CLIPRECT_X_SHIFT) |
                                 (box.y1 << R300_CLIPRECT_Y_SHIFT));
                        OUT_RING((box.x2 << R300_CLIPRECT_X_SHIFT) |
@@ -136,6 +139,18 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
                ADVANCE_RING();
        }
+        /* flus cache and wait idle clean after cliprect change */
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(R300_RB3D_DC_FLUSH);
+        ADVANCE_RING();
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+        ADVANCE_RING();
+        /* set flush flag */
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED;
        return 0;
 }
@@ -166,13 +181,13 @@ void r300_init_reg_flags(struct drm_device *dev)
        ADD_RANGE(0x21DC, 1);
        ADD_RANGE(R300_VAP_UNKNOWN_221C, 1);
        ADD_RANGE(R300_VAP_CLIP_X_0, 4);
-        ADD_RANGE(R300_VAP_PVS_WAITIDLE, 1);
+        ADD_RANGE(R300_VAP_PVS_STATE_FLUSH_REG, 1);
        ADD_RANGE(R300_VAP_UNKNOWN_2288, 1);
        ADD_RANGE(R300_VAP_OUTPUT_VTX_FMT_0, 2);
        ADD_RANGE(R300_VAP_PVS_CNTL_1, 3);
        ADD_RANGE(R300_GB_ENABLE, 1);
        ADD_RANGE(R300_GB_MSPOS0, 5);
-        ADD_RANGE(R300_TX_CNTL, 1);
+        ADD_RANGE(R300_TX_INVALTAGS, 1);
        ADD_RANGE(R300_TX_ENABLE, 1);
        ADD_RANGE(0x4200, 4);
        ADD_RANGE(0x4214, 1);
@@ -388,15 +403,28 @@ static __inline__ int r300_emit_vpu(drm_radeon_private_t *dev_priv,
        if (sz * 16 > cmdbuf->bufsz)
                return -EINVAL;
-        BEGIN_RING(5 + sz * 4);
+        /* VAP is very sensitive so we purge cache before we program it
-        /* Wait for VAP to come to senses.. */
+         * and we also flush its state before & after */
-        /* there is no need to emit it multiple times, (only once before VAP is programmed,
+        BEGIN_RING(6);
-           but this optimization is for later */
+        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
-        OUT_RING_REG(R300_VAP_PVS_WAITIDLE, 0);
+        OUT_RING(R300_RB3D_DC_FLUSH);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+        OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0));
+        OUT_RING(0);
+        ADVANCE_RING();
+        /* set flush flag */
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED;
+        BEGIN_RING(3 + sz * 4);
        OUT_RING_REG(R300_VAP_PVS_UPLOAD_ADDRESS, addr);
        OUT_RING(CP_PACKET0_TABLE(R300_VAP_PVS_UPLOAD_DATA, sz * 4 - 1));
        OUT_RING_TABLE((int *)cmdbuf->buf, sz * 4);
+        ADVANCE_RING();
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_VAP_PVS_STATE_FLUSH_REG, 0));
+        OUT_RING(0);
        ADVANCE_RING();
        cmdbuf->buf += sz * 16;
@@ -424,6 +452,15 @@ static __inline__ int r300_emit_clear(drm_radeon_private_t *dev_priv,
        OUT_RING_TABLE((int *)cmdbuf->buf, 8);
        ADVANCE_RING();
+        BEGIN_RING(4);
+        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(R300_RB3D_DC_FLUSH);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+        ADVANCE_RING();
+        /* set flush flag */
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED;
        cmdbuf->buf += 8 * 4;
        cmdbuf->bufsz -= 8 * 4;
@@ -543,22 +580,23 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
        return 0;
 }
-static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
+static __inline__ int r300_emit_draw_indx_2(drm_radeon_private_t *dev_priv,
-                                             drm_radeon_kcmd_buffer_t *cmdbuf)
+                                            drm_radeon_kcmd_buffer_t *cmdbuf)
 {
-        u32 *cmd = (u32 *) cmdbuf->buf;
+        u32 *cmd;
-        int count, ret;
+        int count;
+        int expected_count;
        RING_LOCALS;
-        count=(cmd[0]>>16) & 0x3fff;
+        cmd = (u32 *) cmdbuf->buf;
+        count = (cmd[0]>>16) & 0x3fff;
+        expected_count = cmd[1] >> 16;
+        if (!(cmd[1] & R300_VAP_VF_CNTL__INDEX_SIZE_32bit))
+                expected_count = (expected_count+1)/2;
-        if ((cmd[1] & 0x8000ffff) != 0x80000810) {
+        if (count && count != expected_count) {
-                DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
+                DRM_ERROR("3D_DRAW_INDX_2: packet size %i, expected %i\n",
-                return -EINVAL;
+                        count, expected_count);
-        }
-        ret = !radeon_check_offset(dev_priv, cmd[2]);
-        if (ret) {
-                DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
                return -EINVAL;
        }
@@ -570,6 +608,50 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
        cmdbuf->buf += (count+2)*4;
        cmdbuf->bufsz -= (count+2)*4;
+        if (!count) {
+                drm_r300_cmd_header_t header;
+                if (cmdbuf->bufsz < 4*4 + sizeof(header)) {
+                        DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER, but stream is too short.\n");
+                        return -EINVAL;
+                }
+                header.u = *(unsigned int *)cmdbuf->buf;
+                cmdbuf->buf += sizeof(header);
+                cmdbuf->bufsz -= sizeof(header);
+                cmd = (u32 *) cmdbuf->buf;
+                if (header.header.cmd_type != R300_CMD_PACKET3 ||
+                    header.packet3.packet != R300_CMD_PACKET3_RAW ||
+                    cmd[0] != CP_PACKET3(RADEON_CP_INDX_BUFFER, 2)) {
+                        DRM_ERROR("3D_DRAW_INDX_2: expect subsequent INDX_BUFFER.\n");
+                        return -EINVAL;
+                }
+                if ((cmd[1] & 0x8000ffff) != 0x80000810) {
+                        DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
+                        return -EINVAL;
+                }
+                if (!radeon_check_offset(dev_priv, cmd[2])) {
+                        DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
+                        return -EINVAL;
+                }
+                if (cmd[3] != expected_count) {
+                        DRM_ERROR("INDX_BUFFER: buffer size %i, expected %i\n",
+                                cmd[3], expected_count);
+                        return -EINVAL;
+                }
+                BEGIN_RING(4);
+                OUT_RING(cmd[0]);
+                OUT_RING_TABLE((int *)(cmdbuf->buf + 4), 3);
+                ADVANCE_RING();
+                cmdbuf->buf += 4*4;
+                cmdbuf->bufsz -= 4*4;
+        }
        return 0;
 }
@@ -613,11 +695,22 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,
        case RADEON_CNTL_BITBLT_MULTI:
                return r300_emit_bitblt_multi(dev_priv, cmdbuf);
-        case RADEON_CP_INDX_BUFFER:     /* DRAW_INDX_2 without INDX_BUFFER seems to lock up the gpu */
+        case RADEON_CP_INDX_BUFFER:
-                return r300_emit_indx_buffer(dev_priv, cmdbuf);
+                DRM_ERROR("packet3 INDX_BUFFER without preceding 3D_DRAW_INDX_2 is illegal.\n");
-        case RADEON_CP_3D_DRAW_IMMD_2:  /* triggers drawing using in-packet vertex data */
+                return -EINVAL;
-        case RADEON_CP_3D_DRAW_VBUF_2:  /* triggers drawing of vertex buffers setup elsewhere */
+        case RADEON_CP_3D_DRAW_IMMD_2:
-        case RADEON_CP_3D_DRAW_INDX_2:  /* triggers drawing using indices to vertex buffer */
+                /* triggers drawing using in-packet vertex data */
+        case RADEON_CP_3D_DRAW_VBUF_2:
+                /* triggers drawing of vertex buffers setup elsewhere */
+                dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED |
+                                           RADEON_PURGE_EMITED);
+                break;
+        case RADEON_CP_3D_DRAW_INDX_2:
+                /* triggers drawing using indices to vertex buffer */
+                /* whenever we send vertex we clear flush & purge */
+                dev_priv->track_flush &= ~(RADEON_FLUSH_EMITED |
+                                           RADEON_PURGE_EMITED);
+                return r300_emit_draw_indx_2(dev_priv, cmdbuf);
        case RADEON_WAIT_FOR_IDLE:
        case RADEON_CP_NOP:
                /* these packets are safe */
@@ -713,17 +806,53 @@ static __inline__ int r300_emit_packet3(drm_radeon_private_t *dev_priv,
 */
 static __inline__ void r300_pacify(drm_radeon_private_t *dev_priv)
 {
+        uint32_t cache_z, cache_3d, cache_2d;
        RING_LOCALS;
-        BEGIN_RING(6);
+        cache_z = R300_ZC_FLUSH;
-        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        cache_2d = R300_RB2D_DC_FLUSH;
-        OUT_RING(R300_RB3D_DSTCACHE_UNKNOWN_0A);
+        cache_3d = R300_RB3D_DC_FLUSH;
+        if (!(dev_priv->track_flush & RADEON_PURGE_EMITED)) {
+                /* we can purge, primitive where draw since last purge */
+                cache_z |= R300_ZC_FREE;
+                cache_2d |= R300_RB2D_DC_FREE;
+                cache_3d |= R300_RB3D_DC_FREE;
+        }
+        /* flush & purge zbuffer */
+        BEGIN_RING(2);
        OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0));
-        OUT_RING(R300_ZB_ZCACHE_CTLSTAT_ZC_FLUSH_FLUSH_AND_FREE|
+        OUT_RING(cache_z);
-                 R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE);
+        ADVANCE_RING();
-        OUT_RING(CP_PACKET3(RADEON_CP_NOP, 0));
+        /* flush & purge 3d */
-        OUT_RING(0x0);
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(cache_3d);
+        ADVANCE_RING();
+        /* flush & purge texture */
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_TX_INVALTAGS, 0));
+        OUT_RING(0);
+        ADVANCE_RING();
+        /* FIXME: is this one really needed ? */
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(R300_RB3D_AARESOLVE_CTL, 0));
+        OUT_RING(0);
+        ADVANCE_RING();
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_3D_IDLECLEAN);
+        ADVANCE_RING();
+        /* flush & purge 2d through E2 as RB2D will trigger lockup */
+        BEGIN_RING(4);
+        OUT_RING(CP_PACKET0(R300_DSTCACHE_CTLSTAT, 0));
+        OUT_RING(cache_2d);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(RADEON_WAIT_2D_IDLECLEAN |
+                 RADEON_WAIT_HOST_IDLECLEAN);
        ADVANCE_RING();
+        /* set flush & purge flags */
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED;
 }
 /**
@@ -905,8 +1034,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
        DRM_DEBUG("\n");
-        /* See the comment above r300_emit_begin3d for why this call must be here,
+        /* pacify */
-         * and what the cleanup gotos are for. */
        r300_pacify(dev_priv);
        if (cmdbuf->nbox <= R300_SIMULTANEOUS_CLIPRECTS) {
diff --git a/drivers/gpu/drm/radeon/r300_reg.h b/drivers/gpu/drm/radeon/r300_reg.h
index a6802f26afc4..ee6f811599a3 100644
--- a/drivers/gpu/drm/radeon/r300_reg.h
+++ b/drivers/gpu/drm/radeon/r300_reg.h
@@ -317,7 +317,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 * Therefore, I suspect writing zero to 0x2284 synchronizes the engine and
 * avoids bugs caused by still running shaders reading bad data from memory.
 */
-#define R300_VAP_PVS_WAITIDLE               0x2284 /* GUESS */
+#define R300_VAP_PVS_STATE_FLUSH_REG        0x2284
 /* Absolutely no clue what this register is about. */
 #define R300_VAP_UNKNOWN_2288               0x2288
@@ -513,7 +513,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 /* gap */
 /* Zero to flush caches. */
-#define R300_TX_CNTL                        0x4100
+#define R300_TX_INVALTAGS                   0x4100
 #define R300_TX_FLUSH                       0x0
 /* The upper enable bits are guessed, based on fglrx reported limits. */
@@ -1362,6 +1362,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define R300_RB3D_COLORPITCH2               0x4E40 /* GUESS */
 #define R300_RB3D_COLORPITCH3               0x4E44 /* GUESS */
+#define R300_RB3D_AARESOLVE_CTL             0x4E88
 /* gap */
 /* Guess by Vladimir.
diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
index f0de81a5689d..248ab4a7d39f 100644
--- a/drivers/gpu/drm/radeon/radeon_cp.c
+++ b/drivers/gpu/drm/radeon/radeon_cp.c
@@ -40,6 +40,7 @@
 #define RADEON_FIFO_DEBUG       0
 static int radeon_do_cleanup_cp(struct drm_device * dev);
+static void radeon_do_cp_start(drm_radeon_private_t * dev_priv);
 static u32 R500_READ_MCIND(drm_radeon_private_t *dev_priv, int addr)
 {
@@ -198,23 +199,8 @@ static int radeon_do_pixcache_flush(drm_radeon_private_t * dev_priv)
                        DRM_UDELAY(1);
                }
        } else {
-                /* 3D */
+                /* don't flush or purge cache here or lockup */
-                tmp = RADEON_READ(R300_RB3D_DSTCACHE_CTLSTAT);
+                return 0;
-                tmp |= RADEON_RB3D_DC_FLUSH_ALL;
-                RADEON_WRITE(R300_RB3D_DSTCACHE_CTLSTAT, tmp);
-                /* 2D */
-                tmp = RADEON_READ(R300_DSTCACHE_CTLSTAT);
-                tmp |= RADEON_RB3D_DC_FLUSH_ALL;
-                RADEON_WRITE(R300_DSTCACHE_CTLSTAT, tmp);
-                for (i = 0; i < dev_priv->usec_timeout; i++) {
-                        if (!(RADEON_READ(R300_DSTCACHE_CTLSTAT)
-                          & RADEON_RB3D_DC_BUSY)) {
-                                return 0;
-                        }
-                        DRM_UDELAY(1);
-                }
        }
 #if RADEON_FIFO_DEBUG
@@ -237,6 +223,9 @@ static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries)
                        return 0;
                DRM_UDELAY(1);
        }
+        DRM_DEBUG("wait for fifo failed status : 0x%08X 0x%08X\n",
+                 RADEON_READ(RADEON_RBBM_STATUS),
+                 RADEON_READ(R300_VAP_CNTL_STATUS));
 #if RADEON_FIFO_DEBUG
        DRM_ERROR("failed!\n");
@@ -263,6 +252,9 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv)
                }
                DRM_UDELAY(1);
        }
+        DRM_DEBUG("wait idle failed status : 0x%08X 0x%08X\n",
+                 RADEON_READ(RADEON_RBBM_STATUS),
+                 RADEON_READ(R300_VAP_CNTL_STATUS));
 #if RADEON_FIFO_DEBUG
        DRM_ERROR("failed!\n");
@@ -443,14 +435,20 @@ static void radeon_do_cp_start(drm_radeon_private_t * dev_priv)
        dev_priv->cp_running = 1;
-        BEGIN_RING(6);
+        BEGIN_RING(8);
+        /* isync can only be written through cp on r5xx write it here */
+        OUT_RING(CP_PACKET0(RADEON_ISYNC_CNTL, 0));
+        OUT_RING(RADEON_ISYNC_ANY2D_IDLE3D |
+                 RADEON_ISYNC_ANY3D_IDLE2D |
+                 RADEON_ISYNC_WAIT_IDLEGUI |
+                 RADEON_ISYNC_CPSCRATCH_IDLEGUI);
        RADEON_PURGE_CACHE();
        RADEON_PURGE_ZCACHE();
        RADEON_WAIT_UNTIL_IDLE();
        ADVANCE_RING();
        COMMIT_RING();
+        dev_priv->track_flush |= RADEON_FLUSH_EMITED | RADEON_PURGE_EMITED;
 }
 /* Reset the Command Processor.  This will not flush any pending
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
index 3f0eca957aa7..099381693175 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.h
+++ b/drivers/gpu/drm/radeon/radeon_drv.h
@@ -220,6 +220,9 @@ struct radeon_virt_surface {
        struct drm_file *file_priv;
 };
+#define RADEON_FLUSH_EMITED     (1 < 0)
+#define RADEON_PURGE_EMITED     (1 < 1)
 typedef struct drm_radeon_private {
        drm_radeon_ring_buffer_t ring;
        drm_radeon_sarea_t *sarea_priv;
@@ -311,6 +314,7 @@ typedef struct drm_radeon_private {
        unsigned long fb_aper_offset;
        int num_gb_pipes;
+        int track_flush;
 } drm_radeon_private_t;
 typedef struct drm_radeon_buf_priv {
@@ -693,7 +697,6 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
 #define R300_ZB_ZCACHE_CTLSTAT                  0x4f18
 #       define R300_ZC_FLUSH                    (1 << 0)
 #       define R300_ZC_FREE                     (1 << 1)
-#       define R300_ZC_FLUSH_ALL                0x3
 #       define R300_ZC_BUSY                     (1 << 31)
 #define RADEON_RB3D_DSTCACHE_CTLSTAT    0x325c
 #       define RADEON_RB3D_DC_FLUSH             (3 << 0)
@@ -701,6 +704,8 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
 #       define RADEON_RB3D_DC_FLUSH_ALL         0xf
 #       define RADEON_RB3D_DC_BUSY              (1 << 31)
 #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
+#       define R300_RB3D_DC_FLUSH               (2 << 0)
+#       define R300_RB3D_DC_FREE                (2 << 2)
 #       define R300_RB3D_DC_FINISH              (1 << 4)
 #define RADEON_RB3D_ZSTENCILCNTL        0x1c2c
 #       define RADEON_Z_TEST_MASK               (7 << 4)
@@ -1246,17 +1251,17 @@ do {									\
                OUT_RING(RADEON_RB3D_DC_FLUSH);                         \
        } else {                                                        \
                OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));    \
-                OUT_RING(RADEON_RB3D_DC_FLUSH);                         \
+                OUT_RING(R300_RB3D_DC_FLUSH);                           \
        }                                                               \
 } while (0)
 #define RADEON_PURGE_CACHE() do {                                       \
        if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) {     \
                OUT_RING(CP_PACKET0(RADEON_RB3D_DSTCACHE_CTLSTAT, 0));  \
-                OUT_RING(RADEON_RB3D_DC_FLUSH_ALL);                     \
+                OUT_RING(RADEON_RB3D_DC_FLUSH | RADEON_RB3D_DC_FREE);   \
        } else {                                                        \
                OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));    \
-                OUT_RING(RADEON_RB3D_DC_FLUSH_ALL);                     \
+                OUT_RING(R300_RB3D_DC_FLUSH | R300_RB3D_DC_FREE);       \
        }                                                               \
 } while (0)
@@ -1273,10 +1278,10 @@ do {									\
 #define RADEON_PURGE_ZCACHE() do {                                      \
        if ((dev_priv->flags & RADEON_FAMILY_MASK) <= CHIP_RV280) {     \
                OUT_RING(CP_PACKET0(RADEON_RB3D_ZCACHE_CTLSTAT, 0));    \
-                OUT_RING(RADEON_RB3D_ZC_FLUSH_ALL);                     \
+                OUT_RING(RADEON_RB3D_ZC_FLUSH | RADEON_RB3D_ZC_FREE);                   \
        } else {                                                        \
-                OUT_RING(CP_PACKET0(R300_RB3D_DSTCACHE_CTLSTAT, 0));    \
+                OUT_RING(CP_PACKET0(R300_ZB_ZCACHE_CTLSTAT, 0));        \
-                OUT_RING(R300_ZC_FLUSH_ALL);                            \
+                OUT_RING(R300_ZC_FLUSH | R300_ZC_FREE);                         \
        }                                                               \
 } while (0)
diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index c1adcdbf7979..9efb02137254 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -14,7 +14,6 @@
 */
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/slab.h>
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 550853f79ae8..b346a687ab59 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -108,6 +108,9 @@ static int i2c_device_probe(struct device *dev)
        if (!driver->probe || !driver->id_table)
                return -ENODEV;
        client->driver = driver;
+        if (!device_can_wakeup(&client->dev))
+                device_init_wakeup(&client->dev,
+                                        client->flags & I2C_CLIENT_WAKE);
        dev_dbg(dev, "probe\n");
        status = driver->probe(client, i2c_match_id(driver->id_table, client));
@@ -262,9 +265,8 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
        client->adapter = adap;
        client->dev.platform_data = info->platform_data;
-        device_init_wakeup(&client->dev, info->flags & I2C_CLIENT_WAKE);
-        client->flags = info->flags & ~I2C_CLIENT_WAKE;
+        client->flags = info->flags;
        client->addr = info->addr;
        client->irq = info->irq;
@@ -1188,8 +1190,8 @@ int i2c_probe(struct i2c_adapter *adapter,
                 && address_data->normal_i2c[0] == I2C_CLIENT_END)
                        return 0;
-                dev_warn(&adapter->dev, "SMBus Quick command not supported, "
+                dev_dbg(&adapter->dev, "SMBus Quick command not supported, "
-                         "can't probe for chips\n");
+                        "can't probe for chips\n");
                return -EOPNOTSUPP;
        }
@@ -1350,6 +1352,10 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
                }
        }
+        /* Stop here if the classes do not match */
+        if (!(adapter->class & driver->class))
+                goto exit_free;
        /* Stop here if we can't use SMBUS_QUICK */
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
                if (address_data->probe[0] == I2C_CLIENT_END
@@ -1362,10 +1368,6 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
                goto exit_free;
        }
-        /* Stop here if the classes do not match */
-        if (!(adapter->class & driver->class))
-                goto exit_free;
        /* Probe entries are done second, and are not affected by ignore
           entries either */
        for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index a34758d29516..fc735ab08ff4 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -242,7 +242,7 @@ config BLK_DEV_IDEFLOPPY
          module will be called ide-floppy.
 config BLK_DEV_IDESCSI
-        tristate "SCSI emulation support"
+        tristate "SCSI emulation support (DEPRECATED)"
        depends on SCSI
        select IDE_ATAPI
        ---help---
@@ -255,20 +255,6 @@ config BLK_DEV_IDESCSI
          and will allow you to use a SCSI device driver instead of a native
          ATAPI driver.
-          This is useful if you have an ATAPI device for which no native
-          driver has been written (for example, an ATAPI PD-CD drive);
-          you can then use this emulation together with an appropriate SCSI
-          device driver. In order to do this, say Y here and to "SCSI support"
-          and "SCSI generic support", below. You must then provide the kernel
-          command line "hdx=ide-scsi" (try "man bootparam" or see the
-          documentation of your boot loader (lilo or loadlin) about how to
-          pass options to the kernel at boot time) for devices if you want the
-          native EIDE sub-drivers to skip over the native support, so that
-          this SCSI emulation can be used instead.
-          Note that this option does NOT allow you to attach SCSI devices to a
-          box that doesn't have a SCSI host adapter installed.
          If both this SCSI emulation and native ATAPI support are compiled
          into the kernel, the native support will be used.
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c
index f788fa5a977b..4fd91dcf1dc2 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -343,11 +343,10 @@ static struct ide_port_info __devinitdata palm_bk3710_port_info = {
        .mwdma_mask             = ATA_MWDMA2,
 };
-static int __devinit palm_bk3710_probe(struct platform_device *pdev)
+static int __init palm_bk3710_probe(struct platform_device *pdev)
 {
        struct clk *clk;
        struct resource *mem, *irq;
-        struct ide_host *host;
        unsigned long base, rate;
        int i, rc;
        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
@@ -390,6 +389,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
                hw.io_ports_array[i] = base + IDE_PALM_ATA_PRI_REG_OFFSET + i;
        hw.io_ports.ctl_addr = base + IDE_PALM_ATA_PRI_CTL_OFFSET;
        hw.irq = irq->start;
+        hw.dev = &pdev->dev;
        hw.chipset = ide_palm3710;
        palm_bk3710_port_info.udma_mask = rate < 100000000 ? ATA_UDMA4 :
@@ -413,13 +413,11 @@ static struct platform_driver platform_bk_driver = {
                .name = "palm_bk3710",
                .owner = THIS_MODULE,
        },
-        .probe = palm_bk3710_probe,
-        .remove = NULL,
 };
 static int __init palm_bk3710_init(void)
 {
-        return platform_driver_register(&platform_bk_driver);
+        return platform_driver_probe(&platform_bk_driver, palm_bk3710_probe);
 }
 module_init(palm_bk3710_init);
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 49a8c589e346..f1489999cf91 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1933,6 +1933,7 @@ static void ide_cd_remove(ide_drive_t *drive)
        ide_proc_unregister_driver(drive, info->driver);
+        blk_unregister_filter(info->disk);
        del_gendisk(info->disk);
        ide_cd_put(info);
@@ -2158,6 +2159,7 @@ static int ide_cd_probe(ide_drive_t *drive)
        g->fops = &idecd_ops;
        g->flags |= GENHD_FL_REMOVABLE;
        add_disk(g);
+        blk_register_filter(g);
        return 0;
 out_free_cd:
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 68b9cf0138b0..07ef88bd109b 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -445,20 +445,6 @@ static void idedisk_check_hpa(ide_drive_t *drive)
        }
 }
-/*
- * Compute drive->capacity, the full capacity of the drive
- * Called with drive->id != NULL.
- *
- * To compute capacity, this uses either of
- *
- *    1. CHS value set by user       (whatever user sets will be trusted)
- *    2. LBA value from target drive (require new ATA feature)
- *    3. LBA value from system BIOS  (new one is OK, old one may break)
- *    4. CHS value from system BIOS  (traditional style)
- *
- * in above order (i.e., if value of higher priority is available,
- * reset will be ignored).
- */
 static void init_idedisk_capacity(ide_drive_t *drive)
 {
        struct hd_driveid *id = drive->id;
diff --git a/drivers/infiniband/hw/ehca/ehca_tools.h b/drivers/infiniband/hw/ehca/ehca_tools.h
index ec950bf8c479..21f7d06f14ad 100644
--- a/drivers/infiniband/hw/ehca/ehca_tools.h
+++ b/drivers/infiniband/hw/ehca/ehca_tools.h
@@ -54,7 +54,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
-#include <linux/version.h>
 #include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/device.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index 23faba9d21eb..8bb5170b4e41 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -31,7 +31,6 @@
 * SOFTWARE.
 */
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/mount.h>
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c
index d90f5e9a54fa..9839e20119bc 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba7220.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c
@@ -1720,7 +1720,7 @@ static void ipath_7220_put_tid(struct ipath_devdata *dd, u64 __iomem *tidptr,
                                 "not 2KB aligned!\n", pa);
                        return;
                }
-                if (pa >= (1UL << IBA7220_TID_SZ_SHIFT)) {
+                if (chippa >= (1UL << IBA7220_TID_SZ_SHIFT)) {
                        ipath_dev_err(dd,
                                      "BUG: Physical page address 0x%lx "
                                      "larger than supported\n", pa);
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c
index 36aa242c487c..729446f56aab 100644
--- a/drivers/infiniband/hw/ipath/ipath_ud.c
+++ b/drivers/infiniband/hw/ipath/ipath_ud.c
@@ -267,6 +267,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
        u16 lrh0;
        u16 lid;
        int ret = 0;
+        int next_cur;
        spin_lock_irqsave(&qp->s_lock, flags);
@@ -290,8 +291,9 @@ int ipath_make_ud_req(struct ipath_qp *qp)
                goto bail;
        wqe = get_swqe_ptr(qp, qp->s_cur);
-        if (++qp->s_cur >= qp->s_size)
+        next_cur = qp->s_cur + 1;
-                qp->s_cur = 0;
+        if (next_cur >= qp->s_size)
+                next_cur = 0;
        /* Construct the header. */
        ah_attr = &to_iah(wqe->wr.wr.ud.ah)->attr;
@@ -315,6 +317,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
                                qp->s_flags |= IPATH_S_WAIT_DMA;
                                goto bail;
                        }
+                        qp->s_cur = next_cur;
                        spin_unlock_irqrestore(&qp->s_lock, flags);
                        ipath_ud_loopback(qp, wqe);
                        spin_lock_irqsave(&qp->s_lock, flags);
@@ -323,6 +326,7 @@ int ipath_make_ud_req(struct ipath_qp *qp)
                }
        }
+        qp->s_cur = next_cur;
        extra_bytes = -wqe->length & 3;
        nwords = (wqe->length + extra_bytes) >> 2;
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c
index a4cdb465cd1d..87f5c5a87b98 100644
--- a/drivers/infiniband/hw/mlx4/mr.c
+++ b/drivers/infiniband/hw/mlx4/mr.c
@@ -204,6 +204,8 @@ struct ib_mr *mlx4_ib_alloc_fast_reg_mr(struct ib_pd *pd,
        if (err)
                goto err_mr;
+        mr->ibmr.rkey = mr->ibmr.lkey = mr->mmr.key;
        return &mr->ibmr;
 err_mr:
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index 39bd897b40c6..8eb7ae96974d 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -43,7 +43,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/workqueue.h>
 #include <linux/slab.h>
-#include <linux/version.h>
 #include <asm/io.h>
 #include <linux/crc32c.h>
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index f51201b17bfd..7e9e218738fa 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -156,14 +156,8 @@ static int ipoib_stop(struct net_device *dev)
        netif_stop_queue(dev);
-        /*
+        ipoib_ib_dev_down(dev, 0);
-         * Now flush workqueue to make sure a scheduled task doesn't
+        ipoib_ib_dev_stop(dev, 0);
-         * bring our internal state back up.
-         */
-        flush_workqueue(ipoib_workqueue);
-        ipoib_ib_dev_down(dev, 1);
-        ipoib_ib_dev_stop(dev, 1);
        if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags)) {
                struct ipoib_dev_priv *cpriv;
@@ -1314,7 +1308,7 @@ sysfs_failed:
 register_failed:
        ib_unregister_event_handler(&priv->event_handler);
-        flush_scheduled_work();
+        flush_workqueue(ipoib_workqueue);
 event_failed:
        ipoib_dev_cleanup(priv->dev);
@@ -1373,7 +1367,12 @@ static void ipoib_remove_one(struct ib_device *device)
        list_for_each_entry_safe(priv, tmp, dev_list, list) {
                ib_unregister_event_handler(&priv->event_handler);
-                flush_scheduled_work();
+                rtnl_lock();
+                dev_change_flags(priv->dev, priv->dev->flags & ~IFF_UP);
+                rtnl_unlock();
+                flush_workqueue(ipoib_workqueue);
                unregister_netdev(priv->dev);
                ipoib_dev_cleanup(priv->dev);
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 8950e9546f4e..ac33c8f3ea85 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -392,8 +392,16 @@ static int ipoib_mcast_join_complete(int status,
                                           &priv->mcast_task, 0);
                mutex_unlock(&mcast_mutex);
-                if (mcast == priv->broadcast)
+                if (mcast == priv->broadcast) {
+                        /*
+                         * Take RTNL lock here to avoid racing with
+                         * ipoib_stop() and turning the carrier back
+                         * on while a device is being removed.
+                         */
+                        rtnl_lock();
                        netif_carrier_on(dev);
+                        rtnl_unlock();
+                }
                return 0;
        }
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 63462ecca147..26ff6214a81f 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -33,7 +33,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include "iscsi_iser.h"
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c
index 54ed8e2e1c02..e348cfccc17a 100644
--- a/drivers/input/keyboard/bf54x-keys.c
+++ b/drivers/input/keyboard/bf54x-keys.c
@@ -29,7 +29,6 @@
 */
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/fs.h>
@@ -44,7 +43,7 @@
 #include <linux/input.h>
 #include <asm/portmux.h>
-#include <asm/mach/bf54x_keys.h>
+#include <mach/bf54x_keys.h>
 #define DRV_NAME        "bf54x-keys"
 #define TIME_SCALE      100     /* 100 ns */
diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c
index 283f93a0cee2..37a555f37306 100644
--- a/drivers/input/touchscreen/mainstone-wm97xx.c
+++ b/drivers/input/touchscreen/mainstone-wm97xx.c
@@ -25,7 +25,6 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 37344aaee22f..a661bbdae3d6 100644
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -98,6 +98,10 @@ static u32 lg_get_features(struct virtio_device *vdev)
        return features;
 }
+/* The virtio core takes the features the Host offers, and copies the
+ * ones supported by the driver into the vdev->features array.  Once
+ * that's all sorted out, this routine is called so we can tell the
+ * Host which features we understand and accept. */
 static void lg_finalize_features(struct virtio_device *vdev)
 {
        unsigned int i, bits;
@@ -108,6 +112,10 @@ static void lg_finalize_features(struct virtio_device *vdev)
        /* Give virtio_ring a chance to accept features. */
        vring_transport_features(vdev);
+        /* The vdev->feature array is a Linux bitmask: this isn't the
+         * same as a the simple array of bits used by lguest devices
+         * for features.  So we do this slow, manual conversion which is
+         * completely general. */
        memset(out_features, 0, desc->feature_len);
        bits = min_t(unsigned, desc->feature_len, sizeof(vdev->features)) * 8;
        for (i = 0; i < bits; i++) {
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
index 7e65bad522cb..ac89a5deaca2 100644
--- a/drivers/md/bitmap.c
+++ b/drivers/md/bitmap.c
@@ -238,15 +238,47 @@ static struct page *read_sb_page(mddev_t *mddev, long offset, unsigned long inde
 }
+static mdk_rdev_t *next_active_rdev(mdk_rdev_t *rdev, mddev_t *mddev)
+{
+        /* Iterate the disks of an mddev, using rcu to protect access to the
+         * linked list, and raising the refcount of devices we return to ensure
+         * they don't disappear while in use.
+         * As devices are only added or removed when raid_disk is < 0 and
+         * nr_pending is 0 and In_sync is clear, the entries we return will
+         * still be in the same position on the list when we re-enter
+         * list_for_each_continue_rcu.
+         */
+        struct list_head *pos;
+        rcu_read_lock();
+        if (rdev == NULL)
+                /* start at the beginning */
+                pos = &mddev->disks;
+        else {
+                /* release the previous rdev and start from there. */
+                rdev_dec_pending(rdev, mddev);
+                pos = &rdev->same_set;
+        }
+        list_for_each_continue_rcu(pos, &mddev->disks) {
+                rdev = list_entry(pos, mdk_rdev_t, same_set);
+                if (rdev->raid_disk >= 0 &&
+                    test_bit(In_sync, &rdev->flags) &&
+                    !test_bit(Faulty, &rdev->flags)) {
+                        /* this is a usable devices */
+                        atomic_inc(&rdev->nr_pending);
+                        rcu_read_unlock();
+                        return rdev;
+                }
+        }
+        rcu_read_unlock();
+        return NULL;
+}
 static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
 {
-        mdk_rdev_t *rdev;
+        mdk_rdev_t *rdev = NULL;
        mddev_t *mddev = bitmap->mddev;
-        rcu_read_lock();
+        while ((rdev = next_active_rdev(rdev, mddev)) != NULL) {
-        rdev_for_each_rcu(rdev, mddev)
-                if (test_bit(In_sync, &rdev->flags)
-                    && !test_bit(Faulty, &rdev->flags)) {
                        int size = PAGE_SIZE;
                        if (page->index == bitmap->file_pages-1)
                                size = roundup(bitmap->last_page_size,
@@ -281,8 +313,7 @@ static int write_sb_page(struct bitmap *bitmap, struct page *page, int wait)
                                       + page->index * (PAGE_SIZE/512),
                                       size,
                                       page);
-                }
+        }
-        rcu_read_unlock();
        if (wait)
                md_super_wait(mddev);
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 8cfadc5bd2ba..4790c83d78d0 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3841,8 +3841,6 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                del_timer_sync(&mddev->safemode_timer);
-                invalidate_partition(disk, 0);
                switch(mode) {
                case 1: /* readonly */
                        err  = -ENXIO;
diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index 48f4b92a8f8b..79faedf58521 100644
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -403,6 +403,7 @@ static int dabusb_fpga_download (pdabusb_t s, const char *fname)
        ret = request_firmware(&fw, "dabusb/bitstream.bin", &s->usbdev->dev);
        if (ret) {
                err("Failed to load \"dabusb/bitstream.bin\": %d\n", ret);
+                kfree(b);
                return ret;
        }
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index c6408a62d95e..bc2a807f210d 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -16,7 +16,6 @@
 *
 */
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/irq.h>
 #include <linux/gpio.h>
diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index b2d9878dc3f0..d8b0d326e452 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -192,6 +192,9 @@ static struct quirk_entry *quirks;
 static void set_quirks(void)
 {
+        if (!interface)
+                return;
        if (quirks->mailled)
                interface->capability |= ACER_CAP_MAILLED;
@@ -1186,7 +1189,7 @@ static int create_debugfs(void)
        return 0;
 error_debugfs:
-                remove_debugfs();
+        remove_debugfs();
        return -ENOMEM;
 }
@@ -1237,6 +1240,8 @@ static int __init acer_wmi_init(void)
                return -ENODEV;
        }
+        set_quirks();
        if (platform_driver_register(&acer_platform_driver)) {
                printk(ACER_ERR "Unable to register platform driver.\n");
                goto error_platform_register;
@@ -1267,6 +1272,7 @@ error_platform_register:
 static void __exit acer_wmi_exit(void)
 {
        remove_sysfs(acer_platform_device);
+        remove_debugfs();
        platform_device_del(acer_platform_device);
        platform_driver_unregister(&acer_platform_driver);
diff --git a/drivers/misc/eeprom_93cx6.c b/drivers/misc/eeprom_93cx6.c
index ea55654e5948..15b1780025c8 100644
--- a/drivers/misc/eeprom_93cx6.c
+++ b/drivers/misc/eeprom_93cx6.c
@@ -26,7 +26,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/eeprom_93cx6.h>
diff --git a/drivers/misc/hp-wmi.c b/drivers/misc/hp-wmi.c
index 1dbcbcb323a2..6d407c2a4f91 100644
--- a/drivers/misc/hp-wmi.c
+++ b/drivers/misc/hp-wmi.c
@@ -49,6 +49,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4");
 #define HPWMI_ALS_QUERY 0x3
 #define HPWMI_DOCK_QUERY 0x4
 #define HPWMI_WIRELESS_QUERY 0x5
+#define HPWMI_HOTKEY_QUERY 0xc
 static int __init hp_wmi_bios_setup(struct platform_device *device);
 static int __exit hp_wmi_bios_remove(struct platform_device *device);
@@ -69,7 +70,7 @@ struct bios_return {
 struct key_entry {
        char type;              /* See KE_* below */
-        u8 code;
+        u16 code;
        u16 keycode;
 };
@@ -79,7 +80,9 @@ static struct key_entry hp_wmi_keymap[] = {
        {KE_SW, 0x01, SW_DOCK},
        {KE_KEY, 0x02, KEY_BRIGHTNESSUP},
        {KE_KEY, 0x03, KEY_BRIGHTNESSDOWN},
-        {KE_KEY, 0x04, KEY_HELP},
+        {KE_KEY, 0x20e6, KEY_PROG1},
+        {KE_KEY, 0x2142, KEY_MEDIA},
+        {KE_KEY, 0x231b, KEY_HELP},
        {KE_END, 0}
 };
@@ -177,9 +180,9 @@ static int hp_wmi_wifi_state(void)
        int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
        if (wireless & 0x100)
-                return 1;
+                return RFKILL_STATE_UNBLOCKED;
        else
-                return 0;
+                return RFKILL_STATE_SOFT_BLOCKED;
 }
 static int hp_wmi_bluetooth_state(void)
@@ -187,9 +190,9 @@ static int hp_wmi_bluetooth_state(void)
        int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
        if (wireless & 0x10000)
-                return 1;
+                return RFKILL_STATE_UNBLOCKED;
        else
-                return 0;
+                return RFKILL_STATE_SOFT_BLOCKED;
 }
 static int hp_wmi_wwan_state(void)
@@ -197,9 +200,9 @@ static int hp_wmi_wwan_state(void)
        int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
        if (wireless & 0x1000000)
-                return 1;
+                return RFKILL_STATE_UNBLOCKED;
        else
-                return 0;
+                return RFKILL_STATE_SOFT_BLOCKED;
 }
 static ssize_t show_display(struct device *dev, struct device_attribute *attr,
@@ -318,6 +321,9 @@ void hp_wmi_notify(u32 value, void *context)
        if (obj && obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 8) {
                int eventcode = *((u8 *) obj->buffer.pointer);
+                if (eventcode == 0x4)
+                        eventcode = hp_wmi_perform_query(HPWMI_HOTKEY_QUERY, 0,
+                                                         0);
                key = hp_wmi_get_entry_by_scancode(eventcode);
                if (key) {
                        switch (key->type) {
@@ -338,12 +344,14 @@ void hp_wmi_notify(u32 value, void *context)
                        }
                } else if (eventcode == 0x5) {
                        if (wifi_rfkill)
-                                wifi_rfkill->state = hp_wmi_wifi_state();
+                                rfkill_force_state(wifi_rfkill,
+                                                   hp_wmi_wifi_state());
                        if (bluetooth_rfkill)
-                                bluetooth_rfkill->state =
+                                rfkill_force_state(bluetooth_rfkill,
-                                    hp_wmi_bluetooth_state();
+                                                   hp_wmi_bluetooth_state());
                        if (wwan_rfkill)
-                                wwan_rfkill->state = hp_wmi_wwan_state();
+                                rfkill_force_state(wwan_rfkill,
+                                                   hp_wmi_wwan_state());
                } else
                        printk(KERN_INFO "HP WMI: Unknown key pressed - %x\n",
                               eventcode);
@@ -398,6 +406,7 @@ static void cleanup_sysfs(struct platform_device *device)
 static int __init hp_wmi_bios_setup(struct platform_device *device)
 {
        int err;
+        int wireless = hp_wmi_perform_query(HPWMI_WIRELESS_QUERY, 0, 0);
        err = device_create_file(&device->dev, &dev_attr_display);
        if (err)
@@ -412,28 +421,33 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
        if (err)
                goto add_sysfs_error;
-        wifi_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WLAN);
+        if (wireless & 0x1) {
-        wifi_rfkill->name = "hp-wifi";
+                wifi_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WLAN);
-        wifi_rfkill->state = hp_wmi_wifi_state();
+                wifi_rfkill->name = "hp-wifi";
-        wifi_rfkill->toggle_radio = hp_wmi_wifi_set;
+                wifi_rfkill->state = hp_wmi_wifi_state();
-        wifi_rfkill->user_claim_unsupported = 1;
+                wifi_rfkill->toggle_radio = hp_wmi_wifi_set;
+                wifi_rfkill->user_claim_unsupported = 1;
-        bluetooth_rfkill = rfkill_allocate(&device->dev,
+                rfkill_register(wifi_rfkill);
-                                           RFKILL_TYPE_BLUETOOTH);
+        }
-        bluetooth_rfkill->name = "hp-bluetooth";
-        bluetooth_rfkill->state = hp_wmi_bluetooth_state();
+        if (wireless & 0x2) {
-        bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set;
+                bluetooth_rfkill = rfkill_allocate(&device->dev,
-        bluetooth_rfkill->user_claim_unsupported = 1;
+                                                   RFKILL_TYPE_BLUETOOTH);
+                bluetooth_rfkill->name = "hp-bluetooth";
-        wwan_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WIMAX);
+                bluetooth_rfkill->state = hp_wmi_bluetooth_state();
-        wwan_rfkill->name = "hp-wwan";
+                bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set;
-        wwan_rfkill->state = hp_wmi_wwan_state();
+                bluetooth_rfkill->user_claim_unsupported = 1;
-        wwan_rfkill->toggle_radio = hp_wmi_wwan_set;
+                rfkill_register(bluetooth_rfkill);
-        wwan_rfkill->user_claim_unsupported = 1;
+        }
-        rfkill_register(wifi_rfkill);
+        if (wireless & 0x4) {
-        rfkill_register(bluetooth_rfkill);
+                wwan_rfkill = rfkill_allocate(&device->dev, RFKILL_TYPE_WWAN);
-        rfkill_register(wwan_rfkill);
+                wwan_rfkill->name = "hp-wwan";
+                wwan_rfkill->state = hp_wmi_wwan_state();
+                wwan_rfkill->toggle_radio = hp_wmi_wwan_set;
+                wwan_rfkill->user_claim_unsupported = 1;
+                rfkill_register(wwan_rfkill);
+        }
        return 0;
 add_sysfs_error:
@@ -445,9 +459,12 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device)
 {
        cleanup_sysfs(device);
-        rfkill_unregister(wifi_rfkill);
+        if (wifi_rfkill)
-        rfkill_unregister(bluetooth_rfkill);
+                rfkill_unregister(wifi_rfkill);
-        rfkill_unregister(wwan_rfkill);
+        if (bluetooth_rfkill)
+                rfkill_unregister(bluetooth_rfkill);
+        if (wwan_rfkill)
+                rfkill_unregister(wwan_rfkill);
        return 0;
 }
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c
index 6915f40ac8ab..1f8b5b36222c 100644
--- a/drivers/mmc/host/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
@@ -621,12 +621,21 @@ static void at91_mci_send_command(struct at91mci_host *host, struct mmc_command
                                if (cpu_is_at91sam9260 () || cpu_is_at91sam9263())
                                        if (host->total_length < 12)
                                                host->total_length = 12;
-                                host->buffer = dma_alloc_coherent(NULL,
-                                                host->total_length,
+                                host->buffer = kmalloc(host->total_length, GFP_KERNEL);
-                                                &host->physical_address, GFP_KERNEL);
+                                if (!host->buffer) {
+                                        pr_debug("Can't alloc tx buffer\n");
+                                        cmd->error = -ENOMEM;
+                                        mmc_request_done(host->mmc, host->request);
+                                        return;
+                                }
                                at91_mci_sg_to_dma(host, data);
+                                host->physical_address = dma_map_single(NULL,
+                                                host->buffer, host->total_length,
+                                                DMA_TO_DEVICE);
                                pr_debug("Transmitting %d bytes\n", host->total_length);
                                at91_mci_write(host, ATMEL_PDC_TPR, host->physical_address);
@@ -694,7 +703,10 @@ static void at91_mci_completed_command(struct at91mci_host *host, unsigned int s
        cmd->resp[3] = at91_mci_read(host, AT91_MCI_RSPR(3));
        if (host->buffer) {
-                dma_free_coherent(NULL, host->total_length, host->buffer, host->physical_address);
+                dma_unmap_single(NULL,
+                                host->physical_address, host->total_length,
+                                DMA_TO_DEVICE);
+                kfree(host->buffer);
                host->buffer = NULL;
        }
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 948b86f35ef4..d1eec7d3243f 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -6,7 +6,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
index effaf7cdefab..1a6feb4474de 100644
--- a/drivers/mtd/maps/ck804xrom.c
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -9,7 +9,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
index aa64a4752781..bbbcdd4c8d13 100644
--- a/drivers/mtd/maps/esb2rom.c
+++ b/drivers/mtd/maps/esb2rom.c
@@ -12,7 +12,6 @@
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index d2f331876e4c..e00d424e6575 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -410,16 +410,20 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
        case MEMGETREGIONINFO:
        {
-                struct region_info_user ur;
+                uint32_t ur_idx;
+                struct mtd_erase_region_info *kr;
+                struct region_info_user *ur = (struct region_info_user *) argp;
-                if (copy_from_user(&ur, argp, sizeof(struct region_info_user)))
+                if (get_user(ur_idx, &(ur->regionindex)))
                        return -EFAULT;
-                if (ur.regionindex >= mtd->numeraseregions)
+                kr = &(mtd->eraseregions[ur_idx]);
-                        return -EINVAL;
-                if (copy_to_user(argp, &(mtd->eraseregions[ur.regionindex]),
+                if (put_user(kr->offset, &(ur->offset))
-                                sizeof(struct mtd_erase_region_info)))
+                    || put_user(kr->erasesize, &(ur->erasesize))
+                    || put_user(kr->numblocks, &(ur->numblocks)))
                        return -EFAULT;
                break;
        }
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 761946ea45b1..92c334ff4508 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -16,7 +16,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
-#include <linux/version.h>
 #include <asm/io.h>
 #include <asm/mach-au1x00/au1xxx.h>
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index b9f90a5d3d4d..213437d13154 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -208,7 +208,7 @@ struct e1000_option {
                } r;
                struct { /* list_option info */
                        int nr;
-                        struct e1000_opt_list { int i; char *str; } *p;
+                        const struct e1000_opt_list { int i; char *str; } *p;
                } l;
        } arg;
 };
@@ -242,7 +242,7 @@ static int __devinit e1000_validate_option(unsigned int *value,
                break;
        case list_option: {
                int i;
-                struct e1000_opt_list *ent;
+                const struct e1000_opt_list *ent;
                for (i = 0; i < opt->arg.l.nr; i++) {
                        ent = &opt->arg.l.p[i];
@@ -279,7 +279,9 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter);
 void __devinit e1000_check_options(struct e1000_adapter *adapter)
 {
+        struct e1000_option opt;
        int bd = adapter->bd_number;
        if (bd >= E1000_MAX_NIC) {
                DPRINTK(PROBE, NOTICE,
                       "Warning: no configuration for board #%i\n", bd);
@@ -287,19 +289,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
        }
        { /* Transmit Descriptor Count */
-                struct e1000_option opt = {
+                struct e1000_tx_ring *tx_ring = adapter->tx_ring;
+                int i;
+                e1000_mac_type mac_type = adapter->hw.mac_type;
+                opt = (struct e1000_option) {
                        .type = range_option,
                        .name = "Transmit Descriptors",
                        .err  = "using default of "
                                __MODULE_STRING(E1000_DEFAULT_TXD),
                        .def  = E1000_DEFAULT_TXD,
-                        .arg  = { .r = { .min = E1000_MIN_TXD }}
+                        .arg  = { .r = {
+                                .min = E1000_MIN_TXD,
+                                .max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD
+                                }}
                };
-                struct e1000_tx_ring *tx_ring = adapter->tx_ring;
-                int i;
-                e1000_mac_type mac_type = adapter->hw.mac_type;
-                opt.arg.r.max = mac_type < e1000_82544 ?
-                        E1000_MAX_TXD : E1000_MAX_82544_TXD;
                if (num_TxDescriptors > bd) {
                        tx_ring->count = TxDescriptors[bd];
@@ -313,19 +317,21 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                        tx_ring[i].count = tx_ring->count;
        }
        { /* Receive Descriptor Count */
-                struct e1000_option opt = {
+                struct e1000_rx_ring *rx_ring = adapter->rx_ring;
+                int i;
+                e1000_mac_type mac_type = adapter->hw.mac_type;
+                opt = (struct e1000_option) {
                        .type = range_option,
                        .name = "Receive Descriptors",
                        .err  = "using default of "
                                __MODULE_STRING(E1000_DEFAULT_RXD),
                        .def  = E1000_DEFAULT_RXD,
-                        .arg  = { .r = { .min = E1000_MIN_RXD }}
+                        .arg  = { .r = {
+                                .min = E1000_MIN_RXD,
+                                .max = mac_type < e1000_82544 ? E1000_MAX_RXD : E1000_MAX_82544_RXD
+                        }}
                };
-                struct e1000_rx_ring *rx_ring = adapter->rx_ring;
-                int i;
-                e1000_mac_type mac_type = adapter->hw.mac_type;
-                opt.arg.r.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
-                        E1000_MAX_82544_RXD;
                if (num_RxDescriptors > bd) {
                        rx_ring->count = RxDescriptors[bd];
@@ -339,7 +345,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                        rx_ring[i].count = rx_ring->count;
        }
        { /* Checksum Offload Enable/Disable */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = enable_option,
                        .name = "Checksum Offload",
                        .err  = "defaulting to Enabled",
@@ -363,7 +369,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                         { E1000_FC_FULL,    "Flow Control Enabled" },
                         { E1000_FC_DEFAULT, "Flow Control Hardware Default" }};
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = list_option,
                        .name = "Flow Control",
                        .err  = "reading default settings from EEPROM",
@@ -381,7 +387,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Transmit Interrupt Delay */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = range_option,
                        .name = "Transmit Interrupt Delay",
                        .err  = "using default of " __MODULE_STRING(DEFAULT_TIDV),
@@ -399,7 +405,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Transmit Absolute Interrupt Delay */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = range_option,
                        .name = "Transmit Absolute Interrupt Delay",
                        .err  = "using default of " __MODULE_STRING(DEFAULT_TADV),
@@ -417,7 +423,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Receive Interrupt Delay */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = range_option,
                        .name = "Receive Interrupt Delay",
                        .err  = "using default of " __MODULE_STRING(DEFAULT_RDTR),
@@ -435,7 +441,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Receive Absolute Interrupt Delay */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = range_option,
                        .name = "Receive Absolute Interrupt Delay",
                        .err  = "using default of " __MODULE_STRING(DEFAULT_RADV),
@@ -453,7 +459,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Interrupt Throttling Rate */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = range_option,
                        .name = "Interrupt Throttling Rate (ints/sec)",
                        .err  = "using default of " __MODULE_STRING(DEFAULT_ITR),
@@ -497,7 +503,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Smart Power Down */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = enable_option,
                        .name = "PHY Smart Power Down",
                        .err  = "defaulting to Disabled",
@@ -513,7 +519,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                }
        }
        { /* Kumeran Lock Loss Workaround */
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = enable_option,
                        .name = "Kumeran Lock Loss Workaround",
                        .err  = "defaulting to Enabled",
@@ -578,16 +584,18 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)
 static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
 {
+        struct e1000_option opt;
        unsigned int speed, dplx, an;
        int bd = adapter->bd_number;
        { /* Speed */
-                struct e1000_opt_list speed_list[] = {{          0, "" },
+                static const struct e1000_opt_list speed_list[] = {
-                                                      {   SPEED_10, "" },
+                        {          0, "" },
-                                                      {  SPEED_100, "" },
+                        {   SPEED_10, "" },
-                                                      { SPEED_1000, "" }};
+                        {  SPEED_100, "" },
+                        { SPEED_1000, "" }};
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = list_option,
                        .name = "Speed",
                        .err  = "parameter ignored",
@@ -604,11 +612,12 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
                }
        }
        { /* Duplex */
-                struct e1000_opt_list dplx_list[] = {{           0, "" },
+                static const struct e1000_opt_list dplx_list[] = {
-                                                     { HALF_DUPLEX, "" },
+                        {           0, "" },
-                                                     { FULL_DUPLEX, "" }};
+                        { HALF_DUPLEX, "" },
+                        { FULL_DUPLEX, "" }};
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = list_option,
                        .name = "Duplex",
                        .err  = "parameter ignored",
@@ -637,7 +646,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
                       "parameter ignored\n");
                adapter->hw.autoneg_advertised = AUTONEG_ADV_DEFAULT;
        } else { /* Autoneg */
-                struct e1000_opt_list an_list[] =
+                static const struct e1000_opt_list an_list[] =
                        #define AA "AutoNeg advertising "
                        {{ 0x01, AA "10/HD" },
                         { 0x02, AA "10/FD" },
@@ -671,7 +680,7 @@ static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
                         { 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" },
                         { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }};
-                struct e1000_option opt = {
+                opt = (struct e1000_option) {
                        .type = list_option,
                        .name = "AutoNeg",
                        .err  = "parameter ignored",
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index f6847531bf9e..d6524db321af 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -56,7 +56,6 @@
 #include <linux/ethtool.h>
 #include <linux/firmware.h>
 #include <linux/delay.h>
-#include <linux/version.h>
 #include <linux/timer.h>
 #include <linux/vmalloc.h>
 #include <linux/crc32.h>
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index ab871df6b1db..244ab49c4337 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -45,7 +45,6 @@
 #include <linux/in.h>
 #include <linux/tcp.h>
 #include <linux/skbuff.h>
-#include <linux/version.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 4ad3e0844b99..b974ca0fc530 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -38,7 +38,6 @@
 #include <asm/io.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
-#include <linux/version.h>
 #include "netxen_nic.h"
 #include "netxen_nic_hw.h"
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index e8e8d73f6ed7..e80f9e3e5973 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -32,8 +32,6 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/spinlock.h>
 #include <asm/irq.h>
 #include <linux/init.h>
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 47d84cd28097..59d1673f9387 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -119,7 +119,6 @@
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
 #include <linux/spinlock.h>
-#include <linux/version.h>
 #include <linux/bitops.h>
 #include <linux/jiffies.h>
diff --git a/drivers/net/tokenring/lanstreamer.h b/drivers/net/tokenring/lanstreamer.h
index e7bb3494afc7..13ccee6449c1 100644
--- a/drivers/net/tokenring/lanstreamer.h
+++ b/drivers/net/tokenring/lanstreamer.h
@@ -60,8 +60,6 @@
 *
 */
-#include <linux/version.h>
 /* MAX_INTR - the maximum number of times we can loop
 * inside the interrupt function before returning
 * control to the OS (maximum value is 256)
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index 2541c81932f0..1cb77db5c292 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -34,7 +34,6 @@
 #include <linux/moduleparam.h>
 #include <linux/if_arp.h>
 #include <linux/etherdevice.h>
-#include <linux/version.h>
 #include <linux/firmware.h>
 #include <linux/wireless.h>
 #include <linux/workqueue.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-led.c b/drivers/net/wireless/iwlwifi/iwl-3945-led.c
index d3336966b6b5..705c65bed9fd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-led.c
@@ -27,7 +27,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index cb11c4a4d691..4eee1b163cd2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -27,7 +27,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-rfkill.c b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
index e5e5846e9f25..5d642298f04c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rfkill.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rfkill.c
@@ -27,7 +27,6 @@
 *****************************************************************************/
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/init.h>
 #include <net/mac80211.h>
diff --git a/drivers/oprofile/cpu_buffer.c b/drivers/oprofile/cpu_buffer.c
index 2450b3a393ff..7ba78e6d210e 100644
--- a/drivers/oprofile/cpu_buffer.c
+++ b/drivers/oprofile/cpu_buffer.c
@@ -38,8 +38,10 @@ void free_cpu_buffers(void)
 {
        int i;
 
-        for_each_online_cpu(i)
+        for_each_online_cpu(i) {
                vfree(per_cpu(cpu_buffer, i).buffer);
+                per_cpu(cpu_buffer, i).buffer = NULL;
+        }
 }
 int alloc_cpu_buffers(void)
diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
index e7fbac529935..8d692a5c8e73 100644
--- a/drivers/oprofile/event_buffer.c
+++ b/drivers/oprofile/event_buffer.c
@@ -93,6 +93,8 @@ out:
 void free_event_buffer(void)
 {
        vfree(event_buffer);
+        event_buffer = NULL;
 }
 
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index e3a1e7e7dba2..9e6cec67e1cc 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -43,7 +43,6 @@ extern int pciehp_poll_mode;
 extern int pciehp_poll_time;
 extern int pciehp_debug;
 extern int pciehp_force;
-extern int pciehp_slot_with_bus;
 extern struct workqueue_struct *pciehp_wq;
 #define dbg(format, arg...)                                             \
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 3677495c4f91..4fd5355bc3b5 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -41,7 +41,6 @@ int pciehp_debug;
 int pciehp_poll_mode;
 int pciehp_poll_time;
 int pciehp_force;
-int pciehp_slot_with_bus;
 struct workqueue_struct *pciehp_wq;
 #define DRIVER_VERSION  "0.4"
@@ -56,12 +55,10 @@ module_param(pciehp_debug, bool, 0644);
 module_param(pciehp_poll_mode, bool, 0644);
 module_param(pciehp_poll_time, int, 0644);
 module_param(pciehp_force, bool, 0644);
-module_param(pciehp_slot_with_bus, bool, 0644);
 MODULE_PARM_DESC(pciehp_debug, "Debugging mode enabled or not");
 MODULE_PARM_DESC(pciehp_poll_mode, "Using polling mechanism for hot-plug events or not");
 MODULE_PARM_DESC(pciehp_poll_time, "Polling mechanism frequency, in seconds");
 MODULE_PARM_DESC(pciehp_force, "Force pciehp, even if _OSC and OSHP are missing");
-MODULE_PARM_DESC(pciehp_slot_with_bus, "Use bus number in the slot name");
 #define PCIE_MODULE_NAME "pciehp"
@@ -194,6 +191,7 @@ static int init_slots(struct controller *ctrl)
        struct slot *slot;
        struct hotplug_slot *hotplug_slot;
        struct hotplug_slot_info *info;
+        int len, dup = 1;
        int retval = -ENOMEM;
        list_for_each_entry(slot, &ctrl->slot_list, slot_list) {
@@ -220,15 +218,24 @@ static int init_slots(struct controller *ctrl)
                dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x "
                    "slot_device_offset=%x\n", slot->bus, slot->device,
                    slot->hp_slot, slot->number, ctrl->slot_device_offset);
+duplicate_name:
                retval = pci_hp_register(hotplug_slot,
                                         ctrl->pci_dev->subordinate,
                                         slot->device);
                if (retval) {
+                        /*
+                         * If slot N already exists, we'll try to create
+                         * slot N-1, N-2 ... N-M, until we overflow.
+                         */
+                        if (retval == -EEXIST) {
+                                len = snprintf(slot->name, SLOT_NAME_SIZE,
+                                               "%d-%d", slot->number, dup++);
+                                if (len < SLOT_NAME_SIZE)
+                                        goto duplicate_name;
+                                else
+                                        err("duplicate slot name overflow\n");
+                        }
                        err("pci_hp_register failed with error %d\n", retval);
-                        if (retval == -EEXIST)
-                                err("Failed to register slot because of name "
-                                    "collision. Try \'pciehp_slot_with_bus\' "
-                                    "module option.\n");
                        goto error_info;
                }
                /* create additional sysfs entries */
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index ad27e9e225a6..ab31f5ba665d 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -1030,15 +1030,6 @@ static void pcie_shutdown_notification(struct controller *ctrl)
        pciehp_free_irq(ctrl);
 }
-static void make_slot_name(struct slot *slot)
-{
-        if (pciehp_slot_with_bus)
-                snprintf(slot->name, SLOT_NAME_SIZE, "%04d_%04d",
-                         slot->bus, slot->number);
-        else
-                snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number);
-}
 static int pcie_init_slot(struct controller *ctrl)
 {
        struct slot *slot;
@@ -1053,7 +1044,7 @@ static int pcie_init_slot(struct controller *ctrl)
        slot->device = ctrl->slot_device_offset + slot->hp_slot;
        slot->hpc_ops = ctrl->hpc_ops;
        slot->number = ctrl->first_slot;
-        make_slot_name(slot);
+        snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number);
        mutex_init(&slot->lock);
        INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
        list_add(&slot->slot_list, &ctrl->slot_list);
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index a8cbd039b85b..cc38615395f1 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -39,7 +39,6 @@
 int shpchp_debug;
 int shpchp_poll_mode;
 int shpchp_poll_time;
-static int shpchp_slot_with_bus;
 struct workqueue_struct *shpchp_wq;
 #define DRIVER_VERSION  "0.4"
@@ -53,11 +52,9 @@ MODULE_LICENSE("GPL");
 module_param(shpchp_debug, bool, 0644);
 module_param(shpchp_poll_mode, bool, 0644);
 module_param(shpchp_poll_time, int, 0644);
-module_param(shpchp_slot_with_bus, bool, 0644);
 MODULE_PARM_DESC(shpchp_debug, "Debugging mode enabled or not");
 MODULE_PARM_DESC(shpchp_poll_mode, "Using polling mechanism for hot-plug events or not");
 MODULE_PARM_DESC(shpchp_poll_time, "Polling mechanism frequency, in seconds");
-MODULE_PARM_DESC(shpchp_slot_with_bus, "Use bus number in the slot name");
 #define SHPC_MODULE_NAME "shpchp"
@@ -99,23 +96,13 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
        kfree(slot);
 }
-static void make_slot_name(struct slot *slot)
-{
-        if (shpchp_slot_with_bus)
-                snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%04d_%04d",
-                         slot->bus, slot->number);
-        else
-                snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%d",
-                         slot->number);
-}
 static int init_slots(struct controller *ctrl)
 {
        struct slot *slot;
        struct hotplug_slot *hotplug_slot;
        struct hotplug_slot_info *info;
        int retval = -ENOMEM;
-        int i;
+        int i, len, dup = 1;
        for (i = 0; i < ctrl->num_slots; i++) {
                slot = kzalloc(sizeof(*slot), GFP_KERNEL);
@@ -146,7 +133,7 @@ static int init_slots(struct controller *ctrl)
                /* register this slot with the hotplug pci core */
                hotplug_slot->private = slot;
                hotplug_slot->release = &release_slot;
-                make_slot_name(slot);
+                snprintf(slot->name, SLOT_NAME_SIZE, "%d", slot->number);
                hotplug_slot->ops = &shpchp_hotplug_slot_ops;
                get_power_status(hotplug_slot, &info->power_status);
@@ -157,14 +144,23 @@ static int init_slots(struct controller *ctrl)
                dbg("Registering bus=%x dev=%x hp_slot=%x sun=%x "
                    "slot_device_offset=%x\n", slot->bus, slot->device,
                    slot->hp_slot, slot->number, ctrl->slot_device_offset);
+duplicate_name:
                retval = pci_hp_register(slot->hotplug_slot,
                                ctrl->pci_dev->subordinate, slot->device);
                if (retval) {
+                        /*
+                         * If slot N already exists, we'll try to create
+                         * slot N-1, N-2 ... N-M, until we overflow.
+                         */
+                        if (retval == -EEXIST) {
+                                len = snprintf(slot->name, SLOT_NAME_SIZE,
+                                               "%d-%d", slot->number, dup++);
+                                if (len < SLOT_NAME_SIZE)
+                                        goto duplicate_name;
+                                else
+                                        err("duplicate slot name overflow\n");
+                        }
                        err("pci_hp_register failed with error %d\n", retval);
-                        if (retval == -EEXIST)
-                                err("Failed to register slot because of name "
-                                    "collision. Try \'shpchp_slot_with_bus\' "
-                                    "module option.\n");
                        goto error_info;
                }
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 217814fef4ef..3b3b5f178797 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -280,6 +280,8 @@ static struct pci_dev *pci_get_dev_by_id(const struct pci_device_id *id,
                              match_pci_dev_by_id);
        if (dev)
                pdev = to_pci_dev(dev);
+        if (from)
+                pci_dev_put(from);
        return pdev;
 }
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 6ea349aba3ba..b184367637d0 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -800,7 +800,6 @@ static void __exit cmos_do_remove(struct device *dev)
 static int cmos_suspend(struct device *dev, pm_message_t mesg)
 {
        struct cmos_rtc *cmos = dev_get_drvdata(dev);
-        int             do_wake = device_may_wakeup(dev);
        unsigned char   tmp;
        /* only the alarm might be a wakeup event source */
@@ -809,7 +808,7 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
        if (tmp & (RTC_PIE|RTC_AIE|RTC_UIE)) {
                unsigned char   mask;
-                if (do_wake)
+                if (device_may_wakeup(dev))
                        mask = RTC_IRQMASK & ~RTC_AIE;
                else
                        mask = RTC_IRQMASK;
@@ -837,6 +836,17 @@ static int cmos_suspend(struct device *dev, pm_message_t mesg)
        return 0;
 }
+/* We want RTC alarms to wake us from e.g. ACPI G2/S5 "soft off", even
+ * after a detour through G3 "mechanical off", although the ACPI spec
+ * says wakeup should only work from G1/S4 "hibernate".  To most users,
+ * distinctions between S4 and S5 are pointless.  So when the hardware
+ * allows, don't draw that distinction.
+ */
+static inline int cmos_poweroff(struct device *dev)
+{
+        return cmos_suspend(dev, PMSG_HIBERNATE);
+}
 static int cmos_resume(struct device *dev)
 {
        struct cmos_rtc *cmos = dev_get_drvdata(dev);
@@ -884,6 +894,12 @@ static int cmos_resume(struct device *dev)
 #else
 #define cmos_suspend    NULL
 #define cmos_resume     NULL
+static inline int cmos_poweroff(struct device *dev)
+{
+        return -ENOSYS;
+}
 #endif
 /*----------------------------------------------------------------*/
@@ -903,10 +919,6 @@ static int cmos_resume(struct device *dev)
 static int __devinit
 cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
 {
-        /* REVISIT paranoia argues for a shutdown notifier, since PNP
-         * drivers can't provide shutdown() methods to disable IRQs.
-         * Or better yet, fix PNP to allow those methods...
-         */
        if (pnp_port_start(pnp,0) == 0x70 && !pnp_irq_valid(pnp,0))
                /* Some machines contain a PNP entry for the RTC, but
                 * don't define the IRQ. It should always be safe to
@@ -942,6 +954,13 @@ static int cmos_pnp_resume(struct pnp_dev *pnp)
 #define cmos_pnp_resume         NULL
 #endif
+static void cmos_pnp_shutdown(struct device *pdev)
+{
+        if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(pdev))
+                return;
+        cmos_do_shutdown();
+}
 static const struct pnp_device_id rtc_ids[] = {
        { .id = "PNP0b00", },
@@ -961,6 +980,10 @@ static struct pnp_driver cmos_pnp_driver = {
        .flags          = PNP_DRIVER_RES_DO_NOT_CHANGE,
        .suspend        = cmos_pnp_suspend,
        .resume         = cmos_pnp_resume,
+        .driver         = {
+                .name     = (char *)driver_name,
+                .shutdown = cmos_pnp_shutdown,
+        }
 };
 #endif  /* CONFIG_PNP */
@@ -986,6 +1009,9 @@ static int __exit cmos_platform_remove(struct platform_device *pdev)
 static void cmos_platform_shutdown(struct platform_device *pdev)
 {
+        if (system_state == SYSTEM_POWER_OFF && !cmos_poweroff(&pdev->dev))
+                return;
        cmos_do_shutdown();
 }
diff --git a/drivers/rtc/rtc-lib.c b/drivers/rtc/rtc-lib.c
index 9f996ec881ce..dd70bf73ce9d 100644
--- a/drivers/rtc/rtc-lib.c
+++ b/drivers/rtc/rtc-lib.c
@@ -51,10 +51,11 @@ EXPORT_SYMBOL(rtc_year_days);
 */
 void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
 {
-        unsigned int days, month, year;
+        unsigned int month, year;
+        int days;
        days = time / 86400;
-        time -= days * 86400;
+        time -= (unsigned int) days * 86400;
        /* day of the week, 1970-01-01 was a Thursday */
        tm->tm_wday = (days + 4) % 7;
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 12f0310ae89c..78b2551fb19d 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -20,8 +20,6 @@
 */
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/init.h>
diff --git a/drivers/rtc/rtc-r9701.c b/drivers/rtc/rtc-r9701.c
index b35f9bfa2af4..395985b339c9 100644
--- a/drivers/rtc/rtc-r9701.c
+++ b/drivers/rtc/rtc-r9701.c
@@ -14,7 +14,6 @@
 */
 #include <linux/module.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 1b6c52ef7339..acb78017e7d0 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2333,13 +2333,11 @@ int dasd_generic_notify(struct ccw_device *cdev, int event)
 {
        struct dasd_device *device;
        struct dasd_ccw_req *cqr;
-        unsigned long flags;
        int ret;
-        device = dasd_device_from_cdev(cdev);
+        device = dasd_device_from_cdev_locked(cdev);
        if (IS_ERR(device))
                return 0;
-        spin_lock_irqsave(get_ccwdev_lock(cdev), flags);
        ret = 0;
        switch (event) {
        case CIO_GONE:
@@ -2369,7 +2367,6 @@ int dasd_generic_notify(struct ccw_device *cdev, int event)
                ret = 1;
                break;
        }
-        spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
        dasd_put_device(device);
        return ret;
 }
diff --git a/drivers/s390/block/dasd_eckd.h b/drivers/s390/block/dasd_eckd.h
index 4bf0aa5112c1..2476f87d21d0 100644
--- a/drivers/s390/block/dasd_eckd.h
+++ b/drivers/s390/block/dasd_eckd.h
@@ -308,7 +308,7 @@ struct dasd_psf_prssd_data {
        unsigned char flags;
        unsigned char reserved[4];
        unsigned char suborder;
-        unsigned char varies[9];
+        unsigned char varies[5];
 } __attribute__ ((packed));
 /*
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 29da4413ad43..bf512ac75b9e 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -16,6 +16,7 @@
 #include <linux/poll.h>
 #include <linux/mutex.h>
 #include <linux/smp_lock.h>
+#include <linux/err.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
@@ -457,7 +458,7 @@ int dasd_eer_enable(struct dasd_device *device)
        cqr = dasd_kmalloc_request("ECKD", 1 /* SNSS */,
                                   SNSS_DATA_SIZE, device);
-        if (!cqr)
+        if (IS_ERR(cqr))
                return -ENOMEM;
        cqr->startdev = device;
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 01fcdd91b846..711b3004b3e6 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -384,6 +384,11 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
         * get minor, add to list
         */
        down_write(&dcssblk_devices_sem);
+        if (dcssblk_get_device_by_name(local_buf)) {
+                up_write(&dcssblk_devices_sem);
+                rc = -EEXIST;
+                goto unload_seg;
+        }
        rc = dcssblk_assign_free_minor(dev_info);
        if (rc) {
                up_write(&dcssblk_devices_sem);
diff --git a/drivers/s390/char/tape_char.c b/drivers/s390/char/tape_char.c
index 687720b552d1..be0ce2215c8d 100644
--- a/drivers/s390/char/tape_char.c
+++ b/drivers/s390/char/tape_char.c
@@ -109,7 +109,7 @@ tapechar_check_idalbuffer(struct tape_device *device, size_t block_size)
        /* The current idal buffer is not correct. Allocate a new one. */
        new = idal_buffer_alloc(block_size, 0);
-        if (new == NULL)
+        if (IS_ERR(new))
                return -ENOMEM;
        if (device->char_data.idal_buf != NULL)
diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index 2a1af4e60be0..cc8fd781ee22 100644
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -248,7 +248,7 @@ tape_std_mtsetblk(struct tape_device *device, int count)
        /* Allocate a new idal buffer. */
        new = idal_buffer_alloc(count, 0);
-        if (new == NULL)
+        if (IS_ERR(new))
                return -ENOMEM;
        if (device->char_data.idal_buf != NULL)
                idal_buffer_free(device->char_data.idal_buf);
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 26a930e832bd..e0ce65fca4e7 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -112,8 +112,10 @@ ccwgroup_release (struct device *dev)
        gdev = to_ccwgroupdev(dev);
        for (i = 0; i < gdev->count; i++) {
-                dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
+                if (gdev->cdev[i]) {
-                put_device(&gdev->cdev[i]->dev);
+                        dev_set_drvdata(&gdev->cdev[i]->dev, NULL);
+                        put_device(&gdev->cdev[i]->dev);
+                }
        }
        kfree(gdev);
 }
@@ -221,6 +223,13 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
        atomic_set(&gdev->onoff, 0);
        mutex_init(&gdev->reg_mutex);
        mutex_lock(&gdev->reg_mutex);
+        gdev->creator_id = creator_id;
+        gdev->count = num_devices;
+        gdev->dev.bus = &ccwgroup_bus_type;
+        gdev->dev.parent = root;
+        gdev->dev.release = ccwgroup_release;
+        device_initialize(&gdev->dev);
        curr_buf = buf;
        for (i = 0; i < num_devices && curr_buf; i++) {
                rc = __get_next_bus_id(&curr_buf, tmp_bus_id);
@@ -258,16 +267,11 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
                rc = -EINVAL;
                goto error;
        }
-        gdev->creator_id = creator_id;
-        gdev->count = num_devices;
-        gdev->dev.bus = &ccwgroup_bus_type;
-        gdev->dev.parent = root;
-        gdev->dev.release = ccwgroup_release;
        snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s",
                        gdev->cdev[0]->dev.bus_id);
-        rc = device_register(&gdev->dev);
+        rc = device_add(&gdev->dev);
        if (rc)
                goto error;
        get_device(&gdev->dev);
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 46c021d880dc..51489eff6b0b 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -477,7 +477,6 @@ void css_schedule_eval_all(void)
 void css_wait_for_slow_path(void)
 {
-        flush_workqueue(ccw_device_notify_work);
        flush_workqueue(slow_path_wq);
 }
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index e818d0c54c09..28221030b886 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -150,7 +150,6 @@ static struct css_driver io_subchannel_driver = {
 };
 struct workqueue_struct *ccw_device_work;
-struct workqueue_struct *ccw_device_notify_work;
 wait_queue_head_t ccw_device_init_wq;
 atomic_t ccw_device_init_count;
@@ -168,11 +167,6 @@ init_ccw_bus_type (void)
        ccw_device_work = create_singlethread_workqueue("cio");
        if (!ccw_device_work)
                return -ENOMEM; /* FIXME: better errno ? */
-        ccw_device_notify_work = create_singlethread_workqueue("cio_notify");
-        if (!ccw_device_notify_work) {
-                ret = -ENOMEM; /* FIXME: better errno ? */
-                goto out_err;
-        }
        slow_path_wq = create_singlethread_workqueue("kslowcrw");
        if (!slow_path_wq) {
                ret = -ENOMEM; /* FIXME: better errno ? */
@@ -192,8 +186,6 @@ init_ccw_bus_type (void)
 out_err:
        if (ccw_device_work)
                destroy_workqueue(ccw_device_work);
-        if (ccw_device_notify_work)
-                destroy_workqueue(ccw_device_notify_work);
        if (slow_path_wq)
                destroy_workqueue(slow_path_wq);
        return ret;
@@ -204,7 +196,6 @@ cleanup_ccw_bus_type (void)
 {
        css_driver_unregister(&io_subchannel_driver);
        bus_unregister(&ccw_bus_type);
-        destroy_workqueue(ccw_device_notify_work);
        destroy_workqueue(ccw_device_work);
 }
@@ -1496,11 +1487,22 @@ static void device_set_disconnected(struct ccw_device *cdev)
                ccw_device_schedule_recovery();
 }
+void ccw_device_set_notoper(struct ccw_device *cdev)
+{
+        struct subchannel *sch = to_subchannel(cdev->dev.parent);
+        CIO_TRACE_EVENT(2, "notoper");
+        CIO_TRACE_EVENT(2, sch->dev.bus_id);
+        ccw_device_set_timeout(cdev, 0);
+        cio_disable_subchannel(sch);
+        cdev->private->state = DEV_STATE_NOT_OPER;
+}
 static int io_subchannel_sch_event(struct subchannel *sch, int slow)
 {
        int event, ret, disc;
        unsigned long flags;
-        enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE } action;
+        enum { NONE, UNREGISTER, UNREGISTER_PROBE, REPROBE, DISC } action;
        struct ccw_device *cdev;
        spin_lock_irqsave(sch->lock, flags);
@@ -1535,16 +1537,11 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
                }
                /* fall through */
        case CIO_GONE:
-                /* Prevent unwanted effects when opening lock. */
-                cio_disable_subchannel(sch);
-                device_set_disconnected(cdev);
                /* Ask driver what to do with device. */
-                action = UNREGISTER;
+                if (io_subchannel_notify(sch, event))
-                spin_unlock_irqrestore(sch->lock, flags);
+                        action = DISC;
-                ret = io_subchannel_notify(sch, event);
+                else
-                spin_lock_irqsave(sch->lock, flags);
+                        action = UNREGISTER;
-                if (ret)
-                        action = NONE;
                break;
        case CIO_REVALIDATE:
                /* Device will be removed, so no notify necessary. */
@@ -1565,6 +1562,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
        switch (action) {
        case UNREGISTER:
        case UNREGISTER_PROBE:
+                ccw_device_set_notoper(cdev);
                /* Unregister device (will use subchannel lock). */
                spin_unlock_irqrestore(sch->lock, flags);
                css_sch_device_unregister(sch);
@@ -1577,6 +1575,9 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
        case REPROBE:
                ccw_device_trigger_reprobe(cdev);
                break;
+        case DISC:
+                device_set_disconnected(cdev);
+                break;
        default:
                break;
        }
@@ -1828,5 +1829,4 @@ EXPORT_SYMBOL(ccw_driver_unregister);
 EXPORT_SYMBOL(get_ccwdev_by_busid);
 EXPORT_SYMBOL(ccw_bus_type);
 EXPORT_SYMBOL(ccw_device_work);
-EXPORT_SYMBOL(ccw_device_notify_work);
 EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id);
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 9800a8335a3f..6f5c3f2b3587 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -72,7 +72,6 @@ dev_fsm_final_state(struct ccw_device *cdev)
 }
 extern struct workqueue_struct *ccw_device_work;
-extern struct workqueue_struct *ccw_device_notify_work;
 extern wait_queue_head_t ccw_device_init_wq;
 extern atomic_t ccw_device_init_count;
@@ -120,6 +119,7 @@ int ccw_device_stlck(struct ccw_device *);
 void ccw_device_trigger_reprobe(struct ccw_device *);
 void ccw_device_kill_io(struct ccw_device *);
 int ccw_device_notify(struct ccw_device *, int);
+void ccw_device_set_notoper(struct ccw_device *cdev);
 /* qdio needs this. */
 void ccw_device_set_timeout(struct ccw_device *, int);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 8b5fe57fb2f3..550508df952b 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -337,26 +337,34 @@ int ccw_device_notify(struct ccw_device *cdev, int event)
                return 0;
        if (!cdev->online)
                return 0;
+        CIO_MSG_EVENT(2, "notify called for 0.%x.%04x, event=%d\n",
+                      cdev->private->dev_id.ssid, cdev->private->dev_id.devno,
+                      event);
        return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0;
 }
-static void
+static void cmf_reenable_delayed(struct work_struct *work)
-ccw_device_oper_notify(struct work_struct *work)
 {
        struct ccw_device_private *priv;
        struct ccw_device *cdev;
-        int ret;
        priv = container_of(work, struct ccw_device_private, kick_work);
        cdev = priv->cdev;
-        ret = ccw_device_notify(cdev, CIO_OPER);
+        cmf_reenable(cdev);
-        if (ret) {
+}
+static void ccw_device_oper_notify(struct ccw_device *cdev)
+{
+        if (ccw_device_notify(cdev, CIO_OPER)) {
                /* Reenable channel measurements, if needed. */
-                cmf_reenable(cdev);
+                PREPARE_WORK(&cdev->private->kick_work, cmf_reenable_delayed);
-                wake_up(&cdev->private->wait_q);
+                queue_work(ccw_device_work, &cdev->private->kick_work);
-        } else
+                return;
-                /* Driver doesn't want device back. */
+        }
-                ccw_device_do_unreg_rereg(work);
+        /* Driver doesn't want device back. */
+        ccw_device_set_notoper(cdev);
+        PREPARE_WORK(&cdev->private->kick_work, ccw_device_do_unreg_rereg);
+        queue_work(ccw_device_work, &cdev->private->kick_work);
 }
 /*
@@ -386,8 +394,7 @@ ccw_device_done(struct ccw_device *cdev, int state)
        if (cdev->private->flags.donotify) {
                cdev->private->flags.donotify = 0;
-                PREPARE_WORK(&cdev->private->kick_work, ccw_device_oper_notify);
+                ccw_device_oper_notify(cdev);
-                queue_work(ccw_device_notify_work, &cdev->private->kick_work);
        }
        wake_up(&cdev->private->wait_q);
diff --git a/drivers/s390/cio/qdio_debug.h b/drivers/s390/cio/qdio_debug.h
index 8484b83698e1..5a4d85b829ad 100644
--- a/drivers/s390/cio/qdio_debug.h
+++ b/drivers/s390/cio/qdio_debug.h
@@ -61,18 +61,18 @@
 /* s390dbf views */
 #define QDIO_DBF_SETUP_LEN              8
-#define QDIO_DBF_SETUP_PAGES            4
+#define QDIO_DBF_SETUP_PAGES            8
 #define QDIO_DBF_SETUP_NR_AREAS         1
 #define QDIO_DBF_TRACE_LEN              8
 #define QDIO_DBF_TRACE_NR_AREAS         2
 #ifdef CONFIG_QDIO_DEBUG
-#define QDIO_DBF_TRACE_PAGES            16
+#define QDIO_DBF_TRACE_PAGES            32
 #define QDIO_DBF_SETUP_LEVEL            6
 #define QDIO_DBF_TRACE_LEVEL            4
 #else /* !CONFIG_QDIO_DEBUG */
-#define QDIO_DBF_TRACE_PAGES            4
+#define QDIO_DBF_TRACE_PAGES            8
 #define QDIO_DBF_SETUP_LEVEL            2
 #define QDIO_DBF_TRACE_LEVEL            2
 #endif /* CONFIG_QDIO_DEBUG */
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index d15648514a0f..e6eabc853422 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -330,6 +330,7 @@ static int qdio_siga_output(struct qdio_q *q)
        int cc;
        u32 busy_bit;
        u64 start_time = 0;
+        char dbf_text[15];
        QDIO_DBF_TEXT5(0, trace, "sigaout");
        QDIO_DBF_HEX5(0, trace, &q, sizeof(void *));
@@ -338,6 +339,9 @@ static int qdio_siga_output(struct qdio_q *q)
 again:
        cc = qdio_do_siga_output(q, &busy_bit);
        if (queue_type(q) == QDIO_IQDIO_QFMT && cc == 2 && busy_bit) {
+                sprintf(dbf_text, "bb%4x%2x", q->irq_ptr->schid.sch_no, q->nr);
+                QDIO_DBF_TEXT3(0, trace, dbf_text);
                if (!start_time)
                        start_time = get_usecs();
                else if ((get_usecs() - start_time) < QDIO_BUSY_BIT_PATIENCE)
@@ -748,16 +752,18 @@ static void qdio_kick_outbound_q(struct qdio_q *q)
        rc = qdio_siga_output(q);
        switch (rc) {
        case 0:
-                /* went smooth this time, reset timestamp */
-                q->u.out.timestamp = 0;
                /* TODO: improve error handling for CC=0 case */
 #ifdef CONFIG_QDIO_DEBUG
-                QDIO_DBF_TEXT3(0, trace, "cc2reslv");
+                if (q->u.out.timestamp) {
-                sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no, q->nr,
+                        QDIO_DBF_TEXT3(0, trace, "cc2reslv");
-                        atomic_read(&q->u.out.busy_siga_counter));
+                        sprintf(dbf_text, "%4x%2x%2x", q->irq_ptr->schid.sch_no,
-                QDIO_DBF_TEXT3(0, trace, dbf_text);
+                                q->nr,
+                                atomic_read(&q->u.out.busy_siga_counter));
+                        QDIO_DBF_TEXT3(0, trace, dbf_text);
+                }
 #endif /* CONFIG_QDIO_DEBUG */
+                /* went smooth this time, reset timestamp */
+                q->u.out.timestamp = 0;
                break;
        /* cc=2 and busy bit */
        case (2 | QDIO_ERROR_SIGA_BUSY):
@@ -1066,14 +1072,12 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
        if (IS_ERR(irb)) {
                switch (PTR_ERR(irb)) {
                case -EIO:
-                        sprintf(dbf_text, "ierr%4x",
+                        sprintf(dbf_text, "ierr%4x", irq_ptr->schid.sch_no);
-                                cdev->private->schid.sch_no);
                        QDIO_DBF_TEXT2(1, setup, dbf_text);
                        qdio_int_error(cdev);
                        return;
                case -ETIMEDOUT:
-                        sprintf(dbf_text, "qtoh%4x",
+                        sprintf(dbf_text, "qtoh%4x", irq_ptr->schid.sch_no);
-                                cdev->private->schid.sch_no);
                        QDIO_DBF_TEXT2(1, setup, dbf_text);
                        qdio_int_error(cdev);
                        return;
@@ -1124,8 +1128,10 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
 struct qdio_ssqd_desc *qdio_get_ssqd_desc(struct ccw_device *cdev)
 {
        struct qdio_irq *irq_ptr;
+        char dbf_text[15];
-        QDIO_DBF_TEXT0(0, setup, "getssqd");
+        sprintf(dbf_text, "qssq%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
        irq_ptr = cdev->private->qdio_data;
        if (!irq_ptr)
@@ -1149,14 +1155,13 @@ int qdio_cleanup(struct ccw_device *cdev, int how)
        char dbf_text[15];
        int rc;
+        sprintf(dbf_text, "qcln%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
        irq_ptr = cdev->private->qdio_data;
        if (!irq_ptr)
                return -ENODEV;
-        sprintf(dbf_text, "qcln%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
        rc = qdio_shutdown(cdev, how);
        if (rc == 0)
                rc = qdio_free(cdev);
@@ -1191,6 +1196,9 @@ int qdio_shutdown(struct ccw_device *cdev, int how)
        unsigned long flags;
        char dbf_text[15];
+        sprintf(dbf_text, "qshu%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
        irq_ptr = cdev->private->qdio_data;
        if (!irq_ptr)
                return -ENODEV;
@@ -1205,10 +1213,6 @@ int qdio_shutdown(struct ccw_device *cdev, int how)
                return 0;
        }
-        sprintf(dbf_text, "qsqs%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
        tiqdio_remove_input_queues(irq_ptr);
        qdio_shutdown_queues(cdev);
        qdio_shutdown_debug_entries(irq_ptr, cdev);
@@ -1247,7 +1251,6 @@ no_cleanup:
        qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE);
        mutex_unlock(&irq_ptr->setup_mutex);
-        module_put(THIS_MODULE);
        if (rc)
                return rc;
        return 0;
@@ -1263,16 +1266,14 @@ int qdio_free(struct ccw_device *cdev)
        struct qdio_irq *irq_ptr;
        char dbf_text[15];
+        sprintf(dbf_text, "qfre%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
        irq_ptr = cdev->private->qdio_data;
        if (!irq_ptr)
                return -ENODEV;
        mutex_lock(&irq_ptr->setup_mutex);
-        sprintf(dbf_text, "qfqs%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT1(0, trace, dbf_text);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
        cdev->private->qdio_data = NULL;
        mutex_unlock(&irq_ptr->setup_mutex);
@@ -1295,7 +1296,6 @@ int qdio_initialize(struct qdio_initialize *init_data)
        sprintf(dbf_text, "qini%4x", init_data->cdev->private->schid.sch_no);
        QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
        rc = qdio_allocate(init_data);
        if (rc)
@@ -1319,7 +1319,6 @@ int qdio_allocate(struct qdio_initialize *init_data)
        sprintf(dbf_text, "qalc%4x", init_data->cdev->private->schid.sch_no);
        QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
        if ((init_data->no_input_qs && !init_data->input_handler) ||
            (init_data->no_output_qs && !init_data->output_handler))
@@ -1389,6 +1388,9 @@ int qdio_establish(struct qdio_initialize *init_data)
        unsigned long saveflags;
        int rc;
+        sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
        irq_ptr = cdev->private->qdio_data;
        if (!irq_ptr)
                return -ENODEV;
@@ -1396,13 +1398,6 @@ int qdio_establish(struct qdio_initialize *init_data)
        if (cdev->private->state != DEV_STATE_ONLINE)
                return -EINVAL;
-        if (!try_module_get(THIS_MODULE))
-                return -EINVAL;
-        sprintf(dbf_text, "qest%4x", cdev->private->schid.sch_no);
-        QDIO_DBF_TEXT0(0, setup, dbf_text);
-        QDIO_DBF_TEXT0(0, trace, dbf_text);
        mutex_lock(&irq_ptr->setup_mutex);
        qdio_setup_irq(init_data);
@@ -1472,6 +1467,9 @@ int qdio_activate(struct ccw_device *cdev)
        unsigned long saveflags;
        char dbf_text[20];
+        sprintf(dbf_text, "qact%4x", cdev->private->schid.sch_no);
+        QDIO_DBF_TEXT0(0, setup, dbf_text);
        irq_ptr = cdev->private->qdio_data;
        if (!irq_ptr)
                return -ENODEV;
@@ -1485,10 +1483,6 @@ int qdio_activate(struct ccw_device *cdev)
                goto out;
        }
-        sprintf(dbf_text, "qact%4x", irq_ptr->schid.sch_no);
-        QDIO_DBF_TEXT2(0, setup, dbf_text);
-        QDIO_DBF_TEXT2(0, trace, dbf_text);
        irq_ptr->ccw.cmd_code = irq_ptr->aqueue.cmd;
        irq_ptr->ccw.flags = CCW_FLAG_SLI;
        irq_ptr->ccw.count = irq_ptr->aqueue.count;
@@ -1663,7 +1657,7 @@ int do_QDIO(struct ccw_device *cdev, unsigned int callflags,
 #ifdef CONFIG_QDIO_DEBUG
        char dbf_text[20];
-        sprintf(dbf_text, "doQD%04x", cdev->private->schid.sch_no);
+        sprintf(dbf_text, "doQD%4x", cdev->private->schid.sch_no);
        QDIO_DBF_TEXT3(0, trace, dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 1bd2a208db28..1679e2f91c94 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -165,7 +165,7 @@ static void setup_queues(struct qdio_irq *irq_ptr,
        void **output_sbal_array = qdio_init->output_sbal_addr_array;
        int i;
-        sprintf(dbf_text, "qfqs%4x", qdio_init->cdev->private->schid.sch_no);
+        sprintf(dbf_text, "qset%4x", qdio_init->cdev->private->schid.sch_no);
        QDIO_DBF_TEXT0(0, setup, dbf_text);
        for_each_input_queue(irq_ptr, q, i) {
@@ -285,7 +285,7 @@ void qdio_setup_ssqd_info(struct qdio_irq *irq_ptr)
        rc = __get_ssqd_info(irq_ptr);
        if (rc) {
                QDIO_DBF_TEXT2(0, setup, "ssqdasig");
-                sprintf(dbf_text, "schno%x", irq_ptr->schid.sch_no);
+                sprintf(dbf_text, "schn%4x", irq_ptr->schid.sch_no);
                QDIO_DBF_TEXT2(0, setup, dbf_text);
                sprintf(dbf_text, "rc:%d", rc);
                QDIO_DBF_TEXT2(0, setup, dbf_text);
@@ -447,7 +447,7 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
 {
        char s[80];
-        sprintf(s, "%s ", cdev->dev.bus_id);
+        sprintf(s, "%s sc:%x ", cdev->dev.bus_id, irq_ptr->schid.sch_no);
        switch (irq_ptr->qib.qfmt) {
        case QDIO_QETH_QFMT:
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c
index 9291a771d812..ea7f61400267 100644
--- a/drivers/s390/cio/qdio_thinint.c
+++ b/drivers/s390/cio/qdio_thinint.c
@@ -113,7 +113,11 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr)
        struct qdio_q *q;
        int i;
-        for_each_input_queue(irq_ptr, q, i) {
+        for (i = 0; i < irq_ptr->nr_input_qs; i++) {
+                q = irq_ptr->input_qs[i];
+                /* if establish triggered an error */
+                if (!q || !q->entry.prev || !q->entry.next)
+                        continue;
                list_del_rcu(&q->entry);
                synchronize_rcu();
        }
diff --git a/drivers/s390/net/ctcm_mpc.c b/drivers/s390/net/ctcm_mpc.c
index 407f816f091b..cbe470493bf0 100644
--- a/drivers/s390/net/ctcm_mpc.c
+++ b/drivers/s390/net/ctcm_mpc.c
@@ -19,7 +19,6 @@
 #undef DEBUGDATA
 #undef DEBUGCCW
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h
index 19406cea6d6a..179ad77f6cc9 100644
--- a/drivers/scsi/dpt/dpti_i2o.h
+++ b/drivers/scsi/dpt/dpti_i2o.h
@@ -21,7 +21,6 @@
 #include <linux/i2o-dev.h>
-#include <linux/version.h>
 #include <linux/notifier.h>
 #include <asm/atomic.h>
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 7c615c70ec5c..bc9e6ddf41df 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -165,7 +165,6 @@
 #include <asm/byteorder.h>
 #include <asm/page.h>
 #include <linux/stddef.h>
-#include <linux/version.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
index e0657b6f009c..4e49fbcfe8af 100644
--- a/drivers/scsi/ips.h
+++ b/drivers/scsi/ips.h
@@ -50,7 +50,6 @@
 #ifndef _IPS_H_
   #define _IPS_H_
-#include <linux/version.h>
 #include <linux/nmi.h>
   #include <asm/uaccess.h>
   #include <asm/io.h>
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
index 90272e65957a..094b47e94b29 100644
--- a/drivers/scsi/lpfc/lpfc_debugfs.c
+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -27,7 +27,6 @@
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 #include <linux/ctype.h>
-#include <linux/version.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index edf9fdb3cb3c..22052bb7becb 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -23,7 +23,6 @@
 *   1.2: PowerPC (big endian) support.
 */
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/drivers/scsi/nsp32.h b/drivers/scsi/nsp32.h
index 6715ecb3bfca..9565acf1aa72 100644
--- a/drivers/scsi/nsp32.h
+++ b/drivers/scsi/nsp32.h
@@ -16,7 +16,6 @@
 #ifndef _NSP32_H
 #define _NSP32_H
-#include <linux/version.h>
 //#define NSP32_DEBUG 9
 /*
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index a221b6ef9fa9..24e6cb8396e3 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -25,7 +25,6 @@
 ***********************************************************************/
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index 50baf6a1d67c..93560cd72784 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -6,7 +6,6 @@
 */
 #include "qla_def.h"
-#include <linux/version.h>
 #include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
 #include <linux/smp_lock.h>
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index e5e7d7856454..2a2bc89aba83 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1875,6 +1875,7 @@ static int sd_probe(struct device *dev)
        dev_set_drvdata(dev, sdkp);
        add_disk(gd);
+        blk_register_filter(gd);
        sd_dif_config_host(sdkp);
        sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
@@ -1908,6 +1909,7 @@ static int sd_remove(struct device *dev)
        struct scsi_disk *sdkp = dev_get_drvdata(dev);
        device_del(&sdkp->dev);
+        blk_unregister_filter(sdkp->disk);
        del_gendisk(sdkp->disk);
        sd_shutdown(dev);
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 3d36270a8b4d..661f9f21650a 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -217,6 +217,18 @@ static int sg_last_dev(void);
 #define SZ_SG_IOVEC sizeof(sg_iovec_t)
 #define SZ_SG_REQ_INFO sizeof(sg_req_info_t)
+static int sg_allow_access(struct file *filp, unsigned char *cmd)
+{
+        struct sg_fd *sfp = (struct sg_fd *)filp->private_data;
+        struct request_queue *q = sfp->parentdp->device->request_queue;
+        if (sfp->parentdp->device->type == TYPE_SCANNER)
+                return 0;
+        return blk_verify_command(&q->cmd_filter,
+                                  cmd, filp->f_mode & FMODE_WRITE);
+}
 static int
 sg_open(struct inode *inode, struct file *filp)
 {
@@ -689,7 +701,7 @@ sg_new_write(Sg_fd *sfp, struct file *file, const char __user *buf,
                sg_remove_request(sfp, srp);
                return -EFAULT;
        }
-        if (read_only && !blk_verify_command(file, cmnd)) {
+        if (read_only && sg_allow_access(file, cmnd)) {
                sg_remove_request(sfp, srp);
                return -EPERM;
        }
@@ -793,6 +805,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
        if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                return -ENXIO;
        SCSI_LOG_TIMEOUT(3, printk("sg_ioctl: %s, cmd=0x%x\n",
                                   sdp->disk->disk_name, (int) cmd_in));
        read_only = (O_RDWR != (filp->f_flags & O_ACCMODE));
@@ -1061,7 +1074,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
                        if (copy_from_user(&opcode, siocp->data, 1))
                                return -EFAULT;
-                        if (!blk_verify_command(filp, &opcode))
+                        if (sg_allow_access(filp, &opcode))
                                return -EPERM;
                }
                return sg_scsi_ioctl(filp, sdp->device->request_queue, NULL, p);
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 27f5bfd1def3..3292965bfd84 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -656,6 +656,7 @@ static int sr_probe(struct device *dev)
        dev_set_drvdata(dev, cd);
        disk->flags |= GENHD_FL_REMOVABLE;
        add_disk(disk);
+        blk_register_filter(disk);
        sdev_printk(KERN_DEBUG, sdev,
                    "Attached scsi CD-ROM %s\n", cd->cdi.name);
@@ -894,6 +895,7 @@ static int sr_remove(struct device *dev)
 {
        struct scsi_cd *cd = dev_get_drvdata(dev);
+        blk_unregister_filter(cd->disk);
        del_gendisk(cd->disk);
        mutex_lock(&sr_ref_mutex);
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 342e12fb1c25..9ccc563d8730 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1908,15 +1908,23 @@ static int serial8250_startup(struct uart_port *port)
                 * kick the UART on a regular basis.
                 */
                if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
+                        up->bugs |= UART_BUG_THRE;
                        pr_debug("ttyS%d - using backup timer\n", port->line);
-                        up->timer.function = serial8250_backup_timeout;
-                        up->timer.data = (unsigned long)up;
-                        mod_timer(&up->timer, jiffies +
-                                poll_timeout(up->port.timeout) + HZ / 5);
                }
        }
        /*
+         * The above check will only give an accurate result the first time
+         * the port is opened so this value needs to be preserved.
+         */
+        if (up->bugs & UART_BUG_THRE) {
+                up->timer.function = serial8250_backup_timeout;
+                up->timer.data = (unsigned long)up;
+                mod_timer(&up->timer, jiffies +
+                          poll_timeout(up->port.timeout) + HZ / 5);
+        }
+        /*
         * If the "interrupt" for this port doesn't correspond with any
         * hardware interrupt, we use a timer-based system.  The original
         * driver used to do this with IRQ0.
diff --git a/drivers/serial/8250.h b/drivers/serial/8250.h
index 78c00162b04e..520260326f3d 100644
--- a/drivers/serial/8250.h
+++ b/drivers/serial/8250.h
@@ -47,6 +47,7 @@ struct serial8250_config {
 #define UART_BUG_QUOT   (1 << 0)        /* UART has buggy quot LSB */
 #define UART_BUG_TXEN   (1 << 1)        /* UART has buggy TX IIR status */
 #define UART_BUG_NOMSR  (1 << 2)        /* UART has buggy MSR status bits (Au1x00) */
+#define UART_BUG_THRE   (1 << 3)        /* UART has buggy THRE reassertion */
 #define PROBE_RSA       (1 << 0)
 #define PROBE_ANY       (~0)
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index efcd44344fb1..4a0d30bed9f1 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -28,7 +28,7 @@
 #endif
 #include <asm/gpio.h>
-#include <asm/mach/bfin_serial_5xx.h>
+#include <mach/bfin_serial_5xx.h>
 #ifdef CONFIG_SERIAL_BFIN_DMA
 #include <linux/dma-mapping.h>
diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 2e9079df26b3..4190be64917f 100644
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -33,6 +33,19 @@ config UIO_PDRV
          If you don't know what to do here, say N.
+config UIO_PDRV_GENIRQ
+        tristate "Userspace I/O platform driver with generic IRQ handling"
+        help
+          Platform driver for Userspace I/O devices, including generic
+          interrupt handling code. Shared interrupts are not supported.
+          This kernel driver requires that the matching userspace driver
+          handles interrupts in a special way. Userspace is responsible
+          for acknowledging the hardware device if needed, and re-enabling
+          interrupts in the interrupt controller using the write() syscall.
+          If you don't know what to do here, say N.
 config UIO_SMX
        tristate "SMX cryptengine UIO interface"
        default n
diff --git a/drivers/uio/Makefile b/drivers/uio/Makefile
index e00ce0def1a0..8667bbdef904 100644
--- a/drivers/uio/Makefile
+++ b/drivers/uio/Makefile
@@ -1,4 +1,5 @@
 obj-$(CONFIG_UIO)       += uio.o
 obj-$(CONFIG_UIO_CIF)   += uio_cif.o
 obj-$(CONFIG_UIO_PDRV)  += uio_pdrv.o
+obj-$(CONFIG_UIO_PDRV_GENIRQ)   += uio_pdrv_genirq.o
 obj-$(CONFIG_UIO_SMX)   += uio_smx.o
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c
index 5d0d2e85d982..0b4ef39cd85d 100644
--- a/drivers/uio/uio_pdrv.c
+++ b/drivers/uio/uio_pdrv.c
@@ -88,6 +88,8 @@ static int uio_pdrv_remove(struct platform_device *pdev)
        uio_unregister_device(pdata->uioinfo);
+        kfree(pdata);
        return 0;
 }
@@ -114,5 +116,5 @@ module_exit(uio_pdrv_exit);
 MODULE_AUTHOR("Uwe Kleine-Koenig");
 MODULE_DESCRIPTION("Userspace I/O platform driver");
-MODULE_LICENSE("GPL");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c
new file mode 100644
index 000000000000..1f82c83a92ae
--- /dev/null
+++ b/drivers/uio/uio_pdrv_genirq.c
@@ -0,0 +1,188 @@
+/*
+ * drivers/uio/uio_pdrv_genirq.c
+ *
+ * Userspace I/O platform driver with generic IRQ handling code.
+ *
+ * Copyright (C) 2008 Magnus Damm
+ *
+ * Based on uio_pdrv.c by Uwe Kleine-Koenig,
+ * Copyright (C) 2008 by Digi International Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+#include <linux/platform_device.h>
+#include <linux/uio_driver.h>
+#include <linux/spinlock.h>
+#include <linux/bitops.h>
+#include <linux/interrupt.h>
+#include <linux/stringify.h>
+#define DRIVER_NAME "uio_pdrv_genirq"
+struct uio_pdrv_genirq_platdata {
+        struct uio_info *uioinfo;
+        spinlock_t lock;
+        unsigned long flags;
+};
+static irqreturn_t uio_pdrv_genirq_handler(int irq, struct uio_info *dev_info)
+{
+        struct uio_pdrv_genirq_platdata *priv = dev_info->priv;
+        /* Just disable the interrupt in the interrupt controller, and
+         * remember the state so we can allow user space to enable it later.
+         */
+        if (!test_and_set_bit(0, &priv->flags))
+                disable_irq_nosync(irq);
+        return IRQ_HANDLED;
+}
+static int uio_pdrv_genirq_irqcontrol(struct uio_info *dev_info, s32 irq_on)
+{
+        struct uio_pdrv_genirq_platdata *priv = dev_info->priv;
+        unsigned long flags;
+        /* Allow user space to enable and disable the interrupt
+         * in the interrupt controller, but keep track of the
+         * state to prevent per-irq depth damage.
+         *
+         * Serialize this operation to support multiple tasks.
+         */
+        spin_lock_irqsave(&priv->lock, flags);
+        if (irq_on) {
+                if (test_and_clear_bit(0, &priv->flags))
+                        enable_irq(dev_info->irq);
+        } else {
+                if (!test_and_set_bit(0, &priv->flags))
+                        disable_irq(dev_info->irq);
+        }
+        spin_unlock_irqrestore(&priv->lock, flags);
+        return 0;
+}
+static int uio_pdrv_genirq_probe(struct platform_device *pdev)
+{
+        struct uio_info *uioinfo = pdev->dev.platform_data;
+        struct uio_pdrv_genirq_platdata *priv;
+        struct uio_mem *uiomem;
+        int ret = -EINVAL;
+        int i;
+        if (!uioinfo || !uioinfo->name || !uioinfo->version) {
+                dev_err(&pdev->dev, "missing platform_data\n");
+                goto bad0;
+        }
+        if (uioinfo->handler || uioinfo->irqcontrol || uioinfo->irq_flags) {
+                dev_err(&pdev->dev, "interrupt configuration error\n");
+                goto bad0;
+        }
+        priv = kzalloc(sizeof(*priv), GFP_KERNEL);
+        if (!priv) {
+                ret = -ENOMEM;
+                dev_err(&pdev->dev, "unable to kmalloc\n");
+                goto bad0;
+        }
+        priv->uioinfo = uioinfo;
+        spin_lock_init(&priv->lock);
+        priv->flags = 0; /* interrupt is enabled to begin with */
+        uiomem = &uioinfo->mem[0];
+        for (i = 0; i < pdev->num_resources; ++i) {
+                struct resource *r = &pdev->resource[i];
+                if (r->flags != IORESOURCE_MEM)
+                        continue;
+                if (uiomem >= &uioinfo->mem[MAX_UIO_MAPS]) {
+                        dev_warn(&pdev->dev, "device has more than "
+                                        __stringify(MAX_UIO_MAPS)
+                                        " I/O memory resources.\n");
+                        break;
+                }
+                uiomem->memtype = UIO_MEM_PHYS;
+                uiomem->addr = r->start;
+                uiomem->size = r->end - r->start + 1;
+                ++uiomem;
+        }
+        while (uiomem < &uioinfo->mem[MAX_UIO_MAPS]) {
+                uiomem->size = 0;
+                ++uiomem;
+        }
+        /* This driver requires no hardware specific kernel code to handle
+         * interrupts. Instead, the interrupt handler simply disables the
+         * interrupt in the interrupt controller. User space is responsible
+         * for performing hardware specific acknowledge and re-enabling of
+         * the interrupt in the interrupt controller.
+         *
+         * Interrupt sharing is not supported.
+         */
+        uioinfo->irq_flags = IRQF_DISABLED;
+        uioinfo->handler = uio_pdrv_genirq_handler;
+        uioinfo->irqcontrol = uio_pdrv_genirq_irqcontrol;
+        uioinfo->priv = priv;
+        ret = uio_register_device(&pdev->dev, priv->uioinfo);
+        if (ret) {
+                dev_err(&pdev->dev, "unable to register uio device\n");
+                goto bad1;
+        }
+        platform_set_drvdata(pdev, priv);
+        return 0;
+ bad1:
+        kfree(priv);
+ bad0:
+        return ret;
+}
+static int uio_pdrv_genirq_remove(struct platform_device *pdev)
+{
+        struct uio_pdrv_genirq_platdata *priv = platform_get_drvdata(pdev);
+        uio_unregister_device(priv->uioinfo);
+        kfree(priv);
+        return 0;
+}
+static struct platform_driver uio_pdrv_genirq = {
+        .probe = uio_pdrv_genirq_probe,
+        .remove = uio_pdrv_genirq_remove,
+        .driver = {
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+        },
+};
+static int __init uio_pdrv_genirq_init(void)
+{
+        return platform_driver_register(&uio_pdrv_genirq);
+}
+static void __exit uio_pdrv_genirq_exit(void)
+{
+        platform_driver_unregister(&uio_pdrv_genirq);
+}
+module_init(uio_pdrv_genirq_init);
+module_exit(uio_pdrv_genirq_exit);
+MODULE_AUTHOR("Magnus Damm");
+MODULE_DESCRIPTION("Userspace I/O platform driver with generic IRQ handling");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index cb01b5106efd..b6483dd98acc 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -64,7 +64,6 @@
 #include <linux/ctype.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
-#include <linux/version.h>
 #include <linux/mutex.h>
 #include <linux/freezer.h>
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index efc4373ededb..c257453fa9de 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -589,8 +589,8 @@ static int acm_tty_open(struct tty_struct *tty, struct file *filp)
        tasklet_schedule(&acm->urb_task);
 done:
-err_out:
        mutex_unlock(&acm->mutex);
+err_out:
        mutex_unlock(&open_mutex);
        return rv;
@@ -1362,6 +1362,9 @@ static struct usb_device_id acm_ids[] = {
        { USB_DEVICE(0x0803, 0x3095), /* Zoom Telephonics Model 3095F USB MODEM */
        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
        },
+        { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */
+        .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+        },
        /* control interfaces with various AT-command sets */
        { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 2be37fe466f2..5a7fa6f09958 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -230,6 +230,13 @@ static int usb_probe_interface(struct device *dev)
                 */
                intf->pm_usage_cnt = !(driver->supports_autosuspend);
+                /* Carry out a deferred switch to altsetting 0 */
+                if (intf->needs_altsetting0) {
+                        usb_set_interface(udev, intf->altsetting[0].
+                                        desc.bInterfaceNumber, 0);
+                        intf->needs_altsetting0 = 0;
+                }
                error = driver->probe(intf, id);
                if (error) {
                        mark_quiesced(intf);
@@ -266,8 +273,17 @@ static int usb_unbind_interface(struct device *dev)
        driver->disconnect(intf);
-        /* reset other interface state */
+        /* Reset other interface state.
-        usb_set_interface(udev, intf->altsetting[0].desc.bInterfaceNumber, 0);
+         * We cannot do a Set-Interface if the device is suspended or
+         * if it is prepared for a system sleep (since installing a new
+         * altsetting means creating new endpoint device entries).
+         * When either of these happens, defer the Set-Interface.
+         */
+        if (!error && intf->dev.power.status == DPM_ON)
+                usb_set_interface(udev, intf->altsetting[0].
+                                desc.bInterfaceNumber, 0);
+        else
+                intf->needs_altsetting0 = 1;
        usb_set_intfdata(intf, NULL);
        intf->condition = USB_INTERFACE_UNBOUND;
@@ -798,7 +814,8 @@ void usb_forced_unbind_intf(struct usb_interface *intf)
 * The caller must hold @intf's device's lock, but not its pm_mutex
 * and not @intf->dev.sem.
 *
- * FIXME: The caller must block system sleep transitions.
+ * Note: Rebinds will be skipped if a system sleep transition is in
+ * progress and the PM "complete" callback hasn't occurred yet.
 */
 void usb_rebind_intf(struct usb_interface *intf)
 {
@@ -814,10 +831,12 @@ void usb_rebind_intf(struct usb_interface *intf)
        }
        /* Try to rebind the interface */
-        intf->needs_binding = 0;
+        if (intf->dev.power.status == DPM_ON) {
-        rc = device_attach(&intf->dev);
+                intf->needs_binding = 0;
-        if (rc < 0)
+                rc = device_attach(&intf->dev);
-                dev_warn(&intf->dev, "rebind failed: %d\n", rc);
+                if (rc < 0)
+                        dev_warn(&intf->dev, "rebind failed: %d\n", rc);
+        }
 }
 #ifdef CONFIG_PM
@@ -829,7 +848,6 @@ void usb_rebind_intf(struct usb_interface *intf)
 * or rebind interfaces that have been unbound, according to @action.
 *
 * The caller must hold @udev's device lock.
- * FIXME: For rebinds, the caller must block system sleep transitions.
 */
 static void do_unbind_rebind(struct usb_device *udev, int action)
 {
@@ -851,22 +869,8 @@ static void do_unbind_rebind(struct usb_device *udev, int action)
                                }
                                break;
                        case DO_REBIND:
-                                if (intf->needs_binding) {
+                                if (intf->needs_binding)
-        /* FIXME: The next line is needed because we are going to probe
-         * the interface, but as far as the PM core is concerned the
-         * interface is still suspended.  The problem wouldn't exist
-         * if we could rebind the interface during the interface's own
-         * resume() call, but at the time the usb_device isn't locked!
-         *
-         * The real solution will be to carry this out during the device's
-         * complete() callback.  Until that is implemented, we have to
-         * use this hack.
-         */
-//                                      intf->dev.power.sleeping = 0;
                                        usb_rebind_intf(intf);
-                                }
                                break;
                        }
                }
@@ -926,14 +930,14 @@ static int usb_resume_device(struct usb_device *udev)
 }
 /* Caller has locked intf's usb_device's pm mutex */
-static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
+static int usb_suspend_interface(struct usb_device *udev,
+                struct usb_interface *intf, pm_message_t msg)
 {
        struct usb_driver       *driver;
        int                     status = 0;
        /* with no hardware, USB interfaces only use FREEZE and ON states */
-        if (interface_to_usbdev(intf)->state == USB_STATE_NOTATTACHED ||
+        if (udev->state == USB_STATE_NOTATTACHED || !is_active(intf))
-                        !is_active(intf))
                goto done;
        if (intf->condition == USB_INTERFACE_UNBOUND)   /* This can't happen */
@@ -944,7 +948,7 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
                status = driver->suspend(intf, msg);
                if (status == 0)
                        mark_quiesced(intf);
-                else if (!interface_to_usbdev(intf)->auto_pm)
+                else if (!udev->auto_pm)
                        dev_err(&intf->dev, "%s error %d\n",
                                        "suspend", status);
        } else {
@@ -961,13 +965,13 @@ static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
 }
 /* Caller has locked intf's usb_device's pm_mutex */
-static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
+static int usb_resume_interface(struct usb_device *udev,
+                struct usb_interface *intf, int reset_resume)
 {
        struct usb_driver       *driver;
        int                     status = 0;
-        if (interface_to_usbdev(intf)->state == USB_STATE_NOTATTACHED ||
+        if (udev->state == USB_STATE_NOTATTACHED || is_active(intf))
-                        is_active(intf))
                goto done;
        /* Don't let autoresume interfere with unbinding */
@@ -975,8 +979,17 @@ static int usb_resume_interface(struct usb_interface *intf, int reset_resume)
                goto done;
        /* Can't resume it if it doesn't have a driver. */
-        if (intf->condition == USB_INTERFACE_UNBOUND)
+        if (intf->condition == USB_INTERFACE_UNBOUND) {
+                /* Carry out a deferred switch to altsetting 0 */
+                if (intf->needs_altsetting0 &&
+                                intf->dev.power.status == DPM_ON) {
+                        usb_set_interface(udev, intf->altsetting[0].
+                                        desc.bInterfaceNumber, 0);
+                        intf->needs_altsetting0 = 0;
+                }
                goto done;
+        }
        /* Don't resume if the interface is marked for rebinding */
        if (intf->needs_binding)
@@ -1151,7 +1164,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
        if (udev->actconfig) {
                for (; i < udev->actconfig->desc.bNumInterfaces; i++) {
                        intf = udev->actconfig->interface[i];
-                        status = usb_suspend_interface(intf, msg);
+                        status = usb_suspend_interface(udev, intf, msg);
                        if (status != 0)
                                break;
                }
@@ -1163,7 +1176,7 @@ static int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
        if (status != 0) {
                while (--i >= 0) {
                        intf = udev->actconfig->interface[i];
-                        usb_resume_interface(intf, 0);
+                        usb_resume_interface(udev, intf, 0);
                }
                /* Try another autosuspend when the interfaces aren't busy */
@@ -1276,7 +1289,7 @@ static int usb_resume_both(struct usb_device *udev)
        if (status == 0 && udev->actconfig) {
                for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
                        intf = udev->actconfig->interface[i];
-                        usb_resume_interface(intf, udev->reset_resume);
+                        usb_resume_interface(udev, intf, udev->reset_resume);
                }
        }
@@ -1605,12 +1618,10 @@ int usb_external_resume_device(struct usb_device *udev)
        return status;
 }
-static int usb_suspend(struct device *dev, pm_message_t message)
+int usb_suspend(struct device *dev, pm_message_t message)
 {
        struct usb_device       *udev;
-        if (!is_usb_device(dev))        /* Ignore PM for interfaces */
-                return 0;
        udev = to_usb_device(dev);
        /* If udev is already suspended, we can skip this suspend and
@@ -1629,12 +1640,10 @@ static int usb_suspend(struct device *dev, pm_message_t message)
        return usb_external_suspend_device(udev, message);
 }
-static int usb_resume(struct device *dev)
+int usb_resume(struct device *dev)
 {
        struct usb_device       *udev;
-        if (!is_usb_device(dev))        /* Ignore PM for interfaces */
-                return 0;
        udev = to_usb_device(dev);
        /* If udev->skip_sys_resume is set then udev was already suspended
@@ -1646,17 +1655,10 @@ static int usb_resume(struct device *dev)
        return usb_external_resume_device(udev);
 }
-#else
-#define usb_suspend     NULL
-#define usb_resume      NULL
 #endif /* CONFIG_PM */
 struct bus_type usb_bus_type = {
        .name =         "usb",
        .match =        usb_device_match,
        .uevent =       usb_uevent,
-        .suspend =      usb_suspend,
-        .resume =       usb_resume,
 };
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index f7bfd72ef115..8abd4e59bf4a 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -924,15 +924,6 @@ static int register_root_hub(struct usb_hcd *hcd)
        return retval;
 }
-void usb_enable_root_hub_irq (struct usb_bus *bus)
-{
-        struct usb_hcd *hcd;
-        hcd = container_of (bus, struct usb_hcd, self);
-        if (hcd->driver->hub_irq_enable && hcd->state != HC_STATE_HALT)
-                hcd->driver->hub_irq_enable (hcd);
-}
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 5b0b59b0d89b..e710ce04e228 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -212,8 +212,6 @@ struct hc_driver {
        int     (*bus_suspend)(struct usb_hcd *);
        int     (*bus_resume)(struct usb_hcd *);
        int     (*start_port_reset)(struct usb_hcd *, unsigned port_num);
-        void    (*hub_irq_enable)(struct usb_hcd *);
-                /* Needed only if port-change IRQs are level-triggered */
                /* force handover of high-speed port to full-speed companion */
        void    (*relinquish_port)(struct usb_hcd *, int);
@@ -379,8 +377,6 @@ extern struct list_head usb_bus_list;
 extern struct mutex usb_bus_list_lock;
 extern wait_queue_head_t usb_kill_urb_queue;
-extern void usb_enable_root_hub_irq(struct usb_bus *bus);
 extern int usb_find_interface_driver(struct usb_device *dev,
        struct usb_interface *interface);
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 107e1d25ddec..6a5cb018383d 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2102,8 +2102,6 @@ int usb_port_resume(struct usb_device *udev)
        }
        clear_bit(port1, hub->busy_bits);
-        if (!hub->hdev->parent && !hub->busy_bits[0])
-                usb_enable_root_hub_irq(hub->hdev->bus);
        status = check_port_resume_type(udev,
                        hub, port1, status, portchange, portstatus);
@@ -3081,11 +3079,6 @@ static void hub_events(void)
                        }
                }
-                /* If this is a root hub, tell the HCD it's okay to
-                 * re-enable port-change interrupts now. */
-                if (!hdev->parent && !hub->busy_bits[0])
-                        usb_enable_root_hub_irq(hdev->bus);
 loop_autopm:
                /* Allow autosuspend if we're not going to run again */
                if (list_empty(&hub->event_list))
@@ -3311,8 +3304,6 @@ static int usb_reset_and_verify_device(struct usb_device *udev)
                        break;
        }
        clear_bit(port1, parent_hub->busy_bits);
-        if (!parent_hdev->parent && !parent_hub->busy_bits[0])
-                usb_enable_root_hub_irq(parent_hdev->bus);
        if (ret < 0)
                goto re_enumerate;
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index c0b1ae25ae2a..47111e88f791 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -601,15 +601,20 @@ EXPORT_SYMBOL_GPL(usb_kill_anchored_urbs);
 void usb_unlink_anchored_urbs(struct usb_anchor *anchor)
 {
        struct urb *victim;
+        unsigned long flags;
-        spin_lock_irq(&anchor->lock);
+        spin_lock_irqsave(&anchor->lock, flags);
        while (!list_empty(&anchor->urb_list)) {
                victim = list_entry(anchor->urb_list.prev, struct urb,
                                    anchor_list);
+                usb_get_urb(victim);
+                spin_unlock_irqrestore(&anchor->lock, flags);
                /* this will unanchor the URB */
                usb_unlink_urb(victim);
+                usb_put_urb(victim);
+                spin_lock_irqsave(&anchor->lock, flags);
        }
-        spin_unlock_irq(&anchor->lock);
+        spin_unlock_irqrestore(&anchor->lock, flags);
 }
 EXPORT_SYMBOL_GPL(usb_unlink_anchored_urbs);
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 84fcaa6a21ec..be1fa0723f2c 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -219,12 +219,6 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env)
 }
 #endif  /* CONFIG_HOTPLUG */
-struct device_type usb_device_type = {
-        .name =         "usb_device",
-        .release =      usb_release_dev,
-        .uevent =       usb_dev_uevent,
-};
 #ifdef  CONFIG_PM
 static int ksuspend_usb_init(void)
@@ -244,13 +238,80 @@ static void ksuspend_usb_cleanup(void)
        destroy_workqueue(ksuspend_usb_wq);
 }
+/* USB device Power-Management thunks.
+ * There's no need to distinguish here between quiescing a USB device
+ * and powering it down; the generic_suspend() routine takes care of
+ * it by skipping the usb_port_suspend() call for a quiesce.  And for
+ * USB interfaces there's no difference at all.
+ */
+static int usb_dev_prepare(struct device *dev)
+{
+        return 0;               /* Implement eventually? */
+}
+static void usb_dev_complete(struct device *dev)
+{
+        /* Currently used only for rebinding interfaces */
+        usb_resume(dev);        /* Implement eventually? */
+}
+static int usb_dev_suspend(struct device *dev)
+{
+        return usb_suspend(dev, PMSG_SUSPEND);
+}
+static int usb_dev_resume(struct device *dev)
+{
+        return usb_resume(dev);
+}
+static int usb_dev_freeze(struct device *dev)
+{
+        return usb_suspend(dev, PMSG_FREEZE);
+}
+static int usb_dev_thaw(struct device *dev)
+{
+        return usb_resume(dev);
+}
+static int usb_dev_poweroff(struct device *dev)
+{
+        return usb_suspend(dev, PMSG_HIBERNATE);
+}
+static int usb_dev_restore(struct device *dev)
+{
+        return usb_resume(dev);
+}
+static struct pm_ops usb_device_pm_ops = {
+        .prepare =      usb_dev_prepare,
+        .complete =     usb_dev_complete,
+        .suspend =      usb_dev_suspend,
+        .resume =       usb_dev_resume,
+        .freeze =       usb_dev_freeze,
+        .thaw =         usb_dev_thaw,
+        .poweroff =     usb_dev_poweroff,
+        .restore =      usb_dev_restore,
+};
 #else
 #define ksuspend_usb_init()     0
 #define ksuspend_usb_cleanup()  do {} while (0)
+#define usb_device_pm_ops       (*(struct pm_ops *)0)
 #endif  /* CONFIG_PM */
+struct device_type usb_device_type = {
+        .name =         "usb_device",
+        .release =      usb_release_dev,
+        .uevent =       usb_dev_uevent,
+        .pm =           &usb_device_pm_ops,
+};
 /* Returns 1 if @usb_bus is WUSB, 0 otherwise */
 static unsigned usb_bus_is_wusb(struct usb_bus *bus)
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index d9a6e16dbf84..9a1a45ac3add 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -41,6 +41,9 @@ extern void usb_host_cleanup(void);
 #ifdef  CONFIG_PM
+extern int usb_suspend(struct device *dev, pm_message_t msg);
+extern int usb_resume(struct device *dev);
 extern void usb_autosuspend_work(struct work_struct *work);
 extern int usb_port_suspend(struct usb_device *dev);
 extern int usb_port_resume(struct usb_device *dev);
diff --git a/drivers/usb/gadget/amd5536udc.c b/drivers/usb/gadget/amd5536udc.c
index 1500e1b3c302..abf8192f89e8 100644
--- a/drivers/usb/gadget/amd5536udc.c
+++ b/drivers/usb/gadget/amd5536udc.c
@@ -44,7 +44,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/sched.h>
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index a28513ecbe5b..7cbc78a6853d 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1622,7 +1622,7 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
        struct pxa_udc *udc = the_controller;
        int retval;
-        if (!driver || driver->speed != USB_SPEED_FULL || !driver->bind
+        if (!driver || driver->speed < USB_SPEED_FULL || !driver->bind
                        || !driver->disconnect || !driver->setup)
                return -EINVAL;
        if (!udc)
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index 538807384592..29d13ebe7500 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -35,7 +35,6 @@
 #include <linux/list.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/version.h>
 #include <linux/clk.h>
 #include <linux/debugfs.h>
diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index d22a84f86a33..8017f1cf78e2 100644
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -988,7 +988,7 @@ static void do_atl_int(struct usb_hcd *usb_hcd)
                /*
                 * write bank1 address twice to ensure the 90ns delay (time
                 * between BANK0 write and the priv_read_copy() call is at
-                 * least 3*t_WHWL + 2*t_w11 = 3*25ns + 2*17ns = 92ns)
+                 * least 3*t_WHWL + 2*t_w11 = 3*25ns + 2*17ns = 109ns)
                 */
                isp1760_writel(payload  + ISP_BANK(1), usb_hcd->regs +
                                HC_MEMORY_REG);
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 6db7a2889e66..4ed228a89943 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -260,7 +260,6 @@ static const struct hc_driver ohci_at91_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index c0948008fe3d..2ac4e022a13f 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -163,7 +163,6 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index cb0b506f8259..fb3055f084b5 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -134,7 +134,6 @@ static struct hc_driver ohci_ep93xx_hc_driver = {
        .get_frame_number       = ohci_get_frame,
        .hub_status_data        = ohci_hub_status_data,
        .hub_control            = ohci_hub_control,
-        .hub_irq_enable         = ohci_rhsc_enable,
 #ifdef CONFIG_PM
        .bus_suspend            = ohci_bus_suspend,
        .bus_resume             = ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 439beb784f3e..7ea9a7b31155 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -36,18 +36,6 @@
 /*-------------------------------------------------------------------------*/
-/* hcd->hub_irq_enable() */
-static void ohci_rhsc_enable (struct usb_hcd *hcd)
-{
-        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
-        spin_lock_irq(&ohci->lock);
-        if (!ohci->autostop)
-                del_timer(&hcd->rh_timer);      /* Prevent next poll */
-        ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable);
-        spin_unlock_irq(&ohci->lock);
-}
 #define OHCI_SCHED_ENABLES \
        (OHCI_CTRL_CLE|OHCI_CTRL_BLE|OHCI_CTRL_PLE|OHCI_CTRL_IE)
@@ -374,18 +362,28 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
                int any_connected)
 {
        int     poll_rh = 1;
+        int     rhsc;
+        rhsc = ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC;
        switch (ohci->hc_control & OHCI_CTRL_HCFS) {
        case OHCI_USB_OPER:
-                /* keep on polling until we know a device is connected
+                /* If no status changes are pending, enable status-change
-                 * and RHSC is enabled */
+                 * interrupts.
+                 */
+                if (!rhsc && !changed) {
+                        rhsc = OHCI_INTR_RHSC;
+                        ohci_writel(ohci, rhsc, &ohci->regs->intrenable);
+                }
+                /* Keep on polling until we know a device is connected
+                 * and RHSC is enabled, or until we autostop.
+                 */
                if (!ohci->autostop) {
                        if (any_connected ||
                                        !device_may_wakeup(&ohci_to_hcd(ohci)
                                                ->self.root_hub->dev)) {
-                                if (ohci_readl(ohci, &ohci->regs->intrenable) &
+                                if (rhsc)
-                                                OHCI_INTR_RHSC)
                                        poll_rh = 0;
                        } else {
                                ohci->autostop = 1;
@@ -398,12 +396,13 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
                                ohci->autostop = 0;
                                ohci->next_statechange = jiffies +
                                                STATECHANGE_DELAY;
-                        } else if (time_after_eq(jiffies,
+                        } else if (rhsc && time_after_eq(jiffies,
                                                ohci->next_statechange)
                                        && !ohci->ed_rm_list
                                        && !(ohci->hc_control &
                                                OHCI_SCHED_ENABLES)) {
                                ohci_rh_suspend(ohci, 1);
+                                poll_rh = 0;
                        }
                }
                break;
@@ -417,6 +416,12 @@ static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
                        else
                                usb_hcd_resume_root_hub(ohci_to_hcd(ohci));
                } else {
+                        if (!rhsc && (ohci->autostop ||
+                                        ohci_to_hcd(ohci)->self.root_hub->
+                                                do_remote_wakeup))
+                                ohci_writel(ohci, OHCI_INTR_RHSC,
+                                                &ohci->regs->intrenable);
                        /* everything is idle, no need for polling */
                        poll_rh = 0;
                }
@@ -438,12 +443,16 @@ static inline int ohci_rh_resume(struct ohci_hcd *ohci)
 static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
                int any_connected)
 {
-        int     poll_rh = 1;
+        /* If RHSC is enabled, don't poll */
-        /* keep on polling until RHSC is enabled */
        if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC)
-                poll_rh = 0;
+                return 0;
-        return poll_rh;
+        /* If no status changes are pending, enable status-change interrupts */
+        if (!changed) {
+                ohci_writel(ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable);
+                return 0;
+        }
+        return 1;
 }
 #endif  /* CONFIG_PM */
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index 9e31d440d115..de42283149c7 100644
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -193,7 +193,6 @@ static const struct hc_driver ohci_lh7a404_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 3d532b709670..1eb64d08b60a 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -470,7 +470,6 @@ static const struct hc_driver ohci_omap_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 083e8df0a817..a9c2ae36c7ad 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -459,7 +459,6 @@ static const struct hc_driver ohci_pci_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index b02cd0761977..658a2a978c32 100644
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -277,7 +277,6 @@ static const struct hc_driver ohci_pnx4008_hc_driver = {
         */
        .hub_status_data = ohci_hub_status_data,
        .hub_control = ohci_hub_control,
-        .hub_irq_enable = ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend = ohci_bus_suspend,
        .bus_resume = ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c
index 605d59cba28e..28467e288a93 100644
--- a/drivers/usb/host/ohci-pnx8550.c
+++ b/drivers/usb/host/ohci-pnx8550.c
@@ -201,7 +201,6 @@ static const struct hc_driver ohci_pnx8550_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 91e6e101a4cc..7ac53264ead3 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -72,7 +72,6 @@ static const struct hc_driver ohci_ppc_of_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index 523c30125577..cd3398b675b2 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -172,7 +172,6 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ps3.c b/drivers/usb/host/ohci-ps3.c
index 55c95647f008..2089d8a46c4b 100644
--- a/drivers/usb/host/ohci-ps3.c
+++ b/drivers/usb/host/ohci-ps3.c
@@ -68,7 +68,6 @@ static const struct hc_driver ps3_ohci_hc_driver = {
        .get_frame_number       = ohci_get_frame,
        .hub_status_data        = ohci_hub_status_data,
        .hub_control            = ohci_hub_control,
-        .hub_irq_enable         = ohci_rhsc_enable,
        .start_port_reset       = ohci_start_port_reset,
 #if defined(CONFIG_PM)
        .bus_suspend            = ohci_bus_suspend,
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index 8c9c4849db6e..7f0f35c78185 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -298,7 +298,6 @@ static const struct hc_driver ohci_pxa27x_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 9e3dc4069e8b..f46af7a718d4 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -466,7 +466,6 @@ static const struct hc_driver ohci_s3c2410_hc_driver = {
         */
        .hub_status_data =      ohci_s3c2410_hub_status_data,
        .hub_control =          ohci_s3c2410_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 4626b002e670..e4bbe8e188e4 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -231,7 +231,6 @@ static const struct hc_driver ohci_sa1111_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c
index e7ee607278fe..60f03cc7ec4f 100644
--- a/drivers/usb/host/ohci-sh.c
+++ b/drivers/usb/host/ohci-sh.c
@@ -68,7 +68,6 @@ static const struct hc_driver ohci_sh_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 21b164e4abeb..cff23637cfcc 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -75,7 +75,6 @@ static const struct hc_driver ohci_sm501_hc_driver = {
         */
        .hub_status_data =      ohci_hub_status_data,
        .hub_control =          ohci_hub_control,
-        .hub_irq_enable =       ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend =          ohci_bus_suspend,
        .bus_resume =           ohci_bus_resume,
diff --git a/drivers/usb/host/ohci-ssb.c b/drivers/usb/host/ohci-ssb.c
index 3660c83d80af..23fd6a886bdd 100644
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -81,7 +81,6 @@ static const struct hc_driver ssb_ohci_hc_driver = {
        .hub_status_data        = ohci_hub_status_data,
        .hub_control            = ohci_hub_control,
-        .hub_irq_enable         = ohci_rhsc_enable,
 #ifdef  CONFIG_PM
        .bus_suspend            = ohci_bus_suspend,
        .bus_resume             = ohci_bus_resume,
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 20ad3c48fcb2..228f2b070f2b 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -2934,16 +2934,6 @@ static int u132_start_port_reset(struct usb_hcd *hcd, unsigned port_num)
                return 0;
 }
-static void u132_hub_irq_enable(struct usb_hcd *hcd)
-{
-        struct u132 *u132 = hcd_to_u132(hcd);
-        if (u132->going > 1) {
-                dev_err(&u132->platform_dev->dev, "device has been removed %d\n"
-                        , u132->going);
-        } else if (u132->going > 0)
-                dev_err(&u132->platform_dev->dev, "device is being removed\n");
-}
 #ifdef CONFIG_PM
 static int u132_bus_suspend(struct usb_hcd *hcd)
@@ -2995,7 +2985,6 @@ static struct hc_driver u132_hc_driver = {
        .bus_suspend = u132_bus_suspend,
        .bus_resume = u132_bus_resume,
        .start_port_reset = u132_start_port_reset,
-        .hub_irq_enable = u132_hub_irq_enable,
 };
 /*
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index e6ca9979e3ae..a4ef77ef917d 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -19,7 +19,6 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/poll.h>
-#include <linux/version.h>
 #include <linux/usb/iowarrior.h>
 /* Version Information */
diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index fbace41a7cba..69c34a58e205 100644
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -3270,6 +3270,7 @@ static struct usb_device_id sisusb_table [] = {
        { USB_DEVICE(0x0711, 0x0900) },
        { USB_DEVICE(0x0711, 0x0901) },
        { USB_DEVICE(0x0711, 0x0902) },
+        { USB_DEVICE(0x0711, 0x0918) },
        { USB_DEVICE(0x182d, 0x021c) },
        { USB_DEVICE(0x182d, 0x0269) },
        { }
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index faca4333f27a..a0017486ad4e 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -165,12 +165,11 @@ config USB_TUSB_OMAP_DMA
        help
          Enable DMA transfers on TUSB 6010 when OMAP DMA is available.
-config  USB_MUSB_LOGLEVEL
+config  USB_MUSB_DEBUG
        depends on USB_MUSB_HDRC
-        int  'Logging Level (0 - none / 3 - annoying / ... )'
+        bool "Enable debugging messages"
-        default 0
+        default n
        help
-          Set the logging level. 0 disables the debugging altogether,
+          This enables musb debugging. To set the logging level use the debug
-          although when USB_DEBUG is set the value is at least 1.
+          module parameter. Starting at level 3, per-transfer (urb, usb_request,
-          Starting at level 3, per-transfer (urb, usb_request, packet,
+          packet, or dma transfer) tracing may kick in.
-          or dma transfer) tracing may kick in.
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 88eb67de08ae..b6af0d687a73 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -64,23 +64,6 @@ endif
 # Debugging
-MUSB_DEBUG:=$(CONFIG_USB_MUSB_LOGLEVEL)
+ifeq ($(CONFIG_USB_MUSB_DEBUG),y)
+        EXTRA_CFLAGS += -DDEBUG
-ifeq ("$(strip $(MUSB_DEBUG))","")
-    ifdef CONFIG_USB_DEBUG
-        MUSB_DEBUG:=1
-    else
-        MUSB_DEBUG:=0
-    endif
 endif
-ifneq ($(MUSB_DEBUG),0)
-    EXTRA_CFLAGS += -DDEBUG
-    ifeq ($(CONFIG_PROC_FS),y)
-        musb_hdrc-objs          += musb_procfs.o
-    endif
-endif
-EXTRA_CFLAGS += -DMUSB_DEBUG=$(MUSB_DEBUG)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index d68ec6daf335..c5b8f0296fcf 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -114,23 +114,14 @@
-#if MUSB_DEBUG > 0
+unsigned debug;
-unsigned debug = MUSB_DEBUG;
+module_param(debug, uint, S_IRUGO | S_IWUSR);
-module_param(debug, uint, 0);
+MODULE_PARM_DESC(debug, "Debug message level. Default = 0");
-MODULE_PARM_DESC(debug, "initial debug message level");
-#define MUSB_VERSION_SUFFIX     "/dbg"
-#endif
 #define DRIVER_AUTHOR "Mentor Graphics, Texas Instruments, Nokia"
 #define DRIVER_DESC "Inventra Dual-Role USB Controller Driver"
-#define MUSB_VERSION_BASE "6.0"
+#define MUSB_VERSION "6.0"
-#ifndef MUSB_VERSION_SUFFIX
-#define MUSB_VERSION_SUFFIX     ""
-#endif
-#define MUSB_VERSION    MUSB_VERSION_BASE MUSB_VERSION_SUFFIX
 #define DRIVER_INFO DRIVER_DESC ", v" MUSB_VERSION
@@ -2037,6 +2028,8 @@ bad_config:
                musb->xceiv.state = OTG_STATE_A_IDLE;
                status = usb_add_hcd(musb_to_hcd(musb), -1, 0);
+                if (status)
+                        goto fail;
                DBG(1, "%s mode, status %d, devctl %02x %c\n",
                        "HOST", status,
@@ -2051,6 +2044,8 @@ bad_config:
                musb->xceiv.state = OTG_STATE_B_IDLE;
                status = musb_gadget_setup(musb);
+                if (status)
+                        goto fail;
                DBG(1, "%s mode, status %d, dev%02x\n",
                        is_otg_enabled(musb) ? "OTG" : "PERIPHERAL",
@@ -2059,16 +2054,14 @@ bad_config:
        }
-        if (status == 0)
+        return 0;
-                musb_debug_create("driver/musb_hdrc", musb);
-        else {
 fail:
-                if (musb->clock)
+        if (musb->clock)
-                        clk_put(musb->clock);
+                clk_put(musb->clock);
-                device_init_wakeup(dev, 0);
+        device_init_wakeup(dev, 0);
-                musb_free(musb);
+        musb_free(musb);
-                return status;
+        return status;
-        }
 #ifdef CONFIG_SYSFS
        status = device_create_file(dev, &dev_attr_mode);
@@ -2131,7 +2124,6 @@ static int __devexit musb_remove(struct platform_device *pdev)
         *  - OTG mode: both roles are deactivated (or never-activated)
         */
        musb_shutdown(pdev);
-        musb_debug_delete("driver/musb_hdrc", musb);
 #ifdef CONFIG_USB_MUSB_HDRC_HCD
        if (musb->board_mode == MUSB_HOST)
                usb_remove_hcd(musb_to_hcd(musb));
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index eade46d81708..82227251931b 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -485,23 +485,4 @@ extern int musb_platform_get_vbus_status(struct musb *musb);
 extern int __init musb_platform_init(struct musb *musb);
 extern int musb_platform_exit(struct musb *musb);
-/*-------------------------- ProcFS definitions ---------------------*/
-struct proc_dir_entry;
-#if (MUSB_DEBUG > 0) && defined(MUSB_CONFIG_PROC_FS)
-extern struct proc_dir_entry *musb_debug_create(char *name, struct musb *data);
-extern void musb_debug_delete(char *name, struct musb *data);
-#else
-static inline struct proc_dir_entry *
-musb_debug_create(char *name, struct musb *data)
-{
-        return NULL;
-}
-static inline void musb_debug_delete(char *name, struct musb *data)
-{
-}
-#endif
 #endif  /* __MUSB_CORE_H__ */
diff --git a/drivers/usb/musb/musb_debug.h b/drivers/usb/musb/musb_debug.h
index 3bdb311e820d..4d2794441b15 100644
--- a/drivers/usb/musb/musb_debug.h
+++ b/drivers/usb/musb/musb_debug.h
@@ -48,11 +48,7 @@
                                __func__, __LINE__ , ## args); \
        } } while (0)
-#if MUSB_DEBUG > 0
 extern unsigned debug;
-#else
-#define debug   0
-#endif
 static inline int _dbg_level(unsigned l)
 {
diff --git a/drivers/usb/musb/musb_gadget_ep0.c b/drivers/usb/musb/musb_gadget_ep0.c
index 48d7d3ccb243..a57652fff39c 100644
--- a/drivers/usb/musb/musb_gadget_ep0.c
+++ b/drivers/usb/musb/musb_gadget_ep0.c
@@ -476,6 +476,7 @@ static void ep0_rxstate(struct musb *musb)
                        return;
                musb->ackpend = 0;
        }
+        musb_ep_select(musb->mregs, 0);
        musb_writew(regs, MUSB_CSR0, tmp);
 }
@@ -528,6 +529,7 @@ static void ep0_txstate(struct musb *musb)
        }
        /* send it out, triggering a "txpktrdy cleared" irq */
+        musb_ep_select(musb->mregs, 0);
        musb_writew(regs, MUSB_CSR0, csr);
 }
diff --git a/drivers/usb/musb/musb_procfs.c b/drivers/usb/musb/musb_procfs.c
deleted file mode 100644
index 55e6b78bdccc..000000000000
--- a/drivers/usb/musb/musb_procfs.c
+++ /dev/null
@@ -1,830 +0,0 @@
-/*
- * MUSB OTG driver debug support
- *
- * Copyright 2005 Mentor Graphics Corporation
- * Copyright (C) 2005-2006 by Texas Instruments
- * Copyright (C) 2006-2007 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- * NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#include <linux/kernel.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/uaccess.h>      /* FIXME remove procfs writes */
-#include <asm/arch/hardware.h>
-#include "musb_core.h"
-#include "davinci.h"
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
-static int dump_qh(struct musb_qh *qh, char *buf, unsigned max)
-{
-        int                             count;
-        int                             tmp;
-        struct usb_host_endpoint        *hep = qh->hep;
-        struct urb                      *urb;
-        count = snprintf(buf, max, "    qh %p dev%d ep%d%s max%d\n",
-                        qh, qh->dev->devnum, qh->epnum,
-                        ({ char *s; switch (qh->type) {
-                        case USB_ENDPOINT_XFER_BULK:
-                                s = "-bulk"; break;
-                        case USB_ENDPOINT_XFER_INT:
-                                s = "-int"; break;
-                        case USB_ENDPOINT_XFER_CONTROL:
-                                s = ""; break;
-                        default:
-                                s = "iso"; break;
-                        }; s; }),
-                        qh->maxpacket);
-        if (count <= 0)
-                return 0;
-        buf += count;
-        max -= count;
-        list_for_each_entry(urb, &hep->urb_list, urb_list) {
-                tmp = snprintf(buf, max, "\t%s urb %p %d/%d\n",
-                                usb_pipein(urb->pipe) ? "in" : "out",
-                                urb, urb->actual_length,
-                                urb->transfer_buffer_length);
-                if (tmp <= 0)
-                        break;
-                tmp = min(tmp, (int)max);
-                count += tmp;
-                buf += tmp;
-                max -= tmp;
-        }
-        return count;
-}
-static int
-dump_queue(struct list_head *q, char *buf, unsigned max)
-{
-        int             count = 0;
-        struct musb_qh  *qh;
-        list_for_each_entry(qh, q, ring) {
-                int     tmp;
-                tmp = dump_qh(qh, buf, max);
-                if (tmp <= 0)
-                        break;
-                tmp = min(tmp, (int)max);
-                count += tmp;
-                buf += tmp;
-                max -= tmp;
-        }
-        return count;
-}
-#endif  /* HCD */
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
-static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max)
-{
-        char            *buf = buffer;
-        int             code = 0;
-        void __iomem    *regs = ep->hw_ep->regs;
-        char            *mode = "1buf";
-        if (ep->is_in) {
-                if (ep->hw_ep->tx_double_buffered)
-                        mode = "2buf";
-        } else {
-                if (ep->hw_ep->rx_double_buffered)
-                        mode = "2buf";
-        }
-        do {
-                struct usb_request      *req;
-                code = snprintf(buf, max,
-                                "\n%s (hw%d): %s%s, csr %04x maxp %04x\n",
-                                ep->name, ep->current_epnum,
-                                mode, ep->dma ? " dma" : "",
-                                musb_readw(regs,
-                                        (ep->is_in || !ep->current_epnum)
-                                                ? MUSB_TXCSR
-                                                : MUSB_RXCSR),
-                                musb_readw(regs, ep->is_in
-                                                ? MUSB_TXMAXP
-                                                : MUSB_RXMAXP)
-                                );
-                if (code <= 0)
-                        break;
-                code = min(code, (int) max);
-                buf += code;
-                max -= code;
-                if (is_cppi_enabled() && ep->current_epnum) {
-                        unsigned        cppi = ep->current_epnum - 1;
-                        void __iomem    *base = ep->musb->ctrl_base;
-                        unsigned        off1 = cppi << 2;
-                        void __iomem    *ram = base;
-                        char            tmp[16];
-                        if (ep->is_in) {
-                                ram += DAVINCI_TXCPPI_STATERAM_OFFSET(cppi);
-                                tmp[0] = 0;
-                        } else {
-                                ram += DAVINCI_RXCPPI_STATERAM_OFFSET(cppi);
-                                snprintf(tmp, sizeof tmp, "%d left, ",
-                                        musb_readl(base,
-                                        DAVINCI_RXCPPI_BUFCNT0_REG + off1));
-                        }
-                        code = snprintf(buf, max, "%cX DMA%d: %s"
-                                        "%08x %08x, %08x %08x; "
-                                        "%08x %08x %08x .. %08x\n",
-                                ep->is_in ? 'T' : 'R',
-                                ep->current_epnum - 1, tmp,
-                                musb_readl(ram, 0 * 4),
-                                musb_readl(ram, 1 * 4),
-                                musb_readl(ram, 2 * 4),
-                                musb_readl(ram, 3 * 4),
-                                musb_readl(ram, 4 * 4),
-                                musb_readl(ram, 5 * 4),
-                                musb_readl(ram, 6 * 4),
-                                musb_readl(ram, 7 * 4));
-                        if (code <= 0)
-                                break;
-                        code = min(code, (int) max);
-                        buf += code;
-                        max -= code;
-                }
-                if (list_empty(&ep->req_list)) {
-                        code = snprintf(buf, max, "\t(queue empty)\n");
-                        if (code <= 0)
-                                break;
-                        code = min(code, (int) max);
-                        buf += code;
-                        max -= code;
-                        break;
-                }
-                list_for_each_entry(req, &ep->req_list, list) {
-                        code = snprintf(buf, max, "\treq %p, %s%s%d/%d\n",
-                                        req,
-                                        req->zero ? "zero, " : "",
-                                        req->short_not_ok ? "!short, " : "",
-                                        req->actual, req->length);
-                        if (code <= 0)
-                                break;
-                        code = min(code, (int) max);
-                        buf += code;
-                        max -= code;
-                }
-        } while (0);
-        return buf - buffer;
-}
-#endif
-static int
-dump_end_info(struct musb *musb, u8 epnum, char *aBuffer, unsigned max)
-{
-        int                     code = 0;
-        char                    *buf = aBuffer;
-        struct musb_hw_ep       *hw_ep = &musb->endpoints[epnum];
-        do {
-                musb_ep_select(musb->mregs, epnum);
-#ifdef CONFIG_USB_MUSB_HDRC_HCD
-                if (is_host_active(musb)) {
-                        int             dump_rx, dump_tx;
-                        void __iomem    *regs = hw_ep->regs;
-                        /* TEMPORARY (!) until we have a real periodic
-                         * schedule tree ...
-                         */
-                        if (!epnum) {
-                                /* control is shared, uses RX queue
-                                 * but (mostly) shadowed tx registers
-                                 */
-                                dump_tx = !list_empty(&musb->control);
-                                dump_rx = 0;
-                        } else if (hw_ep == musb->bulk_ep) {
-                                dump_tx = !list_empty(&musb->out_bulk);
-                                dump_rx = !list_empty(&musb->in_bulk);
-                        } else if (musb->periodic[epnum]) {
-                                struct usb_host_endpoint        *hep;
-                                hep = musb->periodic[epnum]->hep;
-                                dump_rx = hep->desc.bEndpointAddress
-                                                & USB_ENDPOINT_DIR_MASK;
-                                dump_tx = !dump_rx;
-                        } else
-                                break;
-                        /* END TEMPORARY */
-                        if (dump_rx) {
-                                code = snprintf(buf, max,
-                                        "\nRX%d: %s rxcsr %04x interval %02x "
-                                        "max %04x type %02x; "
-                                        "dev %d hub %d port %d"
-                                        "\n",
-                                        epnum,
-                                        hw_ep->rx_double_buffered
-                                                ? "2buf" : "1buf",
-                                        musb_readw(regs, MUSB_RXCSR),
-                                        musb_readb(regs, MUSB_RXINTERVAL),
-                                        musb_readw(regs, MUSB_RXMAXP),
-                                        musb_readb(regs, MUSB_RXTYPE),
-                                        /* FIXME:  assumes multipoint */
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_RXFUNCADDR)),
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_RXHUBADDR)),
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_RXHUBPORT))
-                                        );
-                                if (code <= 0)
-                                        break;
-                                code = min(code, (int) max);
-                                buf += code;
-                                max -= code;
-                                if (is_cppi_enabled()
-                                                && epnum
-                                                && hw_ep->rx_channel) {
-                                        unsigned        cppi = epnum - 1;
-                                        unsigned        off1 = cppi << 2;
-                                        void __iomem    *base;
-                                        void __iomem    *ram;
-                                        char            tmp[16];
-                                        base = musb->ctrl_base;
-                                        ram = DAVINCI_RXCPPI_STATERAM_OFFSET(
-                                                        cppi) + base;
-                                        snprintf(tmp, sizeof tmp, "%d left, ",
-                                                musb_readl(base,
-                                                DAVINCI_RXCPPI_BUFCNT0_REG
-                                                                + off1));
-                                        code = snprintf(buf, max,
-                                                "    rx dma%d: %s"
-                                                "%08x %08x, %08x %08x; "
-                                                "%08x %08x %08x .. %08x\n",
-                                                cppi, tmp,
-                                                musb_readl(ram, 0 * 4),
-                                                musb_readl(ram, 1 * 4),
-                                                musb_readl(ram, 2 * 4),
-                                                musb_readl(ram, 3 * 4),
-                                                musb_readl(ram, 4 * 4),
-                                                musb_readl(ram, 5 * 4),
-                                                musb_readl(ram, 6 * 4),
-                                                musb_readl(ram, 7 * 4));
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                }
-                                if (hw_ep == musb->bulk_ep
-                                                && !list_empty(
-                                                        &musb->in_bulk)) {
-                                        code = dump_queue(&musb->in_bulk,
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                } else if (musb->periodic[epnum]) {
-                                        code = dump_qh(musb->periodic[epnum],
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                }
-                        }
-                        if (dump_tx) {
-                                code = snprintf(buf, max,
-                                        "\nTX%d: %s txcsr %04x interval %02x "
-                                        "max %04x type %02x; "
-                                        "dev %d hub %d port %d"
-                                        "\n",
-                                        epnum,
-                                        hw_ep->tx_double_buffered
-                                                ? "2buf" : "1buf",
-                                        musb_readw(regs, MUSB_TXCSR),
-                                        musb_readb(regs, MUSB_TXINTERVAL),
-                                        musb_readw(regs, MUSB_TXMAXP),
-                                        musb_readb(regs, MUSB_TXTYPE),
-                                        /* FIXME:  assumes multipoint */
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_TXFUNCADDR)),
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_TXHUBADDR)),
-                                        musb_readb(musb->mregs,
-                                                MUSB_BUSCTL_OFFSET(epnum,
-                                                MUSB_TXHUBPORT))
-                                        );
-                                if (code <= 0)
-                                        break;
-                                code = min(code, (int) max);
-                                buf += code;
-                                max -= code;
-                                if (is_cppi_enabled()
-                                                && epnum
-                                                && hw_ep->tx_channel) {
-                                        unsigned        cppi = epnum - 1;
-                                        void __iomem    *base;
-                                        void __iomem    *ram;
-                                        base = musb->ctrl_base;
-                                        ram = DAVINCI_RXCPPI_STATERAM_OFFSET(
-                                                        cppi) + base;
-                                        code = snprintf(buf, max,
-                                                "    tx dma%d: "
-                                                "%08x %08x, %08x %08x; "
-                                                "%08x %08x %08x .. %08x\n",
-                                                cppi,
-                                                musb_readl(ram, 0 * 4),
-                                                musb_readl(ram, 1 * 4),
-                                                musb_readl(ram, 2 * 4),
-                                                musb_readl(ram, 3 * 4),
-                                                musb_readl(ram, 4 * 4),
-                                                musb_readl(ram, 5 * 4),
-                                                musb_readl(ram, 6 * 4),
-                                                musb_readl(ram, 7 * 4));
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                }
-                                if (hw_ep == musb->control_ep
-                                                && !list_empty(
-                                                        &musb->control)) {
-                                        code = dump_queue(&musb->control,
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                } else if (hw_ep == musb->bulk_ep
-                                                && !list_empty(
-                                                        &musb->out_bulk)) {
-                                        code = dump_queue(&musb->out_bulk,
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                } else if (musb->periodic[epnum]) {
-                                        code = dump_qh(musb->periodic[epnum],
-                                                        buf, max);
-                                        if (code <= 0)
-                                                break;
-                                        code = min(code, (int) max);
-                                        buf += code;
-                                        max -= code;
-                                }
-                        }
-                }
-#endif
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
-                if (is_peripheral_active(musb)) {
-                        code = 0;
-                        if (hw_ep->ep_in.desc || !epnum) {
-                                code = dump_ep(&hw_ep->ep_in, buf, max);
-                                if (code <= 0)
-                                        break;
-                                code = min(code, (int) max);
-                                buf += code;
-                                max -= code;
-                        }
-                        if (hw_ep->ep_out.desc) {
-                                code = dump_ep(&hw_ep->ep_out, buf, max);
-                                if (code <= 0)
-                                        break;
-                                code = min(code, (int) max);
-                                buf += code;
-                                max -= code;
-                        }
-                }
-#endif
-        } while (0);
-        return buf - aBuffer;
-}
-/* Dump the current status and compile options.
- * @param musb the device driver instance
- * @param buffer where to dump the status; it must be big enough to hold the
- * result otherwise "BAD THINGS HAPPENS(TM)".
- */
-static int dump_header_stats(struct musb *musb, char *buffer)
-{
-        int code, count = 0;
-        const void __iomem *mbase = musb->mregs;
-        *buffer = 0;
-        count = sprintf(buffer, "Status: %sHDRC, Mode=%s "
-                                "(Power=%02x, DevCtl=%02x)\n",
-                        (musb->is_multipoint ? "M" : ""), MUSB_MODE(musb),
-                        musb_readb(mbase, MUSB_POWER),
-                        musb_readb(mbase, MUSB_DEVCTL));
-        if (count <= 0)
-                return 0;
-        buffer += count;
-        code = sprintf(buffer, "OTG state: %s; %sactive\n",
-                        otg_state_string(musb),
-                        musb->is_active ? "" : "in");
-        if (code <= 0)
-                goto done;
-        buffer += code;
-        count += code;
-        code = sprintf(buffer,
-                        "Options: "
-#ifdef CONFIG_MUSB_PIO_ONLY
-                        "pio"
-#elif defined(CONFIG_USB_TI_CPPI_DMA)
-                        "cppi-dma"
-#elif defined(CONFIG_USB_INVENTRA_DMA)
-                        "musb-dma"
-#elif defined(CONFIG_USB_TUSB_OMAP_DMA)
-                        "tusb-omap-dma"
-#else
-                        "?dma?"
-#endif
-                        ", "
-#ifdef CONFIG_USB_MUSB_OTG
-                        "otg (peripheral+host)"
-#elif defined(CONFIG_USB_GADGET_MUSB_HDRC)
-                        "peripheral"
-#elif defined(CONFIG_USB_MUSB_HDRC_HCD)
-                        "host"
-#endif
-                        ", debug=%d [eps=%d]\n",
-                debug,
-                musb->nr_endpoints);
-        if (code <= 0)
-                goto done;
-        count += code;
-        buffer += code;
-#ifdef  CONFIG_USB_GADGET_MUSB_HDRC
-        code = sprintf(buffer, "Peripheral address: %02x\n",
-                        musb_readb(musb->ctrl_base, MUSB_FADDR));
-        if (code <= 0)
-                goto done;
-        buffer += code;
-        count += code;
-#endif
-#ifdef  CONFIG_USB_MUSB_HDRC_HCD
-        code = sprintf(buffer, "Root port status: %08x\n",
-                        musb->port1_status);
-        if (code <= 0)
-                goto done;
-        buffer += code;
-        count += code;
-#endif
-#ifdef  CONFIG_ARCH_DAVINCI
-        code = sprintf(buffer,
-                        "DaVinci: ctrl=%02x stat=%1x phy=%03x\n"
-                        "\trndis=%05x auto=%04x intsrc=%08x intmsk=%08x"
-                        "\n",
-                        musb_readl(musb->ctrl_base, DAVINCI_USB_CTRL_REG),
-                        musb_readl(musb->ctrl_base, DAVINCI_USB_STAT_REG),
-                        __raw_readl((void __force __iomem *)
-                                        IO_ADDRESS(USBPHY_CTL_PADDR)),
-                        musb_readl(musb->ctrl_base, DAVINCI_RNDIS_REG),
-                        musb_readl(musb->ctrl_base, DAVINCI_AUTOREQ_REG),
-                        musb_readl(musb->ctrl_base,
-                                        DAVINCI_USB_INT_SOURCE_REG),
-                        musb_readl(musb->ctrl_base,
-                                        DAVINCI_USB_INT_MASK_REG));
-        if (code <= 0)
-                goto done;
-        count += code;
-        buffer += code;
-#endif  /* DAVINCI */
-#ifdef CONFIG_USB_TUSB6010
-        code = sprintf(buffer,
-                        "TUSB6010: devconf %08x, phy enable %08x drive %08x"
-                        "\n\totg %03x timer %08x"
-                        "\n\tprcm conf %08x mgmt %08x; int src %08x mask %08x"
-                        "\n",
-                        musb_readl(musb->ctrl_base, TUSB_DEV_CONF),
-                        musb_readl(musb->ctrl_base, TUSB_PHY_OTG_CTRL_ENABLE),
-                        musb_readl(musb->ctrl_base, TUSB_PHY_OTG_CTRL),
-                        musb_readl(musb->ctrl_base, TUSB_DEV_OTG_STAT),
-                        musb_readl(musb->ctrl_base, TUSB_DEV_OTG_TIMER),
-                        musb_readl(musb->ctrl_base, TUSB_PRCM_CONF),
-                        musb_readl(musb->ctrl_base, TUSB_PRCM_MNGMT),
-                        musb_readl(musb->ctrl_base, TUSB_INT_SRC),
-                        musb_readl(musb->ctrl_base, TUSB_INT_MASK));
-        if (code <= 0)
-                goto done;
-        count += code;
-        buffer += code;
-#endif  /* DAVINCI */
-        if (is_cppi_enabled() && musb->dma_controller) {
-                code = sprintf(buffer,
-                                "CPPI: txcr=%d txsrc=%01x txena=%01x; "
-                                "rxcr=%d rxsrc=%01x rxena=%01x "
-                                "\n",
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_TXCPPI_CTRL_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_TXCPPI_RAW_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_TXCPPI_INTENAB_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_RXCPPI_CTRL_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_RXCPPI_RAW_REG),
-                                musb_readl(musb->ctrl_base,
-                                                DAVINCI_RXCPPI_INTENAB_REG));
-                if (code <= 0)
-                        goto done;
-                count += code;
-                buffer += code;
-        }
-#ifdef CONFIG_USB_GADGET_MUSB_HDRC
-        if (is_peripheral_enabled(musb)) {
-                code = sprintf(buffer, "Gadget driver: %s\n",
-                                musb->gadget_driver
-                                        ? musb->gadget_driver->driver.name
-                                        : "(none)");
-                if (code <= 0)
-                        goto done;
-                count += code;
-                buffer += code;
-        }
-#endif
-done:
-        return count;
-}
-/* Write to ProcFS
- *
- * C soft-connect
- * c soft-disconnect
- * I enable HS
- * i disable HS
- * s stop session
- * F force session (OTG-unfriendly)
- * E rElinquish bus (OTG)
- * H request host mode
- * h cancel host request
- * T start sending TEST_PACKET
- * D<num> set/query the debug level
- */
-static int musb_proc_write(struct file *file, const char __user *buffer,
-                        unsigned long count, void *data)
-{
-        char cmd;
-        u8 reg;
-        struct musb *musb = (struct musb *)data;
-        void __iomem *mbase = musb->mregs;
-        /* MOD_INC_USE_COUNT; */
-        if (unlikely(copy_from_user(&cmd, buffer, 1)))
-                return -EFAULT;
-        switch (cmd) {
-        case 'C':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_POWER)
-                                        | MUSB_POWER_SOFTCONN;
-                        musb_writeb(mbase, MUSB_POWER, reg);
-                }
-                break;
-        case 'c':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_POWER)
-                                        & ~MUSB_POWER_SOFTCONN;
-                        musb_writeb(mbase, MUSB_POWER, reg);
-                }
-                break;
-        case 'I':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_POWER)
-                                        | MUSB_POWER_HSENAB;
-                        musb_writeb(mbase, MUSB_POWER, reg);
-                }
-                break;
-        case 'i':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_POWER)
-                                        & ~MUSB_POWER_HSENAB;
-                        musb_writeb(mbase, MUSB_POWER, reg);
-                }
-                break;
-        case 'F':
-                reg = musb_readb(mbase, MUSB_DEVCTL);
-                reg |= MUSB_DEVCTL_SESSION;
-                musb_writeb(mbase, MUSB_DEVCTL, reg);
-                break;
-        case 'H':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_DEVCTL);
-                        reg |= MUSB_DEVCTL_HR;
-                        musb_writeb(mbase, MUSB_DEVCTL, reg);
-                        /* MUSB_HST_MODE( ((struct musb*)data) ); */
-                        /* WARNING("Host Mode\n"); */
-                }
-                break;
-        case 'h':
-                if (mbase) {
-                        reg = musb_readb(mbase, MUSB_DEVCTL);
-                        reg &= ~MUSB_DEVCTL_HR;
-                        musb_writeb(mbase, MUSB_DEVCTL, reg);
-                }
-                break;
-        case 'T':
-                if (mbase) {
-                        musb_load_testpacket(musb);
-                        musb_writeb(mbase, MUSB_TESTMODE,
-                                        MUSB_TEST_PACKET);
-                }
-                break;
-#if (MUSB_DEBUG > 0)
-                /* set/read debug level */
-        case 'D':{
-                        if (count > 1) {
-                                char digits[8], *p = digits;
-                                int i = 0, level = 0, sign = 1;
-                                int len = min(count - 1, (unsigned long)8);
-                                if (copy_from_user(&digits, &buffer[1], len))
-                                        return -EFAULT;
-                                /* optional sign */
-                                if (*p == '-') {
-                                        len -= 1;
-                                        sign = -sign;
-                                        p++;
-                                }
-                                /* read it */
-                                while (i++ < len && *p > '0' && *p < '9') {
-                                        level = level * 10 + (*p - '0');
-                                        p++;
-                                }
-                                level *= sign;
-                                DBG(1, "debug level %d\n", level);
-                                debug = level;
-                        }
-                }
-                break;
-        case '?':
-                INFO("?: you are seeing it\n");
-                INFO("C/c: soft connect enable/disable\n");
-                INFO("I/i: hispeed enable/disable\n");
-                INFO("F: force session start\n");
-                INFO("H: host mode\n");
-                INFO("T: start sending TEST_PACKET\n");
-                INFO("D: set/read dbug level\n");
-                break;
-#endif
-        default:
-                ERR("Command %c not implemented\n", cmd);
-                break;
-        }
-        musb_platform_try_idle(musb, 0);
-        return count;
-}
-static int musb_proc_read(char *page, char **start,
-                        off_t off, int count, int *eof, void *data)
-{
-        char *buffer = page;
-        int code = 0;
-        unsigned long   flags;
-        struct musb     *musb = data;
-        unsigned        epnum;
-        count -= off;
-        count -= 1;             /* for NUL at end */
-        if (count <= 0)
-                return -EINVAL;
-        spin_lock_irqsave(&musb->lock, flags);
-        code = dump_header_stats(musb, buffer);
-        if (code > 0) {
-                buffer += code;
-                count -= code;
-        }
-        /* generate the report for the end points */
-        /* REVISIT ... not unless something's connected! */
-        for (epnum = 0; count >= 0 && epnum < musb->nr_endpoints;
-                        epnum++) {
-                code = dump_end_info(musb, epnum, buffer, count);
-                if (code > 0) {
-                        buffer += code;
-                        count -= code;
-                }
-        }
-        musb_platform_try_idle(musb, 0);
-        spin_unlock_irqrestore(&musb->lock, flags);
-        *eof = 1;
-        return buffer - page;
-}
-void __devexit musb_debug_delete(char *name, struct musb *musb)
-{
-        if (musb->proc_entry)
-                remove_proc_entry(name, NULL);
-}
-struct proc_dir_entry *__init
-musb_debug_create(char *name, struct musb *data)
-{
-        struct proc_dir_entry   *pde;
-        /* FIXME convert everything to seq_file; then later, debugfs */
-        if (!name)
-                return NULL;
-        pde = create_proc_entry(name, S_IFREG | S_IRUGO | S_IWUSR, NULL);
-        data->proc_entry = pde;
-        if (pde) {
-                pde->data = data;
-                /* pde->owner = THIS_MODULE; */
-                pde->read_proc = musb_proc_read;
-                pde->write_proc = musb_proc_write;
-                pde->size = 0;
-                pr_debug("Registered /proc/%s\n", name);
-        } else {
-                pr_debug("Cannot create a valid proc file entry");
-        }
-        return pde;
-}
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 2e663f1afd5e..d95382088075 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -38,8 +38,6 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
-#include <linux/version.h>
 /* the mode to be set when the port ist opened */
 static int initial_mode = 1;
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index e143198aeb02..9f9cd36455f4 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -173,6 +173,7 @@ static int  option_send_setup(struct tty_struct *tty, struct usb_serial_port *po
 #define KYOCERA_PRODUCT_KPC680                  0x180a
 #define ANYDATA_VENDOR_ID                       0x16d5
+#define ANYDATA_PRODUCT_ADU_620UW               0x6202
 #define ANYDATA_PRODUCT_ADU_E100A               0x6501
 #define ANYDATA_PRODUCT_ADU_500A                0x6502
@@ -318,6 +319,7 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(DELL_VENDOR_ID, 0x8138) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */
        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) },
        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
+        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
        { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) },
        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) },
        { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) },
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 4bd569e479a7..314d18694b6a 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -11,7 +11,6 @@
 *  Code is based on s3fb
 */
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index 6d5aa806777e..7644ed249564 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -58,7 +58,7 @@
 #include <asm/gpio.h>
 #include <asm/portmux.h>
-#include <asm/mach/bf54x-lq043.h>
+#include <mach/bf54x-lq043.h>
 #define NO_BL_SUPPORT
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index c14b2435d23e..e729fb279645 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -628,27 +628,18 @@ static long cirrusfb_get_mclk(long freq, int bpp, long *div)
 static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                              struct fb_info *info)
 {
-        int nom, den;           /* translyting from pixels->bytes */
+        int yres;
-        int yres, i;
+        /* memory size in pixels */
-        static struct { int xres, yres; } modes[] =
+        unsigned pixels = info->screen_size * 8 / var->bits_per_pixel;
-        { { 1600, 1280 },
-          { 1280, 1024 },
-          { 1024, 768 },
-          { 800, 600 },
-          { 640, 480 },
-          { -1, -1 } };
        switch (var->bits_per_pixel) {
        case 1:
-                nom = 4;
+                pixels /= 4;
-                den = 8;
                break;          /* 8 pixel per byte, only 1/4th of mem usable */
        case 8:
        case 16:
        case 24:
        case 32:
-                nom = var->bits_per_pixel / 8;
-                den = 1;
                break;          /* 1 pixel == 1 byte */
        default:
                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
@@ -658,43 +649,29 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                return -EINVAL;
        }
-        if (var->xres * nom / den * var->yres > info->screen_size) {
+        if (var->xres_virtual < var->xres)
-                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected..."
+                var->xres_virtual = var->xres;
-                        "resolution too high to fit into video memory!\n",
-                        var->xres, var->yres, var->bits_per_pixel);
-                DPRINTK("EXIT - EINVAL error\n");
-                return -EINVAL;
-        }
        /* use highest possible virtual resolution */
-        if (var->xres_virtual == -1 &&
+        if (var->yres_virtual == -1) {
-            var->yres_virtual == -1) {
+                var->yres_virtual = pixels / var->xres_virtual;
-                printk(KERN_INFO
-                     "cirrusfb: using maximum available virtual resolution\n");
-                for (i = 0; modes[i].xres != -1; i++) {
-                        int size = modes[i].xres * nom / den * modes[i].yres;
-                        if (size < info->screen_size / 2)
-                                break;
-                }
-                if (modes[i].xres == -1) {
-                        printk(KERN_ERR "cirrusfb: could not find a virtual "
-                                "resolution that fits into video memory!!\n");
-                        DPRINTK("EXIT - EINVAL error\n");
-                        return -EINVAL;
-                }
-                var->xres_virtual = modes[i].xres;
-                var->yres_virtual = modes[i].yres;
                printk(KERN_INFO "cirrusfb: virtual resolution set to "
                        "maximum of %dx%d\n", var->xres_virtual,
                        var->yres_virtual);
        }
-        if (var->xres_virtual < var->xres)
-                var->xres_virtual = var->xres;
        if (var->yres_virtual < var->yres)
                var->yres_virtual = var->yres;
+        if (var->xres_virtual * var->yres_virtual > pixels) {
+                printk(KERN_ERR "cirrusfb: mode %dx%dx%d rejected... "
+                      "virtual resolution too high to fit into video memory!\n",
+                        var->xres_virtual, var->yres_virtual,
+                        var->bits_per_pixel);
+                DPRINTK("EXIT - EINVAL error\n");
+                return -EINVAL;
+        }
        if (var->xoffset < 0)
                var->xoffset = 0;
        if (var->yoffset < 0)
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 8361bd0e3df1..4dcec48a1d78 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -11,7 +11,6 @@
 * which is based on the code of neofb.
 */
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c
index 77aafcfae037..4599a4385bc9 100644
--- a/drivers/video/tdfxfb.c
+++ b/drivers/video/tdfxfb.c
@@ -95,7 +95,6 @@ static inline int mtrr_del(int reg, unsigned long base,
 #define VOODOO5_MAX_PIXCLOCK 350000
 static struct fb_fix_screeninfo tdfx_fix __devinitdata = {
-        .id =           "3Dfx",
        .type =         FB_TYPE_PACKED_PIXELS,
        .visual =       FB_VISUAL_PSEUDOCOLOR,
        .ypanstep =     1,
@@ -426,7 +425,7 @@ static unsigned long do_lfb_size(struct tdfx_par *par, unsigned short dev_id)
        if (dev_id < PCI_DEVICE_ID_3DFX_VOODOO5) {
                /* Banshee/Voodoo3 */
                chip_size = 2;
-                if (has_sgram && (draminit0 & DRAMINIT0_SGRAM_TYPE))
+                if (has_sgram && !(draminit0 & DRAMINIT0_SGRAM_TYPE))
                        chip_size = 1;
        } else {
                /* Voodoo4/5 */
@@ -1200,15 +1199,15 @@ static int __devinit tdfxfb_probe(struct pci_dev *pdev,
        /* Configure the default fb_fix_screeninfo first */
        switch (pdev->device) {
        case PCI_DEVICE_ID_3DFX_BANSHEE:
-                strcat(tdfx_fix.id, " Banshee");
+                strcpy(tdfx_fix.id, "3Dfx Banshee");
                default_par->max_pixclock = BANSHEE_MAX_PIXCLOCK;
                break;
        case PCI_DEVICE_ID_3DFX_VOODOO3:
-                strcat(tdfx_fix.id, " Voodoo3");
+                strcpy(tdfx_fix.id, "3Dfx Voodoo3");
                default_par->max_pixclock = VOODOO3_MAX_PIXCLOCK;
                break;
        case PCI_DEVICE_ID_3DFX_VOODOO5:
-                strcat(tdfx_fix.id, " Voodoo5");
+                strcpy(tdfx_fix.id, "3Dfx Voodoo5");
                default_par->max_pixclock = VOODOO5_MAX_PIXCLOCK;
                break;
        }
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h
index c4aba59d4809..7491abfcf1fc 100644
--- a/drivers/video/vermilion/vermilion.h
+++ b/drivers/video/vermilion/vermilion.h
@@ -30,7 +30,6 @@
 #define _VERMILION_H_
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/pci.h>
 #include <asm/atomic.h>
 #include <linux/mutex.h>
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 34aae7a2a62b..3df17dc8c3d7 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -12,7 +12,6 @@
 * (http://davesdomain.org.uk/viafb/)
 */
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 7b3a8423f485..5da3d2423cc0 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -24,7 +24,6 @@
 #include <linux/device.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index bfef604160d1..62eab43152d2 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -158,7 +158,7 @@ static inline s64 towards_target(struct virtio_balloon *vb)
        vb->vdev->config->get(vb->vdev,
                              offsetof(struct virtio_balloon_config, num_pages),
                              &v, sizeof(v));
-        return v - vb->num_pages;
+        return (s64)v - vb->num_pages;
 }
 static void update_balloon_size(struct virtio_balloon *vb)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index db20542796bf..c51036716700 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -465,6 +465,16 @@ config PC87413_WDT
          Most people will say N.
+config RDC321X_WDT
+        tristate "RDC R-321x SoC watchdog"
+        depends on X86_RDC321X
+        help
+          This is the driver for the built in hardware watchdog
+          in the RDC R-321x SoC.
+          To compile this driver as a module, choose M here: the
+          module will be called rdc321x_wdt.
 config 60XX_WDT
        tristate "SBC-60XX Watchdog Timer"
        depends on X86
@@ -633,6 +643,16 @@ config SBC_EPX_C3_WATCHDOG
 # MIPS Architecture
+config RC32434_WDT
+        tristate "IDT RC32434 SoC Watchdog Timer"
+        depends on MIKROTIK_RB532
+        help
+          Hardware driver for the IDT RC32434 SoC built-in
+          watchdog timer.
+          To compile this driver as a module, choose M here: the
+          module will be called rc32434_wdt.
 config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
        depends on SGI_HAS_INDYDOG
@@ -692,10 +712,6 @@ config MPC5200_WDT
        tristate "MPC5200 Watchdog Timer"
        depends on PPC_MPC52xx
-config 8xx_WDT
-        tristate "MPC8xx Watchdog Timer"
-        depends on 8xx
 config 8xxx_WDT
        tristate "MPC8xxx Platform Watchdog Timer"
        depends on PPC_8xx || PPC_83xx || PPC_86xx
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
index ca3dc043d786..e0ef123fbdea 100644
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
@@ -75,6 +75,7 @@ obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o
 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
 obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
 obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o
+obj-$(CONFIG_RDC321X_WDT) += rdc321x_wdt.o
 obj-$(CONFIG_60XX_WDT) += sbc60xxwdt.o
 obj-$(CONFIG_SBC8360_WDT) += sbc8360.o
 obj-$(CONFIG_SBC7240_WDT) += sbc7240_wdt.o
@@ -94,6 +95,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 # M68KNOMMU Architecture
 # MIPS Architecture
+obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o
 obj-$(CONFIG_INDYDOG) += indydog.o
 obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
 obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
@@ -104,7 +106,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
 # PARISC Architecture
 # POWERPC Architecture
-obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
 obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o
 obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
 obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index d061f0ad2d20..993e5f52afef 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -241,7 +241,7 @@ static int at91wdt_resume(struct platform_device *pdev)
 {
        if (at91wdt_busy)
                at91_wdt_start();
-                return 0;
+        return 0;
 }
 #else
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index d039d5f2fd1c..a3765e0be4a8 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -116,6 +116,7 @@ static unsigned int reload;			/* the computed soft_margin */
 static int nowayout = WATCHDOG_NOWAYOUT;
 static char expect_release;
 static unsigned long hpwdt_is_open;
+static unsigned int allow_kdump;
 static void __iomem *pci_mem_addr;              /* the PCI-memory address */
 static unsigned long __iomem *hpwdt_timer_reg;
@@ -221,19 +222,19 @@ static int __devinit cru_detect(unsigned long map_entry,
        if (cmn_regs.u1.ral != 0) {
                printk(KERN_WARNING
-                       "hpwdt: Call succeeded but with an error: 0x%x\n",
+                        "hpwdt: Call succeeded but with an error: 0x%x\n",
-                       cmn_regs.u1.ral);
+                        cmn_regs.u1.ral);
        } else {
                physical_bios_base = cmn_regs.u2.rebx;
                physical_bios_offset = cmn_regs.u4.redx;
                cru_length = cmn_regs.u3.recx;
                cru_physical_address =
-                    physical_bios_base + physical_bios_offset;
+                        physical_bios_base + physical_bios_offset;
                /* If the values look OK, then map it in. */
                if ((physical_bios_base + physical_bios_offset)) {
                        cru_rom_addr =
-                            ioremap(cru_physical_address, cru_length);
+                                ioremap(cru_physical_address, cru_length);
                        if (cru_rom_addr)
                                retval = 0;
                }
@@ -356,7 +357,6 @@ asm(".text                      \n\t"
    "call       *%r12           \n\t"
    "pushfq                     \n\t"
    "popq        %r12           \n\t"
-    "popfq                      \n\t"
    "movl       %eax, (%r9)     \n\t"
    "movl       %ebx, 4(%r9)    \n\t"
    "movl       %ecx, 8(%r9)    \n\t"
@@ -390,10 +390,10 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm)
                smbios_cru64_ptr = (struct smbios_cru64_info *) dm;
                if (smbios_cru64_ptr->signature == CRU_BIOS_SIGNATURE_VALUE) {
                        cru_physical_address =
-                            smbios_cru64_ptr->physical_address +
+                                smbios_cru64_ptr->physical_address +
-                            smbios_cru64_ptr->double_offset;
+                                smbios_cru64_ptr->double_offset;
                        cru_rom_addr = ioremap(cru_physical_address,
-                                    smbios_cru64_ptr->double_length);
+                                smbios_cru64_ptr->double_length);
                }
        }
 }
@@ -405,7 +405,7 @@ static int __devinit detect_cru_service(void)
        dmi_walk(dmi_find_cru);
        /* if cru_rom_addr has been set then we found a CRU service */
-        return ((cru_rom_addr != NULL) ? 0: -ENODEV);
+        return ((cru_rom_addr != NULL) ? 0 : -ENODEV);
 }
 /* ------------------------------------------------------------------------- */
@@ -413,34 +413,6 @@ static int __devinit detect_cru_service(void)
 #endif
 /*
- *      NMI Handler
- */
-static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
-                            void *data)
-{
-        unsigned long rom_pl;
-        static int die_nmi_called;
-        if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)
-                return NOTIFY_OK;
-        spin_lock_irqsave(&rom_lock, rom_pl);
-        if (!die_nmi_called)
-                asminline_call(&cmn_regs, cru_rom_addr);
-        die_nmi_called = 1;
-        spin_unlock_irqrestore(&rom_lock, rom_pl);
-        if (cmn_regs.u1.ral == 0) {
-                printk(KERN_WARNING "hpwdt: An NMI occurred, "
-                       "but unable to determine source.\n");
-        } else {
-                panic("An NMI occurred, please see the Integrated "
-                        "Management Log for details.\n");
-        }
-        return NOTIFY_STOP;
-}
-/*
 *      Watchdog operations
 */
 static void hpwdt_start(void)
@@ -484,6 +456,36 @@ static int hpwdt_change_timer(int new_margin)
 }
 /*
+ *      NMI Handler
+ */
+static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
+                                void *data)
+{
+        unsigned long rom_pl;
+        static int die_nmi_called;
+        if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)
+                return NOTIFY_OK;
+        spin_lock_irqsave(&rom_lock, rom_pl);
+        if (!die_nmi_called)
+                asminline_call(&cmn_regs, cru_rom_addr);
+        die_nmi_called = 1;
+        spin_unlock_irqrestore(&rom_lock, rom_pl);
+        if (cmn_regs.u1.ral == 0) {
+                printk(KERN_WARNING "hpwdt: An NMI occurred, "
+                        "but unable to determine source.\n");
+        } else {
+                if (allow_kdump)
+                        hpwdt_stop();
+                panic("An NMI occurred, please see the Integrated "
+                        "Management Log for details.\n");
+        }
+        return NOTIFY_STOP;
+}
+/*
 *      /dev/watchdog handling
 */
 static int hpwdt_open(struct inode *inode, struct file *file)
@@ -625,17 +627,18 @@ static struct notifier_block die_notifier = {
 */
 static int __devinit hpwdt_init_one(struct pci_dev *dev,
-                                    const struct pci_device_id *ent)
+                                        const struct pci_device_id *ent)
 {
        int retval;
        /*
         * First let's find out if we are on an iLO2 server. We will
         * not run on a legacy ASM box.
+         * So we only support the G5 ProLiant servers and higher.
         */
        if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {
                dev_warn(&dev->dev,
-                       "This server does not have an iLO2 ASIC.\n");
+                        "This server does not have an iLO2 ASIC.\n");
                return -ENODEV;
        }
@@ -669,7 +672,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
        retval = detect_cru_service();
        if (retval < 0) {
                dev_warn(&dev->dev,
-                       "Unable to detect the %d Bit CRU Service.\n",
+                        "Unable to detect the %d Bit CRU Service.\n",
                        HPWDT_ARCH);
                goto error_get_cru;
        }
@@ -684,7 +687,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
        retval = register_die_notifier(&die_notifier);
        if (retval != 0) {
                dev_warn(&dev->dev,
-                       "Unable to register a die notifier (err=%d).\n",
+                        "Unable to register a die notifier (err=%d).\n",
                        retval);
                goto error_die_notifier;
        }
@@ -699,8 +702,9 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
        printk(KERN_INFO
                "hp Watchdog Timer Driver: 1.00"
-                ", timer margin: %d seconds( nowayout=%d).\n",
+                ", timer margin: %d seconds (nowayout=%d)"
-                soft_margin, nowayout);
+                ", allow kernel dump: %s (default = 0/OFF).\n",
+                soft_margin, nowayout, (allow_kdump == 0) ? "OFF" : "ON");
        return 0;
@@ -755,6 +759,9 @@ MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 module_param(soft_margin, int, 0);
 MODULE_PARM_DESC(soft_margin, "Watchdog timeout in seconds");
+module_param(allow_kdump, int, 0);
+MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs");
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
                __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
diff --git a/drivers/watchdog/mpc8xx_wdt.c b/drivers/watchdog/mpc8xx_wdt.c
deleted file mode 100644
index 1336425acf20..000000000000
--- a/drivers/watchdog/mpc8xx_wdt.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * mpc8xx_wdt.c - MPC8xx watchdog userspace interface
- *
- * Author: Florian Schirmer <jolt@tuxbox.org>
- *
- * 2002 (c) Florian Schirmer <jolt@tuxbox.org> This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <linux/fs.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/miscdevice.h>
-#include <linux/module.h>
-#include <linux/watchdog.h>
-#include <asm/8xx_immap.h>
-#include <linux/uaccess.h>
-#include <linux/io.h>
-#include <syslib/m8xx_wdt.h>
-static unsigned long wdt_opened;
-static int wdt_status;
-static spinlock_t wdt_lock;
-static void mpc8xx_wdt_handler_disable(void)
-{
-        volatile uint __iomem *piscr;
-        piscr = (uint *)&((immap_t *)IMAP_ADDR)->im_sit.sit_piscr;
-        if (!m8xx_has_internal_rtc)
-                m8xx_wdt_stop_timer();
-        else
-                out_be32(piscr, in_be32(piscr) & ~(PISCR_PIE | PISCR_PTE));
-        printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler deactivated\n");
-}
-static void mpc8xx_wdt_handler_enable(void)
-{
-        volatile uint __iomem *piscr;
-        piscr = (uint *)&((immap_t *)IMAP_ADDR)->im_sit.sit_piscr;
-        if (!m8xx_has_internal_rtc)
-                m8xx_wdt_install_timer();
-        else
-                out_be32(piscr, in_be32(piscr) | PISCR_PIE | PISCR_PTE);
-        printk(KERN_NOTICE "mpc8xx_wdt: keep-alive handler activated\n");
-}
-static int mpc8xx_wdt_open(struct inode *inode, struct file *file)
-{
-        if (test_and_set_bit(0, &wdt_opened))
-                return -EBUSY;
-        m8xx_wdt_reset();
-        mpc8xx_wdt_handler_disable();
-        return nonseekable_open(inode, file);
-}
-static int mpc8xx_wdt_release(struct inode *inode, struct file *file)
-{
-        m8xx_wdt_reset();
-#if !defined(CONFIG_WATCHDOG_NOWAYOUT)
-        mpc8xx_wdt_handler_enable();
-#endif
-        clear_bit(0, &wdt_opened);
-        return 0;
-}
-static ssize_t mpc8xx_wdt_write(struct file *file, const char *data,
-                                                size_t len, loff_t *ppos)
-{
-        if (len) {
-                spin_lock(&wdt_lock);
-                m8xx_wdt_reset();
-                spin_unlock(&wdt_lock);
-        }
-        return len;
-}
-static long mpc8xx_wdt_ioctl(struct file *file,
-                                        unsigned int cmd, unsigned long arg)
-{
-        int timeout;
-        static struct watchdog_info info = {
-                .options = WDIOF_KEEPALIVEPING,
-                .firmware_version = 0,
-                .identity = "MPC8xx watchdog",
-        };
-        switch (cmd) {
-        case WDIOC_GETSUPPORT:
-                if (copy_to_user((void *)arg, &info, sizeof(info)))
-                        return -EFAULT;
-                break;
-        case WDIOC_GETSTATUS:
-        case WDIOC_GETBOOTSTATUS:
-                if (put_user(wdt_status, (int *)arg))
-                        return -EFAULT;
-                wdt_status &= ~WDIOF_KEEPALIVEPING;
-                break;
-        case WDIOC_GETTEMP:
-                return -EOPNOTSUPP;
-        case WDIOC_SETOPTIONS:
-                return -EOPNOTSUPP;
-        case WDIOC_KEEPALIVE:
-                spin_lock(&wdt_lock);
-                m8xx_wdt_reset();
-                wdt_status |= WDIOF_KEEPALIVEPING;
-                spin_unlock(&wdt_lock);
-                break;
-        case WDIOC_SETTIMEOUT:
-                return -EOPNOTSUPP;
-        case WDIOC_GETTIMEOUT:
-                spin_lock(&wdt_lock);
-                timeout = m8xx_wdt_get_timeout();
-                spin_unlock(&wdt_lock);
-                if (put_user(timeout, (int *)arg))
-                        return -EFAULT;
-                break;
-        default:
-                return -ENOTTY;
-        }
-        return 0;
-}
-static const struct file_operations mpc8xx_wdt_fops = {
-        .owner = THIS_MODULE,
-        .llseek = no_llseek,
-        .write = mpc8xx_wdt_write,
-        .unlocked_ioctl = mpc8xx_wdt_ioctl,
-        .open = mpc8xx_wdt_open,
-        .release = mpc8xx_wdt_release,
-};
-static struct miscdevice mpc8xx_wdt_miscdev = {
-        .minor = WATCHDOG_MINOR,
-        .name = "watchdog",
-        .fops = &mpc8xx_wdt_fops,
-};
-static int __init mpc8xx_wdt_init(void)
-{
-        spin_lock_init(&wdt_lock);
-        return misc_register(&mpc8xx_wdt_miscdev);
-}
-static void __exit mpc8xx_wdt_exit(void)
-{
-        misc_deregister(&mpc8xx_wdt_miscdev);
-        m8xx_wdt_reset();
-        mpc8xx_wdt_handler_enable();
-}
-module_init(mpc8xx_wdt_init);
-module_exit(mpc8xx_wdt_exit);
-MODULE_AUTHOR("Florian Schirmer <jolt@tuxbox.org>");
-MODULE_DESCRIPTION("MPC8xx watchdog driver");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index f2094960e662..38c588ee694f 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -48,6 +48,7 @@ struct mpc8xxx_wdt_type {
 };
 static struct mpc8xxx_wdt __iomem *wd_base;
+static int mpc8xxx_wdt_init_late(void);
 static u16 timeout = 0xffff;
 module_param(timeout, ushort, 0);
@@ -213,6 +214,12 @@ static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev,
        else
                timeout_sec = timeout / freq;
+#ifdef MODULE
+        ret = mpc8xxx_wdt_init_late();
+        if (ret)
+                goto err_unmap;
+#endif
        pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d "
                "(%d seconds)\n", reset ? "reset" : "interrupt", timeout,
                timeout_sec);
@@ -280,7 +287,7 @@ static struct of_platform_driver mpc8xxx_wdt_driver = {
 * very early to start pinging the watchdog (misc devices are not yet
 * available), and later module_init() just registers the misc device.
 */
-static int __init mpc8xxx_wdt_init_late(void)
+static int mpc8xxx_wdt_init_late(void)
 {
        int ret;
@@ -295,7 +302,9 @@ static int __init mpc8xxx_wdt_init_late(void)
        }
        return 0;
 }
+#ifndef MODULE
 module_init(mpc8xxx_wdt_init_late);
+#endif
 static int __init mpc8xxx_wdt_init(void)
 {
diff --git a/drivers/watchdog/pc87413_wdt.c b/drivers/watchdog/pc87413_wdt.c
index e91ada72da1d..484c215e9f3f 100644
--- a/drivers/watchdog/pc87413_wdt.c
+++ b/drivers/watchdog/pc87413_wdt.c
@@ -30,7 +30,6 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/moduleparam.h>
-#include <linux/version.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
new file mode 100644
index 000000000000..6756bcb009ed
--- /dev/null
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -0,0 +1,344 @@
+/*
+ *  IDT Interprise 79RC32434 watchdog driver
+ *
+ *  Copyright (C) 2006, Ondrej Zajicek <santiago@crfreenet.org>
+ *  Copyright (C) 2008, Florian Fainelli <florian@openwrt.org>
+ *
+ *  based on
+ *  SoftDog 0.05:       A Software Watchdog Device
+ *
+ *  (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ *
+ */
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/miscdevice.h>
+#include <linux/watchdog.h>
+#include <linux/reboot.h>
+#include <linux/smp_lock.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/uaccess.h>
+#include <asm/bootinfo.h>
+#include <asm/time.h>
+#include <asm/mach-rc32434/integ.h>
+#define MAX_TIMEOUT                     20
+#define RC32434_WDT_INTERVAL            (15 * HZ)
+#define VERSION "0.2"
+static struct {
+        struct completion stop;
+        int running;
+        struct timer_list timer;
+        int queue;
+        int default_ticks;
+        unsigned long inuse;
+} rc32434_wdt_device;
+static struct integ __iomem *wdt_reg;
+static int ticks = 100 * HZ;
+static int expect_close;
+static int timeout;
+static int nowayout = WATCHDOG_NOWAYOUT;
+module_param(nowayout, int, 0);
+MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default="
+        __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
+static void rc32434_wdt_start(void)
+{
+        u32 val;
+        if (!rc32434_wdt_device.inuse) {
+                writel(0, &wdt_reg->wtcount);
+                val = RC32434_ERR_WRE;
+                writel(readl(&wdt_reg->errcs) | val, &wdt_reg->errcs);
+                val = RC32434_WTC_EN;
+                writel(readl(&wdt_reg->wtc) | val, &wdt_reg->wtc);
+        }
+        rc32434_wdt_device.running++;
+}
+static void rc32434_wdt_stop(void)
+{
+        u32 val;
+        if (rc32434_wdt_device.running) {
+                val = ~RC32434_WTC_EN;
+                writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc);
+                val = ~RC32434_ERR_WRE;
+                writel(readl(&wdt_reg->errcs) & val, &wdt_reg->errcs);
+                rc32434_wdt_device.running = 0;
+        }
+}
+static void rc32434_wdt_set(int new_timeout)
+{
+        u32 cmp = new_timeout * HZ;
+        u32 state, val;
+        timeout = new_timeout;
+        /*
+         * store and disable WTC
+         */
+        state = (u32)(readl(&wdt_reg->wtc) & RC32434_WTC_EN);
+        val = ~RC32434_WTC_EN;
+        writel(readl(&wdt_reg->wtc) & val, &wdt_reg->wtc);
+        writel(0, &wdt_reg->wtcount);
+        writel(cmp, &wdt_reg->wtcompare);
+        /*
+         * restore WTC
+         */
+        writel(readl(&wdt_reg->wtc) | state, &wdt_reg);
+}
+static void rc32434_wdt_reset(void)
+{
+        ticks = rc32434_wdt_device.default_ticks;
+}
+static void rc32434_wdt_update(unsigned long unused)
+{
+        if (rc32434_wdt_device.running)
+                ticks--;
+        writel(0, &wdt_reg->wtcount);
+        if (rc32434_wdt_device.queue && ticks)
+                mod_timer(&rc32434_wdt_device.timer,
+                        jiffies + RC32434_WDT_INTERVAL);
+        else
+                complete(&rc32434_wdt_device.stop);
+}
+static int rc32434_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(0, &rc32434_wdt_device.inuse))
+                return -EBUSY;
+        if (nowayout)
+                __module_get(THIS_MODULE);
+        return nonseekable_open(inode, file);
+}
+static int rc32434_wdt_release(struct inode *inode, struct file *file)
+{
+        if (expect_close && nowayout == 0) {
+                rc32434_wdt_stop();
+                printk(KERN_INFO KBUILD_MODNAME ": disabling watchdog timer\n");
+                module_put(THIS_MODULE);
+        } else
+                printk(KERN_CRIT KBUILD_MODNAME
+                        ": device closed unexpectedly. WDT will not stop !\n");
+        clear_bit(0, &rc32434_wdt_device.inuse);
+        return 0;
+}
+static ssize_t rc32434_wdt_write(struct file *file, const char *data,
+                                size_t len, loff_t *ppos)
+{
+        if (len) {
+                if (!nowayout) {
+                        size_t i;
+                        /* In case it was set long ago */
+                        expect_close = 0;
+                        for (i = 0; i != len; i++) {
+                                char c;
+                                if (get_user(c, data + i))
+                                        return -EFAULT;
+                                if (c == 'V')
+                                        expect_close = 1;
+                        }
+                }
+                rc32434_wdt_update(0);
+                return len;
+        }
+        return 0;
+}
+static int rc32434_wdt_ioctl(struct inode *inode, struct file *file,
+        unsigned int cmd, unsigned long arg)
+{
+        void __user *argp = (void __user *)arg;
+        int new_timeout;
+        unsigned int value;
+        static struct watchdog_info ident = {
+                .options =              WDIOF_SETTIMEOUT |
+                                        WDIOF_KEEPALIVEPING |
+                                        WDIOF_MAGICCLOSE,
+                .identity =             "RC32434_WDT Watchdog",
+        };
+        switch (cmd) {
+        case WDIOC_KEEPALIVE:
+                rc32434_wdt_reset();
+                break;
+        case WDIOC_GETSTATUS:
+        case WDIOC_GETBOOTSTATUS:
+                value = readl(&wdt_reg->wtcount);
+                if (copy_to_user(argp, &value, sizeof(int)))
+                        return -EFAULT;
+                break;
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user(argp, &ident, sizeof(ident)))
+                        return -EFAULT;
+                break;
+        case WDIOC_SETOPTIONS:
+                if (copy_from_user(&value, argp, sizeof(int)))
+                        return -EFAULT;
+                switch (value) {
+                case WDIOS_ENABLECARD:
+                        rc32434_wdt_start();
+                        break;
+                case WDIOS_DISABLECARD:
+                        rc32434_wdt_stop();
+                default:
+                        return -EINVAL;
+                }
+                break;
+        case WDIOC_SETTIMEOUT:
+                if (copy_from_user(&new_timeout, argp, sizeof(int)))
+                        return -EFAULT;
+                if (new_timeout < 1)
+                        return -EINVAL;
+                if (new_timeout > MAX_TIMEOUT)
+                        return -EINVAL;
+                rc32434_wdt_set(new_timeout);
+        case WDIOC_GETTIMEOUT:
+                return copy_to_user(argp, &timeout, sizeof(int));
+        default:
+                return -ENOTTY;
+        }
+        return 0;
+}
+static struct file_operations rc32434_wdt_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .write          = rc32434_wdt_write,
+        .ioctl          = rc32434_wdt_ioctl,
+        .open           = rc32434_wdt_open,
+        .release        = rc32434_wdt_release,
+};
+static struct miscdevice rc32434_wdt_miscdev = {
+        .minor  = WATCHDOG_MINOR,
+        .name   = "watchdog",
+        .fops   = &rc32434_wdt_fops,
+};
+static char banner[] = KERN_INFO KBUILD_MODNAME
+                ": Watchdog Timer version " VERSION ", timer margin: %d sec\n";
+static int rc32434_wdt_probe(struct platform_device *pdev)
+{
+        int ret;
+        struct resource *r;
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rb500_wdt_res");
+        if (!r) {
+                printk(KERN_ERR KBUILD_MODNAME
+                        "failed to retrieve resources\n");
+                return -ENODEV;
+        }
+        wdt_reg = ioremap_nocache(r->start, r->end - r->start);
+        if (!wdt_reg) {
+                printk(KERN_ERR KBUILD_MODNAME
+                        "failed to remap I/O resources\n");
+                return -ENXIO;
+        }
+        ret = misc_register(&rc32434_wdt_miscdev);
+        if (ret < 0) {
+                printk(KERN_ERR KBUILD_MODNAME
+                        "failed to register watchdog device\n");
+                goto unmap;
+        }
+        init_completion(&rc32434_wdt_device.stop);
+        rc32434_wdt_device.queue = 0;
+        clear_bit(0, &rc32434_wdt_device.inuse);
+        setup_timer(&rc32434_wdt_device.timer, rc32434_wdt_update, 0L);
+        rc32434_wdt_device.default_ticks = ticks;
+        rc32434_wdt_start();
+        printk(banner, timeout);
+        return 0;
+unmap:
+        iounmap(wdt_reg);
+        return ret;
+}
+static int rc32434_wdt_remove(struct platform_device *pdev)
+{
+        if (rc32434_wdt_device.queue) {
+                rc32434_wdt_device.queue = 0;
+                wait_for_completion(&rc32434_wdt_device.stop);
+        }
+        misc_deregister(&rc32434_wdt_miscdev);
+        iounmap(wdt_reg);
+        return 0;
+}
+static struct platform_driver rc32434_wdt = {
+        .probe  = rc32434_wdt_probe,
+        .remove = rc32434_wdt_remove,
+        .driver = {
+                .name = "rc32434_wdt",
+        }
+};
+static int __init rc32434_wdt_init(void)
+{
+        return platform_driver_register(&rc32434_wdt);
+}
+static void __exit rc32434_wdt_exit(void)
+{
+        platform_driver_unregister(&rc32434_wdt);
+}
+module_init(rc32434_wdt_init);
+module_exit(rc32434_wdt_exit);
+MODULE_AUTHOR("Ondrej Zajicek <santiago@crfreenet.org>,"
+                "Florian Fainelli <florian@openwrt.org>");
+MODULE_DESCRIPTION("Driver for the IDT RC32434 SoC watchdog");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c
new file mode 100644
index 000000000000..9108efa73e7d
--- /dev/null
+++ b/drivers/watchdog/rdc321x_wdt.c
@@ -0,0 +1,285 @@
+/*
+ * RDC321x watchdog driver
+ *
+ * Copyright (C) 2007 Florian Fainelli <florian@openwrt.org>
+ *
+ * This driver is highly inspired from the cpu5_wdt driver
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/miscdevice.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/ioport.h>
+#include <linux/timer.h>
+#include <linux/completion.h>
+#include <linux/jiffies.h>
+#include <linux/platform_device.h>
+#include <linux/watchdog.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
+#include <asm/mach-rdc321x/rdc321x_defs.h>
+#define RDC_WDT_MASK    0x80000000 /* Mask */
+#define RDC_WDT_EN      0x00800000 /* Enable bit */
+#define RDC_WDT_WTI     0x00200000 /* Generate CPU reset/NMI/WDT on timeout */
+#define RDC_WDT_RST     0x00100000 /* Reset bit */
+#define RDC_WDT_WIF     0x00040000 /* WDT IRQ Flag */
+#define RDC_WDT_IRT     0x00000100 /* IRQ Routing table */
+#define RDC_WDT_CNT     0x00000001 /* WDT count */
+#define RDC_CLS_TMR     0x80003844 /* Clear timer */
+#define RDC_WDT_INTERVAL        (HZ/10+1)
+static int ticks = 1000;
+/* some device data */
+static struct {
+        struct completion stop;
+        int running;
+        struct timer_list timer;
+        int queue;
+        int default_ticks;
+        unsigned long inuse;
+        spinlock_t lock;
+} rdc321x_wdt_device;
+/* generic helper functions */
+static void rdc321x_wdt_trigger(unsigned long unused)
+{
+        unsigned long flags;
+        if (rdc321x_wdt_device.running)
+                ticks--;
+        /* keep watchdog alive */
+        spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
+        outl(RDC_WDT_EN | inl(RDC3210_CFGREG_DATA),
+                RDC3210_CFGREG_DATA);
+        spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
+        /* requeue?? */
+        if (rdc321x_wdt_device.queue && ticks)
+                mod_timer(&rdc321x_wdt_device.timer,
+                                jiffies + RDC_WDT_INTERVAL);
+        else {
+                /* ticks doesn't matter anyway */
+                complete(&rdc321x_wdt_device.stop);
+        }
+}
+static void rdc321x_wdt_reset(void)
+{
+        ticks = rdc321x_wdt_device.default_ticks;
+}
+static void rdc321x_wdt_start(void)
+{
+        unsigned long flags;
+        if (!rdc321x_wdt_device.queue) {
+                rdc321x_wdt_device.queue = 1;
+                /* Clear the timer */
+                spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
+                outl(RDC_CLS_TMR, RDC3210_CFGREG_ADDR);
+                /* Enable watchdog and set the timeout to 81.92 us */
+                outl(RDC_WDT_EN | RDC_WDT_CNT, RDC3210_CFGREG_DATA);
+                spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
+                mod_timer(&rdc321x_wdt_device.timer,
+                                jiffies + RDC_WDT_INTERVAL);
+        }
+        /* if process dies, counter is not decremented */
+        rdc321x_wdt_device.running++;
+}
+static int rdc321x_wdt_stop(void)
+{
+        if (rdc321x_wdt_device.running)
+                rdc321x_wdt_device.running = 0;
+        ticks = rdc321x_wdt_device.default_ticks;
+        return -EIO;
+}
+/* filesystem operations */
+static int rdc321x_wdt_open(struct inode *inode, struct file *file)
+{
+        if (test_and_set_bit(0, &rdc321x_wdt_device.inuse))
+                return -EBUSY;
+        return nonseekable_open(inode, file);
+}
+static int rdc321x_wdt_release(struct inode *inode, struct file *file)
+{
+        clear_bit(0, &rdc321x_wdt_device.inuse);
+        return 0;
+}
+static int rdc321x_wdt_ioctl(struct inode *inode, struct file *file,
+                                unsigned int cmd, unsigned long arg)
+{
+        void __user *argp = (void __user *)arg;
+        unsigned int value;
+        static struct watchdog_info ident = {
+                .options = WDIOF_CARDRESET,
+                .identity = "RDC321x WDT",
+        };
+        unsigned long flags;
+        switch (cmd) {
+        case WDIOC_KEEPALIVE:
+                rdc321x_wdt_reset();
+                break;
+        case WDIOC_GETSTATUS:
+                /* Read the value from the DATA register */
+                spin_lock_irqsave(&rdc321x_wdt_device.lock, flags);
+                value = inl(RDC3210_CFGREG_DATA);
+                spin_unlock_irqrestore(&rdc321x_wdt_device.lock, flags);
+                if (copy_to_user(argp, &value, sizeof(int)))
+                        return -EFAULT;
+                break;
+        case WDIOC_GETSUPPORT:
+                if (copy_to_user(argp, &ident, sizeof(ident)))
+                        return -EFAULT;
+                break;
+        case WDIOC_SETOPTIONS:
+                if (copy_from_user(&value, argp, sizeof(int)))
+                        return -EFAULT;
+                switch (value) {
+                case WDIOS_ENABLECARD:
+                        rdc321x_wdt_start();
+                        break;
+                case WDIOS_DISABLECARD:
+                        return rdc321x_wdt_stop();
+                default:
+                        return -EINVAL;
+                }
+                break;
+        default:
+                return -ENOTTY;
+        }
+        return 0;
+}
+static ssize_t rdc321x_wdt_write(struct file *file, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        if (!count)
+                return -EIO;
+        rdc321x_wdt_reset();
+        return count;
+}
+static const struct file_operations rdc321x_wdt_fops = {
+        .owner          = THIS_MODULE,
+        .llseek         = no_llseek,
+        .ioctl          = rdc321x_wdt_ioctl,
+        .open           = rdc321x_wdt_open,
+        .write          = rdc321x_wdt_write,
+        .release        = rdc321x_wdt_release,
+};
+static struct miscdevice rdc321x_wdt_misc = {
+        .minor  = WATCHDOG_MINOR,
+        .name   = "watchdog",
+        .fops   = &rdc321x_wdt_fops,
+};
+static int __devinit rdc321x_wdt_probe(struct platform_device *pdev)
+{
+        int err;
+        err = misc_register(&rdc321x_wdt_misc);
+        if (err < 0) {
+                printk(KERN_ERR PFX "watchdog misc_register failed\n");
+                return err;
+        }
+        spin_lock_init(&rdc321x_wdt_device.lock);
+        /* Reset the watchdog */
+        outl(RDC_WDT_RST, RDC3210_CFGREG_DATA);
+        init_completion(&rdc321x_wdt_device.stop);
+        rdc321x_wdt_device.queue = 0;
+        clear_bit(0, &rdc321x_wdt_device.inuse);
+        setup_timer(&rdc321x_wdt_device.timer, rdc321x_wdt_trigger, 0);
+        rdc321x_wdt_device.default_ticks = ticks;
+        printk(KERN_INFO PFX "watchdog init success\n");
+        return 0;
+}
+static int rdc321x_wdt_remove(struct platform_device *pdev)
+{
+        if (rdc321x_wdt_device.queue) {
+                rdc321x_wdt_device.queue = 0;
+                wait_for_completion(&rdc321x_wdt_device.stop);
+        }
+        misc_deregister(&rdc321x_wdt_misc);
+        return 0;
+}
+static struct platform_driver rdc321x_wdt_driver = {
+        .probe = rdc321x_wdt_probe,
+        .remove = rdc321x_wdt_remove,
+        .driver = {
+                .owner = THIS_MODULE,
+                .name = "rdc321x-wdt",
+        },
+};
+static int __init rdc321x_wdt_init(void)
+{
+        return platform_driver_register(&rdc321x_wdt_driver);
+}
+static void __exit rdc321x_wdt_exit(void)
+{
+        platform_driver_unregister(&rdc321x_wdt_driver);
+}
+module_init(rdc321x_wdt_init);
+module_exit(rdc321x_wdt_exit);
+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
+MODULE_DESCRIPTION("RDC321x watchdog driver");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 22715e3be5e7..86d42801de45 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -21,18 +21,6 @@
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * Changelog:
- *      05-Oct-2004     BJD     Added semaphore init to stop crashes on open
- *                              Fixed tmr_count / wdt_count confusion
- *                              Added configurable debug
- *
- *      11-Jan-2005     BJD     Fixed divide-by-2 in timeout code
- *
- *      25-Jan-2005     DA      Added suspend/resume support
- *                              Replaced reboot notifier with .shutdown method
- *
- *      10-Mar-2005     LCVR    Changed S3C2410_VA to S3C24XX_VA
 */
 #include <linux/module.h>
@@ -365,7 +353,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
                return -ENOENT;
        }
-        size = (res->end-res->start)+1;
+        size = (res->end - res->start) + 1;
        wdt_mem = request_mem_region(res->start, size, pdev->name);
        if (wdt_mem == NULL) {
                dev_err(dev, "failed to get memory region\n");
@@ -374,7 +362,7 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
        }
        wdt_base = ioremap(res->start, size);
-        if (wdt_base == 0) {
+        if (wdt_base == NULL) {
                dev_err(dev, "failed to ioremap() region\n");
                ret = -EINVAL;
                goto err_req;
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index a5bc91ae6ff6..d0e87cbe157c 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -102,7 +102,7 @@ static void do_suspend(void)
        /* XXX use normal device tree? */
        xenbus_suspend();
-        err = stop_machine_run(xen_suspend, &cancelled, 0);
+        err = stop_machine(xen_suspend, &cancelled, &cpumask_of_cpu(0));
        if (err) {
                printk(KERN_ERR "failed to start xen_suspend: %d\n", err);
                goto out;