249 files changed, 2567 insertions, 1750 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 10f160dc75b1..a2f46d587d55 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -267,9 +267,9 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
 {
        acpi_status status;
-        if (dev->firmware_data) {
+        if (dev->archdata.acpi_handle) {
                printk(KERN_WARNING PREFIX
-                       "Drivers changed 'firmware_data' for %s\n", dev->bus_id);
+                       "Drivers changed 'acpi_handle' for %s\n", dev->bus_id);
                return -EINVAL;
        }
        get_device(dev);
@@ -278,25 +278,26 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
                put_device(dev);
                return -EINVAL;
        }
-        dev->firmware_data = handle;
+        dev->archdata.acpi_handle = handle;
        return 0;
 }
 static int acpi_unbind_one(struct device *dev)
 {
-        if (!dev->firmware_data)
+        if (!dev->archdata.acpi_handle)
                return 0;
-        if (dev == acpi_get_physical_device(dev->firmware_data)) {
+        if (dev == acpi_get_physical_device(dev->archdata.acpi_handle)) {
                /* acpi_get_physical_device increase refcnt by one */
                put_device(dev);
-                acpi_detach_data(dev->firmware_data, acpi_glue_data_handler);
+                acpi_detach_data(dev->archdata.acpi_handle,
-                dev->firmware_data = NULL;
+                                 acpi_glue_data_handler);
+                dev->archdata.acpi_handle = NULL;
                /* acpi_bind_one increase refcnt by one */
                put_device(dev);
        } else {
                printk(KERN_ERR PREFIX
-                       "Oops, 'firmware_data' corrupt for %s\n", dev->bus_id);
+                       "Oops, 'acpi_handle' corrupt for %s\n", dev->bus_id);
        }
        return 0;
 }
@@ -328,7 +329,8 @@ static int acpi_platform_notify(struct device *dev)
        if (!ret) {
                struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-                acpi_get_name(dev->firmware_data, ACPI_FULL_PATHNAME, &buffer);
+                acpi_get_name(dev->archdata.acpi_handle,
+                              ACPI_FULL_PATHNAME, &buffer);
                DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);
                kfree(buffer.pointer);
        } else
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index f510e1196dc6..bddb14e91d3c 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -78,6 +78,7 @@ enum {
        board_ahci              = 0,
        board_ahci_vt8251       = 1,
+        board_ahci_ign_iferr    = 2,
        /* global controller registers */
        HOST_CAP                = 0x00, /* host capabilities */
@@ -168,6 +169,7 @@ enum {
        /* ap->flags bits */
        AHCI_FLAG_RESET_NEEDS_CLO       = (1 << 24),
        AHCI_FLAG_NO_NCQ                = (1 << 25),
+        AHCI_FLAG_IGN_IRQ_IF_ERR        = (1 << 26), /* ignore IRQ_IF_ERR */
 };
 struct ahci_cmd_hdr {
@@ -295,6 +297,17 @@ static const struct ata_port_info ahci_port_info[] = {
                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
                .port_ops       = &ahci_ops,
        },
+        /* board_ahci_ign_iferr */
+        {
+                .sht            = &ahci_sht,
+                .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                                  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
+                                  ATA_FLAG_SKIP_D2H_BSY |
+                                  AHCI_FLAG_IGN_IRQ_IF_ERR,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */
+                .port_ops       = &ahci_ops,
+        },
 };
 static const struct pci_device_id ahci_pci_tbl[] = {
@@ -327,11 +340,11 @@ static const struct pci_device_id ahci_pci_tbl[] = {
        { PCI_VDEVICE(INTEL, 0x294e), board_ahci }, /* ICH9M */
        /* JMicron */
-        { PCI_VDEVICE(JMICRON, 0x2360), board_ahci }, /* JMicron JMB360 */
+        { PCI_VDEVICE(JMICRON, 0x2360), board_ahci_ign_iferr }, /* JMB360 */
-        { PCI_VDEVICE(JMICRON, 0x2361), board_ahci }, /* JMicron JMB361 */
+        { PCI_VDEVICE(JMICRON, 0x2361), board_ahci_ign_iferr }, /* JMB361 */
-        { PCI_VDEVICE(JMICRON, 0x2363), board_ahci }, /* JMicron JMB363 */
+        { PCI_VDEVICE(JMICRON, 0x2363), board_ahci_ign_iferr }, /* JMB363 */
-        { PCI_VDEVICE(JMICRON, 0x2365), board_ahci }, /* JMicron JMB365 */
+        { PCI_VDEVICE(JMICRON, 0x2365), board_ahci_ign_iferr }, /* JMB365 */
-        { PCI_VDEVICE(JMICRON, 0x2366), board_ahci }, /* JMicron JMB366 */
+        { PCI_VDEVICE(JMICRON, 0x2366), board_ahci_ign_iferr }, /* JMB366 */
        /* ATI */
        { PCI_VDEVICE(ATI, 0x4380), board_ahci }, /* ATI SB600 non-raid */
@@ -980,6 +993,10 @@ static void ahci_error_intr(struct ata_port *ap, u32 irq_stat)
        /* analyze @irq_stat */
        ata_ehi_push_desc(ehi, "irq_stat 0x%08x", irq_stat);
+        /* some controllers set IRQ_IF_ERR on device errors, ignore it */
+        if (ap->flags & AHCI_FLAG_IGN_IRQ_IF_ERR)
+                irq_stat &= ~PORT_IRQ_IF_ERR;
        if (irq_stat & PORT_IRQ_TF_ERR)
                err_mask |= AC_ERR_DEV;
diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index 377425e71391..4a80ff9312b8 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -116,6 +116,7 @@ static struct scsi_host_template generic_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 1d695df5860a..64eed99f6814 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -346,6 +346,7 @@ static struct scsi_host_template ali_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 5c47a9e0e0ca..8be46a63af74 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -333,6 +333,7 @@ static struct scsi_host_template amd_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
index 96a098020a8f..2cd30761ca1f 100644
--- a/drivers/ata/pata_artop.c
+++ b/drivers/ata/pata_artop.c
@@ -314,6 +314,7 @@ static struct scsi_host_template artop_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
index 1ce28d2125f4..4e1d3b59adbb 100644
--- a/drivers/ata/pata_atiixp.c
+++ b/drivers/ata/pata_atiixp.c
@@ -216,6 +216,7 @@ static struct scsi_host_template atiixp_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index b9bbd1d454bf..29a60df465da 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -275,6 +275,7 @@ static struct scsi_host_template cmd64x_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 2cd3c0ff76df..33d2b88f9c79 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -166,6 +166,7 @@ static struct scsi_host_template cs5520_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index a07cc81ef791..981f49223469 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -180,6 +180,7 @@ static struct scsi_host_template cs5530_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index f8def3f9c618..8dafa4a49fdc 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -184,6 +184,7 @@ static struct scsi_host_template cs5535_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
index 247b43608b14..5a0b811907ee 100644
--- a/drivers/ata/pata_cypress.c
+++ b/drivers/ata/pata_cypress.c
@@ -135,6 +135,7 @@ static struct scsi_host_template cy82c693_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
index ef18c60fe140..755f79279de3 100644
--- a/drivers/ata/pata_efar.c
+++ b/drivers/ata/pata_efar.c
@@ -233,6 +233,7 @@ static struct scsi_host_template efar_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index 6d3e4c0f15fe..c0e150a9586b 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -329,6 +329,7 @@ static struct scsi_host_template hpt36x_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index fce3fcdc7e79..1eeb16f0fb02 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -775,6 +775,7 @@ static struct scsi_host_template hpt37x_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
index 58cfb2bc8098..47d7664e9eee 100644
--- a/drivers/ata/pata_hpt3x2n.c
+++ b/drivers/ata/pata_hpt3x2n.c
@@ -341,6 +341,7 @@ static struct scsi_host_template hpt3x2n_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
index 3334d72e251b..d216cc564b56 100644
--- a/drivers/ata/pata_hpt3x3.c
+++ b/drivers/ata/pata_hpt3x3.c
@@ -118,6 +118,7 @@ static struct scsi_host_template hpt3x3_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
index 640b8b0954f5..40ca2b82b7fc 100644
--- a/drivers/ata/pata_isapnp.c
+++ b/drivers/ata/pata_isapnp.c
@@ -34,6 +34,7 @@ static struct scsi_host_template isapnp_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 18ff3e59a89b..7f68f14be6fd 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -675,6 +675,7 @@ static struct scsi_host_template it821x_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
index 52a2bdf3c38d..0210b10d49cd 100644
--- a/drivers/ata/pata_jmicron.c
+++ b/drivers/ata/pata_jmicron.c
@@ -136,6 +136,7 @@ static struct scsi_host_template jmicron_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        /* Use standard CHS mapping rules */
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
index 10231ef731d1..b39078b2a47b 100644
--- a/drivers/ata/pata_legacy.c
+++ b/drivers/ata/pata_legacy.c
@@ -135,6 +135,7 @@ static struct scsi_host_template legacy_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index 9dfe3e9abea3..e00d406bfdf5 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -166,6 +166,7 @@ static struct scsi_host_template mpiix_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
index f5672de99c22..1963a4d35873 100644
--- a/drivers/ata/pata_netcell.c
+++ b/drivers/ata/pata_netcell.c
@@ -62,6 +62,7 @@ static struct scsi_host_template netcell_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        /* Use standard CHS mapping rules */
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 2a3dbeed89b4..7ec800f00ec8 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -156,6 +156,7 @@ static struct scsi_host_template ns87410_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index fc947dfecd73..8837256632e9 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -231,6 +231,7 @@ static struct scsi_host_template oldpiix_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
index a7320ba15575..c6319cf50de4 100644
--- a/drivers/ata/pata_opti.c
+++ b/drivers/ata/pata_opti.c
@@ -202,6 +202,7 @@ static struct scsi_host_template opti_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index c6906b4215de..2f4770cce04e 100644
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -359,6 +359,7 @@ static struct scsi_host_template optidma_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index e93ea2702c73..999922de476e 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -69,6 +69,7 @@ static struct scsi_host_template pcmcia_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index d894d9918b1d..beb6d10a234b 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -141,6 +141,7 @@ static struct scsi_host_template pdc2027x_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index 5ba9eb20a6c2..6baf51b2fda1 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -269,6 +269,7 @@ static struct scsi_host_template pdc_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
index 2c3cc0ccc606..314938dea1fc 100644
--- a/drivers/ata/pata_qdi.c
+++ b/drivers/ata/pata_qdi.c
@@ -164,6 +164,7 @@ static struct scsi_host_template qdi_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index 1af83d7694d5..048c2bb21ef1 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -227,6 +227,7 @@ static struct scsi_host_template radisys_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
index 4533b6357d99..e4e5ea423fef 100644
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
@@ -90,6 +90,7 @@ static struct scsi_host_template rz1000_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 067d9d223e35..0c75dae74764 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -193,6 +193,7 @@ static struct scsi_host_template sc1200_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 5bbf76ec14a4..be7f60efcb61 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -325,6 +325,7 @@ static struct scsi_host_template serverworks_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 4a2b72b4be8a..11942fd03b55 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -225,6 +225,7 @@ static struct scsi_host_template sil680_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index b9ffafb4198c..91e85f90941d 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -545,6 +545,7 @@ static struct scsi_host_template sis_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
index 08a6dc88676f..dc1cfc6d805b 100644
--- a/drivers/ata/pata_sl82c105.c
+++ b/drivers/ata/pata_sl82c105.c
@@ -237,6 +237,7 @@ static struct scsi_host_template sl82c105_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
index 9640f80e8b0d..bfda1f7e760a 100644
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
@@ -192,6 +192,7 @@ static struct scsi_host_template triflex_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 1e7be9eee9c3..c5f1616d224d 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -295,6 +295,7 @@ static struct scsi_host_template via_sht = {
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .slave_configure        = ata_scsi_slave_config,
+        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
 };
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index 9ed1c60048f0..bb7ef570514c 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -305,7 +305,7 @@ static void clear_lockup (struct atm_vcc *vcc, IADEV *dev) {
 **  |  R | NZ |  5-bit exponent  |        9-bit mantissa         |
 **  +----+----+------------------+-------------------------------+
 ** 
-**    R = reserverd (written as 0)
+**    R = reserved (written as 0)
 **    NZ = 0 if 0 cells/sec; 1 otherwise
 **
 **    if NZ = 1, rate = 1.mmmmmmmmm x 2^(eeeee) cells/sec
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 7d8a7ce73fb3..472810f8e6e7 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -355,6 +355,21 @@ static void device_remove_attrs(struct bus_type * bus, struct device * dev)
        }
 }
+#ifdef CONFIG_SYSFS_DEPRECATED
+static int make_deprecated_bus_links(struct device *dev)
+{
+        return sysfs_create_link(&dev->kobj,
+                                 &dev->bus->subsys.kset.kobj, "bus");
+}
+static void remove_deprecated_bus_links(struct device *dev)
+{
+        sysfs_remove_link(&dev->kobj, "bus");
+}
+#else
+static inline int make_deprecated_bus_links(struct device *dev) { return 0; }
+static inline void remove_deprecated_bus_links(struct device *dev) { }
+#endif
 /**
 *      bus_add_device - add device to bus
@@ -381,8 +396,7 @@ int bus_add_device(struct device * dev)
                                &dev->bus->subsys.kset.kobj, "subsystem");
                if (error)
                        goto out_subsys;
-                error = sysfs_create_link(&dev->kobj,
+                error = make_deprecated_bus_links(dev);
-                                &dev->bus->subsys.kset.kobj, "bus");
                if (error)
                        goto out_deprecated;
        }
@@ -436,7 +450,7 @@ void bus_remove_device(struct device * dev)
 {
        if (dev->bus) {
                sysfs_remove_link(&dev->kobj, "subsystem");
-                sysfs_remove_link(&dev->kobj, "bus");
+                remove_deprecated_bus_links(dev);
                sysfs_remove_link(&dev->bus->devices.kobj, dev->bus_id);
                device_remove_attrs(dev->bus, dev);
                if (dev->is_registered) {
@@ -724,6 +738,8 @@ int bus_register(struct bus_type * bus)
 {
        int retval;
+        BLOCKING_INIT_NOTIFIER_HEAD(&bus->bus_notifier);
        retval = kobject_set_name(&bus->subsys.kset.kobj, "%s", bus->name);
        if (retval)
                goto out;
@@ -782,6 +798,18 @@ void bus_unregister(struct bus_type * bus)
        subsystem_unregister(&bus->subsys);
 }
+int bus_register_notifier(struct bus_type *bus, struct notifier_block *nb)
+{
+        return blocking_notifier_chain_register(&bus->bus_notifier, nb);
+}
+EXPORT_SYMBOL_GPL(bus_register_notifier);
+int bus_unregister_notifier(struct bus_type *bus, struct notifier_block *nb)
+{
+        return blocking_notifier_chain_unregister(&bus->bus_notifier, nb);
+}
+EXPORT_SYMBOL_GPL(bus_unregister_notifier);
 int __init buses_init(void)
 {
        return subsystem_register(&bus_subsys);
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 0ff267a248db..f098881f45b2 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -352,6 +352,92 @@ static const char *class_uevent_name(struct kset *kset, struct kobject *kobj)
        return class_dev->class->name;
 }
+#ifdef CONFIG_SYSFS_DEPRECATED
+char *make_class_name(const char *name, struct kobject *kobj)
+{
+        char *class_name;
+        int size;
+        size = strlen(name) + strlen(kobject_name(kobj)) + 2;
+        class_name = kmalloc(size, GFP_KERNEL);
+        if (!class_name)
+                return ERR_PTR(-ENOMEM);
+        strcpy(class_name, name);
+        strcat(class_name, ":");
+        strcat(class_name, kobject_name(kobj));
+        return class_name;
+}
+static int deprecated_class_uevent(char **envp, int num_envp, int *cur_index,
+                                   char *buffer, int buffer_size,
+                                   int *cur_len,
+                                   struct class_device *class_dev)
+{
+        struct device *dev = class_dev->dev;
+        char *path;
+        if (!dev)
+                return 0;
+        /* add device, backing this class device (deprecated) */
+        path = kobject_get_path(&dev->kobj, GFP_KERNEL);
+        add_uevent_var(envp, num_envp, cur_index, buffer, buffer_size,
+                       cur_len, "PHYSDEVPATH=%s", path);
+        kfree(path);
+        if (dev->bus)
+                add_uevent_var(envp, num_envp, cur_index,
+                               buffer, buffer_size, cur_len,
+                               "PHYSDEVBUS=%s", dev->bus->name);
+        if (dev->driver)
+                add_uevent_var(envp, num_envp, cur_index,
+                               buffer, buffer_size, cur_len,
+                               "PHYSDEVDRIVER=%s", dev->driver->name);
+        return 0;
+}
+static int make_deprecated_class_device_links(struct class_device *class_dev)
+{
+        char *class_name;
+        int error;
+        if (!class_dev->dev)
+                return 0;
+        class_name = make_class_name(class_dev->class->name, &class_dev->kobj);
+        error = sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj,
+                                  class_name);
+        kfree(class_name);
+        return error;
+}
+static void remove_deprecated_class_device_links(struct class_device *class_dev)
+{
+        char *class_name;
+        if (!class_dev->dev)
+                return;
+        class_name = make_class_name(class_dev->class->name, &class_dev->kobj);
+        sysfs_remove_link(&class_dev->dev->kobj, class_name);
+        kfree(class_name);
+}
+#else
+static inline int deprecated_class_uevent(char **envp, int num_envp,
+                                          int *cur_index, char *buffer,
+                                          int buffer_size, int *cur_len,
+                                          struct class_device *class_dev)
+{ return 0; }
+static inline int make_deprecated_class_device_links(struct class_device *cd)
+{ return 0; }
+static void remove_deprecated_class_device_links(struct class_device *cd)
+{ }
+#endif
 static int class_uevent(struct kset *kset, struct kobject *kobj, char **envp,
                         int num_envp, char *buffer, int buffer_size)
 {
@@ -362,25 +448,8 @@ static int class_uevent(struct kset *kset, struct kobject *kobj, char **envp,
        pr_debug("%s - name = %s\n", __FUNCTION__, class_dev->class_id);
-        if (class_dev->dev) {
+        deprecated_class_uevent(envp, num_envp, &i, buffer, buffer_size,
-                /* add device, backing this class device (deprecated) */
+                                &length, class_dev);
-                struct device *dev = class_dev->dev;
-                char *path = kobject_get_path(&dev->kobj, GFP_KERNEL);
-                add_uevent_var(envp, num_envp, &i, buffer, buffer_size,
-                               &length, "PHYSDEVPATH=%s", path);
-                kfree(path);
-                if (dev->bus)
-                        add_uevent_var(envp, num_envp, &i,
-                                       buffer, buffer_size, &length,
-                                       "PHYSDEVBUS=%s", dev->bus->name);
-                if (dev->driver)
-                        add_uevent_var(envp, num_envp, &i,
-                                       buffer, buffer_size, &length,
-                                       "PHYSDEVDRIVER=%s", dev->driver->name);
-        }
        if (MAJOR(class_dev->devt)) {
                add_uevent_var(envp, num_envp, &i,
@@ -506,29 +575,11 @@ void class_device_initialize(struct class_device *class_dev)
        INIT_LIST_HEAD(&class_dev->node);
 }
-char *make_class_name(const char *name, struct kobject *kobj)
-{
-        char *class_name;
-        int size;
-        size = strlen(name) + strlen(kobject_name(kobj)) + 2;
-        class_name = kmalloc(size, GFP_KERNEL);
-        if (!class_name)
-                return ERR_PTR(-ENOMEM);
-        strcpy(class_name, name);
-        strcat(class_name, ":");
-        strcat(class_name, kobject_name(kobj));
-        return class_name;
-}
 int class_device_add(struct class_device *class_dev)
 {
        struct class *parent_class = NULL;
        struct class_device *parent_class_dev = NULL;
        struct class_interface *class_intf;
-        char *class_name = NULL;
        int error = -EINVAL;
        class_dev = class_device_get(class_dev);
@@ -599,20 +650,18 @@ int class_device_add(struct class_device *class_dev)
                goto out5;
        if (class_dev->dev) {
-                class_name = make_class_name(class_dev->class->name,
-                                             &class_dev->kobj);
                error = sysfs_create_link(&class_dev->kobj,
                                          &class_dev->dev->kobj, "device");
                if (error)
                        goto out6;
-                error = sysfs_create_link(&class_dev->dev->kobj, &class_dev->kobj,
-                                          class_name);
-                if (error)
-                        goto out7;
        }
        error = class_device_add_groups(class_dev);
        if (error)
+                goto out7;
+        error = make_deprecated_class_device_links(class_dev);
+        if (error)
                goto out8;
        kobject_uevent(&class_dev->kobj, KOBJ_ADD);
@@ -629,8 +678,7 @@ int class_device_add(struct class_device *class_dev)
        goto out1;
 out8:
-        if (class_dev->dev)
+        class_device_remove_groups(class_dev);
-                sysfs_remove_link(&class_dev->kobj, class_name);
 out7:
        if (class_dev->dev)
                sysfs_remove_link(&class_dev->kobj, "device");
@@ -649,7 +697,6 @@ int class_device_add(struct class_device *class_dev)
        class_put(parent_class);
 out1:
        class_device_put(class_dev);
-        kfree(class_name);
        return error;
 }
@@ -726,7 +773,6 @@ void class_device_del(struct class_device *class_dev)
        struct class *parent_class = class_dev->class;
        struct class_device *parent_device = class_dev->parent;
        struct class_interface *class_intf;
-        char *class_name = NULL;
        if (parent_class) {
                down(&parent_class->sem);
@@ -738,10 +784,8 @@ void class_device_del(struct class_device *class_dev)
        }
        if (class_dev->dev) {
-                class_name = make_class_name(class_dev->class->name,
+                remove_deprecated_class_device_links(class_dev);
-                                             &class_dev->kobj);
                sysfs_remove_link(&class_dev->kobj, "device");
-                sysfs_remove_link(&class_dev->dev->kobj, class_name);
        }
        sysfs_remove_link(&class_dev->kobj, "subsystem");
        class_device_remove_file(class_dev, &class_dev->uevent_attr);
@@ -755,7 +799,6 @@ void class_device_del(struct class_device *class_dev)
        class_device_put(parent_device);
        class_put(parent_class);
-        kfree(class_name);
 }
 void class_device_unregister(struct class_device *class_dev)
@@ -804,14 +847,17 @@ int class_device_rename(struct class_device *class_dev, char *new_name)
        pr_debug("CLASS: renaming '%s' to '%s'\n", class_dev->class_id,
                 new_name);
+#ifdef CONFIG_SYSFS_DEPRECATED
        if (class_dev->dev)
                old_class_name = make_class_name(class_dev->class->name,
                                                 &class_dev->kobj);
+#endif
        strlcpy(class_dev->class_id, new_name, KOBJ_NAME_LEN);
        error = kobject_rename(&class_dev->kobj, new_name);
+#ifdef CONFIG_SYSFS_DEPRECATED
        if (class_dev->dev) {
                new_class_name = make_class_name(class_dev->class->name,
                                                 &class_dev->kobj);
@@ -819,6 +865,7 @@ int class_device_rename(struct class_device *class_dev, char *new_name)
                                  new_class_name);
                sysfs_remove_link(&class_dev->dev->kobj, old_class_name);
        }
+#endif
        class_device_put(class_dev);
        kfree(old_class_name);
@@ -893,23 +940,6 @@ void class_interface_unregister(struct class_interface *class_intf)
        class_put(parent);
 }
-int virtual_device_parent(struct device *dev)
-{
-        if (!dev->class)
-                return -ENODEV;
-        if (!dev->class->virtual_dir) {
-                static struct kobject *virtual_dir = NULL;
-                if (!virtual_dir)
-                        virtual_dir = kobject_add_dir(&devices_subsys.kset.kobj, "virtual");
-                dev->class->virtual_dir = kobject_add_dir(virtual_dir, dev->class->name);
-        }
-        dev->kobj.parent = dev->class->virtual_dir;
-        return 0;
-}
 int __init classes_init(void)
 {
        int retval;
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 002fde46d38d..e4b530ef757d 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -17,6 +17,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/kdev_t.h>
+#include <linux/notifier.h>
 #include <asm/semaphore.h>
@@ -153,20 +154,24 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, char **envp,
                               "MINOR=%u", MINOR(dev->devt));
        }
+#ifdef CONFIG_SYSFS_DEPRECATED
        /* add bus name (same as SUBSYSTEM, deprecated) */
        if (dev->bus)
                add_uevent_var(envp, num_envp, &i,
                               buffer, buffer_size, &length,
                               "PHYSDEVBUS=%s", dev->bus->name);
+#endif
        /* add driver name (PHYSDEV* values are deprecated)*/
        if (dev->driver) {
                add_uevent_var(envp, num_envp, &i,
                               buffer, buffer_size, &length,
                               "DRIVER=%s", dev->driver->name);
+#ifdef CONFIG_SYSFS_DEPRECATED
                add_uevent_var(envp, num_envp, &i,
                               buffer, buffer_size, &length,
                               "PHYSDEVDRIVER=%s", dev->driver->name);
+#endif
        }
        /* terminate, set to next free slot, shrink available space */
@@ -383,6 +388,52 @@ void device_initialize(struct device *dev)
        device_init_wakeup(dev, 0);
 }
+#ifdef CONFIG_SYSFS_DEPRECATED
+static int setup_parent(struct device *dev, struct device *parent)
+{
+        /* Set the parent to the class, not the parent device */
+        /* this keeps sysfs from having a symlink to make old udevs happy */
+        if (dev->class)
+                dev->kobj.parent = &dev->class->subsys.kset.kobj;
+        else if (parent)
+                dev->kobj.parent = &parent->kobj;
+        return 0;
+}
+#else
+static int virtual_device_parent(struct device *dev)
+{
+        if (!dev->class)
+                return -ENODEV;
+        if (!dev->class->virtual_dir) {
+                static struct kobject *virtual_dir = NULL;
+                if (!virtual_dir)
+                        virtual_dir = kobject_add_dir(&devices_subsys.kset.kobj, "virtual");
+                dev->class->virtual_dir = kobject_add_dir(virtual_dir, dev->class->name);
+        }
+        dev->kobj.parent = dev->class->virtual_dir;
+        return 0;
+}
+static int setup_parent(struct device *dev, struct device *parent)
+{
+        int error;
+        /* if this is a class device, and has no parent, create one */
+        if ((dev->class) && (parent == NULL)) {
+                error = virtual_device_parent(dev);
+                if (error)
+                        return error;
+        } else if (parent)
+                dev->kobj.parent = &parent->kobj;
+        return 0;
+}
+#endif
 /**
 *      device_add - add device to device hierarchy.
 *      @dev:   device.
@@ -405,29 +456,29 @@ int device_add(struct device *dev)
        if (!dev || !strlen(dev->bus_id))
                goto Error;
-        /* if this is a class device, and has no parent, create one */
+        pr_debug("DEV: registering device: ID = '%s'\n", dev->bus_id);
-        if ((dev->class) && (dev->parent == NULL)) {
-                error = virtual_device_parent(dev);
-                if (error)
-                        goto Error;
-        }
        parent = get_device(dev->parent);
-        pr_debug("DEV: registering device: ID = '%s'\n", dev->bus_id);
+        error = setup_parent(dev, parent);
+        if (error)
+                goto Error;
        /* first, register with generic layer. */
        kobject_set_name(&dev->kobj, "%s", dev->bus_id);
-        if (parent)
+        error = kobject_add(&dev->kobj);
-                dev->kobj.parent = &parent->kobj;
+        if (error)
-        if ((error = kobject_add(&dev->kobj)))
                goto Error;
        /* notify platform of device entry */
        if (platform_notify)
                platform_notify(dev);
+        /* notify clients of device entry (new way) */
+        if (dev->bus)
+                blocking_notifier_call_chain(&dev->bus->bus_notifier,
+                                             BUS_NOTIFY_ADD_DEVICE, dev);
        dev->uevent_attr.attr.name = "uevent";
        dev->uevent_attr.attr.mode = S_IWUSR;
        if (dev->driver)
@@ -461,13 +512,18 @@ int device_add(struct device *dev)
        if (dev->class) {
                sysfs_create_link(&dev->kobj, &dev->class->subsys.kset.kobj,
                                  "subsystem");
-                sysfs_create_link(&dev->class->subsys.kset.kobj, &dev->kobj,
+                /* If this is not a "fake" compatible device, then create the
-                                  dev->bus_id);
+                 * symlink from the class to the device. */
+                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
+                        sysfs_create_link(&dev->class->subsys.kset.kobj,
+                                          &dev->kobj, dev->bus_id);
+#ifdef CONFIG_SYSFS_DEPRECATED
                if (parent) {
                        sysfs_create_link(&dev->kobj, &dev->parent->kobj, "device");
                        class_name = make_class_name(dev->class->name, &dev->kobj);
                        sysfs_create_link(&dev->parent->kobj, &dev->kobj, class_name);
                }
+#endif
        }
        if ((error = device_add_attrs(dev)))
@@ -504,6 +560,9 @@ int device_add(struct device *dev)
 BusError:
        device_pm_remove(dev);
 PMError:
+        if (dev->bus)
+                blocking_notifier_call_chain(&dev->bus->bus_notifier,
+                                             BUS_NOTIFY_DEL_DEVICE, dev);
        device_remove_groups(dev);
 GroupError:
        device_remove_attrs(dev);
@@ -586,7 +645,6 @@ void put_device(struct device * dev)
 void device_del(struct device * dev)
 {
        struct device * parent = dev->parent;
-        char *class_name = NULL;
        struct class_interface *class_intf;
        if (parent)
@@ -597,13 +655,21 @@ void device_del(struct device * dev)
        }
        if (dev->class) {
                sysfs_remove_link(&dev->kobj, "subsystem");
-                sysfs_remove_link(&dev->class->subsys.kset.kobj, dev->bus_id);
+                /* If this is not a "fake" compatible device, remove the
-                class_name = make_class_name(dev->class->name, &dev->kobj);
+                 * symlink from the class to the device. */
+                if (dev->kobj.parent != &dev->class->subsys.kset.kobj)
+                        sysfs_remove_link(&dev->class->subsys.kset.kobj,
+                                          dev->bus_id);
+#ifdef CONFIG_SYSFS_DEPRECATED
                if (parent) {
-                        sysfs_remove_link(&dev->kobj, "device");
+                        char *class_name = make_class_name(dev->class->name,
+                                                           &dev->kobj);
                        sysfs_remove_link(&dev->parent->kobj, class_name);
+                        kfree(class_name);
+                        sysfs_remove_link(&dev->kobj, "device");
                }
-                kfree(class_name);
+#endif
                down(&dev->class->sem);
                /* notify any interfaces that the device is now gone */
                list_for_each_entry(class_intf, &dev->class->interfaces, node)
@@ -616,13 +682,16 @@ void device_del(struct device * dev)
        device_remove_file(dev, &dev->uevent_attr);
        device_remove_groups(dev);
        device_remove_attrs(dev);
+        bus_remove_device(dev);
        /* Notify the platform of the removal, in case they
         * need to do anything...
         */
        if (platform_notify_remove)
                platform_notify_remove(dev);
-        bus_remove_device(dev);
+        if (dev->bus)
+                blocking_notifier_call_chain(&dev->bus->bus_notifier,
+                                             BUS_NOTIFY_DEL_DEVICE, dev);
        device_pm_remove(dev);
        kobject_uevent(&dev->kobj, KOBJ_REMOVE);
        kobject_del(&dev->kobj);
@@ -681,12 +750,45 @@ int device_for_each_child(struct device * parent, void * data,
        return error;
 }
+/**
+ * device_find_child - device iterator for locating a particular device.
+ * @parent: parent struct device
+ * @data: Data to pass to match function
+ * @match: Callback function to check device
+ *
+ * This is similar to the device_for_each_child() function above, but it
+ * returns a reference to a device that is 'found' for later use, as
+ * determined by the @match callback.
+ *
+ * The callback should return 0 if the device doesn't match and non-zero
+ * if it does.  If the callback returns non-zero and a reference to the
+ * current device can be obtained, this function will return to the caller
+ * and not iterate over any more devices.
+ */
+struct device * device_find_child(struct device *parent, void *data,
+                                  int (*match)(struct device *, void *))
+{
+        struct klist_iter i;
+        struct device *child;
+        if (!parent)
+                return NULL;
+        klist_iter_init(&parent->klist_children, &i);
+        while ((child = next_device(&i)))
+                if (match(child, data) && get_device(child))
+                        break;
+        klist_iter_exit(&i);
+        return child;
+}
 int __init devices_init(void)
 {
        return subsystem_register(&devices_subsys);
 }
 EXPORT_SYMBOL_GPL(device_for_each_child);
+EXPORT_SYMBOL_GPL(device_find_child);
 EXPORT_SYMBOL_GPL(device_initialize);
 EXPORT_SYMBOL_GPL(device_add);
@@ -809,8 +911,10 @@ int device_rename(struct device *dev, char *new_name)
        pr_debug("DEVICE: renaming '%s' to '%s'\n", dev->bus_id, new_name);
+#ifdef CONFIG_SYSFS_DEPRECATED
        if ((dev->class) && (dev->parent))
                old_class_name = make_class_name(dev->class->name, &dev->kobj);
+#endif
        if (dev->class) {
                old_symlink_name = kmalloc(BUS_ID_SIZE, GFP_KERNEL);
@@ -825,6 +929,7 @@ int device_rename(struct device *dev, char *new_name)
        error = kobject_rename(&dev->kobj, new_name);
+#ifdef CONFIG_SYSFS_DEPRECATED
        if (old_class_name) {
                new_class_name = make_class_name(dev->class->name, &dev->kobj);
                if (new_class_name) {
@@ -833,6 +938,8 @@ int device_rename(struct device *dev, char *new_name)
                        sysfs_remove_link(&dev->parent->kobj, old_class_name);
                }
        }
+#endif
        if (dev->class) {
                sysfs_remove_link(&dev->class->subsys.kset.kobj,
                                  old_symlink_name);
@@ -848,3 +955,95 @@ int device_rename(struct device *dev, char *new_name)
        return error;
 }
+static int device_move_class_links(struct device *dev,
+                                   struct device *old_parent,
+                                   struct device *new_parent)
+{
+#ifdef CONFIG_SYSFS_DEPRECATED
+        int error;
+        char *class_name;
+        class_name = make_class_name(dev->class->name, &dev->kobj);
+        if (!class_name) {
+                error = PTR_ERR(class_name);
+                class_name = NULL;
+                goto out;
+        }
+        if (old_parent) {
+                sysfs_remove_link(&dev->kobj, "device");
+                sysfs_remove_link(&old_parent->kobj, class_name);
+        }
+        error = sysfs_create_link(&dev->kobj, &new_parent->kobj, "device");
+        if (error)
+                goto out;
+        error = sysfs_create_link(&new_parent->kobj, &dev->kobj, class_name);
+        if (error)
+                sysfs_remove_link(&dev->kobj, "device");
+out:
+        kfree(class_name);
+        return error;
+#else
+        return 0;
+#endif
+}
+/**
+ * device_move - moves a device to a new parent
+ * @dev: the pointer to the struct device to be moved
+ * @new_parent: the new parent of the device
+ */
+int device_move(struct device *dev, struct device *new_parent)
+{
+        int error;
+        struct device *old_parent;
+        dev = get_device(dev);
+        if (!dev)
+                return -EINVAL;
+        if (!device_is_registered(dev)) {
+                error = -EINVAL;
+                goto out;
+        }
+        new_parent = get_device(new_parent);
+        if (!new_parent) {
+                error = -EINVAL;
+                goto out;
+        }
+        pr_debug("DEVICE: moving '%s' to '%s'\n", dev->bus_id,
+                new_parent->bus_id);
+        error = kobject_move(&dev->kobj, &new_parent->kobj);
+        if (error) {
+                put_device(new_parent);
+                goto out;
+        }
+        old_parent = dev->parent;
+        dev->parent = new_parent;
+        if (old_parent)
+                klist_remove(&dev->knode_parent);
+        klist_add_tail(&dev->knode_parent, &new_parent->klist_children);
+        if (!dev->class)
+                goto out_put;
+        error = device_move_class_links(dev, old_parent, new_parent);
+        if (error) {
+                /* We ignore errors on cleanup since we're hosed anyway... */
+                device_move_class_links(dev, new_parent, old_parent);
+                if (!kobject_move(&dev->kobj, &old_parent->kobj)) {
+                        klist_remove(&dev->knode_parent);
+                        if (old_parent)
+                                klist_add_tail(&dev->knode_parent,
+                                               &old_parent->klist_children);
+                }
+                put_device(new_parent);
+                goto out;
+        }
+out_put:
+        put_device(old_parent);
+out:
+        put_device(dev);
+        return error;
+}
+EXPORT_SYMBOL_GPL(device_move);
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index c5d6bb4290ad..510e7884975f 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -26,33 +26,28 @@
 #define to_drv(node) container_of(node, struct device_driver, kobj.entry)
-/**
+static void driver_bound(struct device *dev)
- *      device_bind_driver - bind a driver to one device.
- *      @dev:   device.
- *
- *      Allow manual attachment of a driver to a device.
- *      Caller must have already set @dev->driver.
- *
- *      Note that this does not modify the bus reference count
- *      nor take the bus's rwsem. Please verify those are accounted
- *      for before calling this. (It is ok to call with no other effort
- *      from a driver's probe() method.)
- *
- *      This function must be called with @dev->sem held.
- */
-int device_bind_driver(struct device *dev)
 {
-        int ret;
        if (klist_node_attached(&dev->knode_driver)) {
                printk(KERN_WARNING "%s: device %s already bound\n",
                        __FUNCTION__, kobject_name(&dev->kobj));
-                return 0;
+                return;
        }
        pr_debug("bound device '%s' to driver '%s'\n",
                 dev->bus_id, dev->driver->name);
+        if (dev->bus)
+                blocking_notifier_call_chain(&dev->bus->bus_notifier,
+                                             BUS_NOTIFY_BOUND_DRIVER, dev);
        klist_add_tail(&dev->knode_driver, &dev->driver->klist_devices);
+}
+static int driver_sysfs_add(struct device *dev)
+{
+        int ret;
        ret = sysfs_create_link(&dev->driver->kobj, &dev->kobj,
                          kobject_name(&dev->kobj));
        if (ret == 0) {
@@ -65,6 +60,36 @@ int device_bind_driver(struct device *dev)
        return ret;
 }
+static void driver_sysfs_remove(struct device *dev)
+{
+        struct device_driver *drv = dev->driver;
+        if (drv) {
+                sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
+                sysfs_remove_link(&dev->kobj, "driver");
+        }
+}
+/**
+ *      device_bind_driver - bind a driver to one device.
+ *      @dev:   device.
+ *
+ *      Allow manual attachment of a driver to a device.
+ *      Caller must have already set @dev->driver.
+ *
+ *      Note that this does not modify the bus reference count
+ *      nor take the bus's rwsem. Please verify those are accounted
+ *      for before calling this. (It is ok to call with no other effort
+ *      from a driver's probe() method.)
+ *
+ *      This function must be called with @dev->sem held.
+ */
+int device_bind_driver(struct device *dev)
+{
+        driver_bound(dev);
+        return driver_sysfs_add(dev);
+}
 struct stupid_thread_structure {
        struct device_driver *drv;
        struct device *dev;
@@ -85,30 +110,32 @@ static int really_probe(void *void_data)
                 drv->bus->name, drv->name, dev->bus_id);
        dev->driver = drv;
+        if (driver_sysfs_add(dev)) {
+                printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n",
+                        __FUNCTION__, dev->bus_id);
+                goto probe_failed;
+        }
        if (dev->bus->probe) {
                ret = dev->bus->probe(dev);
-                if (ret) {
+                if (ret)
-                        dev->driver = NULL;
                        goto probe_failed;
-                }
        } else if (drv->probe) {
                ret = drv->probe(dev);
-                if (ret) {
+                if (ret)
-                        dev->driver = NULL;
                        goto probe_failed;
-                }
-        }
-        if (device_bind_driver(dev)) {
-                printk(KERN_ERR "%s: device_bind_driver(%s) failed\n",
-                        __FUNCTION__, dev->bus_id);
-                /* How does undo a ->probe?  We're screwed. */
        }
+        driver_bound(dev);
        ret = 1;
        pr_debug("%s: Bound Device %s to Driver %s\n",
                 drv->bus->name, dev->bus_id, drv->name);
        goto done;
 probe_failed:
+        driver_sysfs_remove(dev);
+        dev->driver = NULL;
        if (ret == -ENODEV || ret == -ENXIO) {
                /* Driver matched, but didn't support device
                 * or device not found.
@@ -284,10 +311,15 @@ static void __device_release_driver(struct device * dev)
        drv = dev->driver;
        if (drv) {
                get_driver(drv);
-                sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj));
+                driver_sysfs_remove(dev);
                sysfs_remove_link(&dev->kobj, "driver");
                klist_remove(&dev->knode_driver);
+                if (dev->bus)
+                        blocking_notifier_call_chain(&dev->bus->bus_notifier,
+                                                     BUS_NOTIFY_UNBIND_DRIVER,
+                                                     dev);
                if (dev->bus && dev->bus->remove)
                        dev->bus->remove(dev);
                else if (drv->remove)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 14615694ae9a..4bad2870c485 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -21,6 +21,8 @@
 #include <linux/firmware.h>
 #include "base.h"
+#define to_dev(obj) container_of(obj, struct device, kobj)
 MODULE_AUTHOR("Manuel Estrada Sainz <ranty@debian.org>");
 MODULE_DESCRIPTION("Multi purpose firmware loading support");
 MODULE_LICENSE("GPL");
@@ -86,12 +88,12 @@ firmware_timeout_store(struct class *class, const char *buf, size_t count)
 static CLASS_ATTR(timeout, 0644, firmware_timeout_show, firmware_timeout_store);
-static void  fw_class_dev_release(struct class_device *class_dev);
+static void fw_dev_release(struct device *dev);
-static int firmware_class_uevent(struct class_device *class_dev, char **envp,
+static int firmware_uevent(struct device *dev, char **envp, int num_envp,
-                                 int num_envp, char *buffer, int buffer_size)
+                           char *buffer, int buffer_size)
 {
-        struct firmware_priv *fw_priv = class_get_devdata(class_dev);
+        struct firmware_priv *fw_priv = dev_get_drvdata(dev);
        int i = 0, len = 0;
        if (!test_bit(FW_STATUS_READY, &fw_priv->status))
@@ -110,21 +112,21 @@ static int firmware_class_uevent(struct class_device *class_dev, char **envp,
 static struct class firmware_class = {
        .name           = "firmware",
-        .uevent         = firmware_class_uevent,
+        .dev_uevent     = firmware_uevent,
-        .release        = fw_class_dev_release,
+        .dev_release    = fw_dev_release,
 };
-static ssize_t
+static ssize_t firmware_loading_show(struct device *dev,
-firmware_loading_show(struct class_device *class_dev, char *buf)
+                                     struct device_attribute *attr, char *buf)
 {
-        struct firmware_priv *fw_priv = class_get_devdata(class_dev);
+        struct firmware_priv *fw_priv = dev_get_drvdata(dev);
        int loading = test_bit(FW_STATUS_LOADING, &fw_priv->status);
        return sprintf(buf, "%d\n", loading);
 }
 /**
 * firmware_loading_store - set value in the 'loading' control file
- * @class_dev: class_device pointer
+ * @dev: device pointer
 * @buf: buffer to scan for loading control value
 * @count: number of bytes in @buf
 *
@@ -134,11 +136,11 @@ firmware_loading_show(struct class_device *class_dev, char *buf)
 *       0: Conclude the load and hand the data to the driver code.
 *      -1: Conclude the load with an error and discard any written data.
 **/
-static ssize_t
+static ssize_t firmware_loading_store(struct device *dev,
-firmware_loading_store(struct class_device *class_dev,
+                                      struct device_attribute *attr,
-                       const char *buf, size_t count)
+                                      const char *buf, size_t count)
 {
-        struct firmware_priv *fw_priv = class_get_devdata(class_dev);
+        struct firmware_priv *fw_priv = dev_get_drvdata(dev);
        int loading = simple_strtol(buf, NULL, 10);
        switch (loading) {
@@ -174,15 +176,14 @@ firmware_loading_store(struct class_device *class_dev,
        return count;
 }
-static CLASS_DEVICE_ATTR(loading, 0644,
+static DEVICE_ATTR(loading, 0644, firmware_loading_show, firmware_loading_store);
-                        firmware_loading_show, firmware_loading_store);
 static ssize_t
 firmware_data_read(struct kobject *kobj,
                   char *buffer, loff_t offset, size_t count)
 {
-        struct class_device *class_dev = to_class_dev(kobj);
+        struct device *dev = to_dev(kobj);
-        struct firmware_priv *fw_priv = class_get_devdata(class_dev);
+        struct firmware_priv *fw_priv = dev_get_drvdata(dev);
        struct firmware *fw;
        ssize_t ret_count = count;
@@ -234,7 +235,7 @@ fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
 /**
 * firmware_data_write - write method for firmware
- * @kobj: kobject for the class_device
+ * @kobj: kobject for the device
 * @buffer: buffer being written
 * @offset: buffer offset for write in total data store area
 * @count: buffer size
@@ -246,8 +247,8 @@ static ssize_t
 firmware_data_write(struct kobject *kobj,
                    char *buffer, loff_t offset, size_t count)
 {
-        struct class_device *class_dev = to_class_dev(kobj);
+        struct device *dev = to_dev(kobj);
-        struct firmware_priv *fw_priv = class_get_devdata(class_dev);
+        struct firmware_priv *fw_priv = dev_get_drvdata(dev);
        struct firmware *fw;
        ssize_t retval;
@@ -280,13 +281,12 @@ static struct bin_attribute firmware_attr_data_tmpl = {
        .write = firmware_data_write,
 };
-static void
+static void fw_dev_release(struct device *dev)
-fw_class_dev_release(struct class_device *class_dev)
 {
-        struct firmware_priv *fw_priv = class_get_devdata(class_dev);
+        struct firmware_priv *fw_priv = dev_get_drvdata(dev);
        kfree(fw_priv);
-        kfree(class_dev);
+        kfree(dev);
        module_put(THIS_MODULE);
 }
@@ -298,26 +298,23 @@ firmware_class_timeout(u_long data)
        fw_load_abort(fw_priv);
 }
-static inline void
+static inline void fw_setup_device_id(struct device *f_dev, struct device *dev)
-fw_setup_class_device_id(struct class_device *class_dev, struct device *dev)
 {
        /* XXX warning we should watch out for name collisions */
-        strlcpy(class_dev->class_id, dev->bus_id, BUS_ID_SIZE);
+        strlcpy(f_dev->bus_id, dev->bus_id, BUS_ID_SIZE);
 }
-static int
+static int fw_register_device(struct device **dev_p, const char *fw_name,
-fw_register_class_device(struct class_device **class_dev_p,
+                              struct device *device)
-                         const char *fw_name, struct device *device)
 {
        int retval;
        struct firmware_priv *fw_priv = kzalloc(sizeof(*fw_priv),
                                                GFP_KERNEL);
-        struct class_device *class_dev = kzalloc(sizeof(*class_dev),
+        struct device *f_dev = kzalloc(sizeof(*f_dev), GFP_KERNEL);
-                                                 GFP_KERNEL);
-        *class_dev_p = NULL;
+        *dev_p = NULL;
-        if (!fw_priv || !class_dev) {
+        if (!fw_priv || !f_dev) {
                printk(KERN_ERR "%s: kmalloc failed\n", __FUNCTION__);
                retval = -ENOMEM;
                goto error_kfree;
@@ -331,55 +328,54 @@ fw_register_class_device(struct class_device **class_dev_p,
        fw_priv->timeout.data = (u_long) fw_priv;
        init_timer(&fw_priv->timeout);
-        fw_setup_class_device_id(class_dev, device);
+        fw_setup_device_id(f_dev, device);
-        class_dev->dev = device;
+        f_dev->parent = device;
-        class_dev->class = &firmware_class;
+        f_dev->class = &firmware_class;
-        class_set_devdata(class_dev, fw_priv);
+        dev_set_drvdata(f_dev, fw_priv);
-        retval = class_device_register(class_dev);
+        retval = device_register(f_dev);
        if (retval) {
-                printk(KERN_ERR "%s: class_device_register failed\n",
+                printk(KERN_ERR "%s: device_register failed\n",
                       __FUNCTION__);
                goto error_kfree;
        }
-        *class_dev_p = class_dev;
+        *dev_p = f_dev;
        return 0;
 error_kfree:
        kfree(fw_priv);
-        kfree(class_dev);
+        kfree(f_dev);
        return retval;
 }
-static int
+static int fw_setup_device(struct firmware *fw, struct device **dev_p,
-fw_setup_class_device(struct firmware *fw, struct class_device **class_dev_p,
+                           const char *fw_name, struct device *device,
-                      const char *fw_name, struct device *device, int uevent)
+                           int uevent)
 {
-        struct class_device *class_dev;
+        struct device *f_dev;
        struct firmware_priv *fw_priv;
        int retval;
-        *class_dev_p = NULL;
+        *dev_p = NULL;
-        retval = fw_register_class_device(&class_dev, fw_name, device);
+        retval = fw_register_device(&f_dev, fw_name, device);
        if (retval)
                goto out;
        /* Need to pin this module until class device is destroyed */
        __module_get(THIS_MODULE);
-        fw_priv = class_get_devdata(class_dev);
+        fw_priv = dev_get_drvdata(f_dev);
        fw_priv->fw = fw;
-        retval = sysfs_create_bin_file(&class_dev->kobj, &fw_priv->attr_data);
+        retval = sysfs_create_bin_file(&f_dev->kobj, &fw_priv->attr_data);
        if (retval) {
                printk(KERN_ERR "%s: sysfs_create_bin_file failed\n",
                       __FUNCTION__);
                goto error_unreg;
        }
-        retval = class_device_create_file(class_dev,
+        retval = device_create_file(f_dev, &dev_attr_loading);
-                                          &class_device_attr_loading);
        if (retval) {
-                printk(KERN_ERR "%s: class_device_create_file failed\n",
+                printk(KERN_ERR "%s: device_create_file failed\n",
                       __FUNCTION__);
                goto error_unreg;
        }
@@ -388,11 +384,11 @@ fw_setup_class_device(struct firmware *fw, struct class_device **class_dev_p,
                set_bit(FW_STATUS_READY, &fw_priv->status);
        else
                set_bit(FW_STATUS_READY_NOHOTPLUG, &fw_priv->status);
-        *class_dev_p = class_dev;
+        *dev_p = f_dev;
        goto out;
 error_unreg:
-        class_device_unregister(class_dev);
+        device_unregister(f_dev);
 out:
        return retval;
 }
@@ -401,7 +397,7 @@ static int
 _request_firmware(const struct firmware **firmware_p, const char *name,
                 struct device *device, int uevent)
 {
-        struct class_device *class_dev;
+        struct device *f_dev;
        struct firmware_priv *fw_priv;
        struct firmware *firmware;
        int retval;
@@ -417,12 +413,11 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
                goto out;
        }
-        retval = fw_setup_class_device(firmware, &class_dev, name, device,
+        retval = fw_setup_device(firmware, &f_dev, name, device, uevent);
-                                       uevent);
        if (retval)
                goto error_kfree_fw;
-        fw_priv = class_get_devdata(class_dev);
+        fw_priv = dev_get_drvdata(f_dev);
        if (uevent) {
                if (loading_timeout > 0) {
@@ -430,7 +425,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
                        add_timer(&fw_priv->timeout);
                }
-                kobject_uevent(&class_dev->kobj, KOBJ_ADD);
+                kobject_uevent(&f_dev->kobj, KOBJ_ADD);
                wait_for_completion(&fw_priv->completion);
                set_bit(FW_STATUS_DONE, &fw_priv->status);
                del_timer_sync(&fw_priv->timeout);
@@ -445,7 +440,7 @@ _request_firmware(const struct firmware **firmware_p, const char *name,
        }
        fw_priv->fw = NULL;
        mutex_unlock(&fw_lock);
-        class_device_unregister(class_dev);
+        device_unregister(f_dev);
        goto out;
 error_kfree_fw:
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 940ce41f1887..d1df4a087924 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -388,6 +388,11 @@ static int platform_drv_probe(struct device *_dev)
        return drv->probe(dev);
 }
+static int platform_drv_probe_fail(struct device *_dev)
+{
+        return -ENXIO;
+}
 static int platform_drv_remove(struct device *_dev)
 {
        struct platform_driver *drv = to_platform_driver(_dev->driver);
@@ -451,6 +456,49 @@ void platform_driver_unregister(struct platform_driver *drv)
 }
 EXPORT_SYMBOL_GPL(platform_driver_unregister);
+/**
+ * platform_driver_probe - register driver for non-hotpluggable device
+ * @drv: platform driver structure
+ * @probe: the driver probe routine, probably from an __init section
+ *
+ * Use this instead of platform_driver_register() when you know the device
+ * is not hotpluggable and has already been registered, and you want to
+ * remove its run-once probe() infrastructure from memory after the driver
+ * has bound to the device.
+ *
+ * One typical use for this would be with drivers for controllers integrated
+ * into system-on-chip processors, where the controller devices have been
+ * configured as part of board setup.
+ *
+ * Returns zero if the driver registered and bound to a device, else returns
+ * a negative error code and with the driver not registered.
+ */
+int platform_driver_probe(struct platform_driver *drv,
+                int (*probe)(struct platform_device *))
+{
+        int retval, code;
+        /* temporary section violation during probe() */
+        drv->probe = probe;
+        retval = code = platform_driver_register(drv);
+        /* Fixup that section violation, being paranoid about code scanning
+         * the list of drivers in order to probe new devices.  Check to see
+         * if the probe was successful, and make sure any forced probes of
+         * new devices fail.
+         */
+        spin_lock(&platform_bus_type.klist_drivers.k_lock);
+        drv->probe = NULL;
+        if (code == 0 && list_empty(&drv->driver.klist_devices.k_list))
+                retval = -ENODEV;
+        drv->driver.probe = platform_drv_probe_fail;
+        spin_unlock(&platform_bus_type.klist_drivers.k_lock);
+        if (code != retval)
+                platform_driver_unregister(drv);
+        return retval;
+}
+EXPORT_SYMBOL_GPL(platform_driver_probe);
 /* modalias support enables more hands-off userspace setup:
 * (a) environment variable lets new-style hotplug events work once system is
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 28dccb730af9..3d12b85b0962 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -94,54 +94,63 @@ static struct attribute_group topology_attr_group = {
        .name = "topology"
 };
+static cpumask_t topology_dev_map = CPU_MASK_NONE;
 /* Add/Remove cpu_topology interface for CPU device */
-static int __cpuinit topology_add_dev(struct sys_device * sys_dev)
+static int __cpuinit topology_add_dev(unsigned int cpu)
 {
-        return sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
+        int rc;
+        struct sys_device *sys_dev = get_cpu_sysdev(cpu);
+        rc = sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
+        if (!rc)
+                cpu_set(cpu, topology_dev_map);
+        return rc;
 }
-static int __cpuinit topology_remove_dev(struct sys_device * sys_dev)
+#ifdef CONFIG_HOTPLUG_CPU
+static void __cpuinit topology_remove_dev(unsigned int cpu)
 {
+        struct sys_device *sys_dev = get_cpu_sysdev(cpu);
+        if (!cpu_isset(cpu, topology_dev_map))
+                return;
+        cpu_clear(cpu, topology_dev_map);
        sysfs_remove_group(&sys_dev->kobj, &topology_attr_group);
-        return 0;
 }
 static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
-                unsigned long action, void *hcpu)
+                                           unsigned long action, void *hcpu)
 {
        unsigned int cpu = (unsigned long)hcpu;
-        struct sys_device *sys_dev;
+        int rc = 0;
-        sys_dev = get_cpu_sysdev(cpu);
        switch (action) {
-        case CPU_ONLINE:
+        case CPU_UP_PREPARE:
-                topology_add_dev(sys_dev);
+                rc = topology_add_dev(cpu);
                break;
+        case CPU_UP_CANCELED:
        case CPU_DEAD:
-                topology_remove_dev(sys_dev);
+                topology_remove_dev(cpu);
                break;
        }
-        return NOTIFY_OK;
+        return rc ? NOTIFY_BAD : NOTIFY_OK;
 }
+#endif
-static struct notifier_block __cpuinitdata topology_cpu_notifier =
-{
-        .notifier_call = topology_cpu_callback,
-};
 static int __cpuinit topology_sysfs_init(void)
 {
-        int i;
+        int cpu;
+        int rc;
-        for_each_online_cpu(i) {
+        for_each_online_cpu(cpu) {
-                topology_cpu_callback(&topology_cpu_notifier, CPU_ONLINE,
+                rc = topology_add_dev(cpu);
-                                (void *)(long)i);
+                if (rc)
+                        return rc;
        }
+        hotcpu_notifier(topology_cpu_callback, 0);
-        register_hotcpu_notifier(&topology_cpu_notifier);
        return 0;
 }
 device_initcall(topology_sysfs_init);
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 7ea0f48f8fa6..2df5cf4ec743 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -2133,16 +2133,14 @@ static int cdrom_read_cdda_bpc(struct cdrom_device_info *cdi, __u8 __user *ubuf,
                rq->timeout = 60 * HZ;
                bio = rq->bio;
-                if (rq->bio)
-                        blk_queue_bounce(q, &rq->bio);
                if (blk_execute_rq(q, cdi->disk, rq, 0)) {
                        struct request_sense *s = rq->sense;
                        ret = -EIO;
                        cdi->last_sense = s->sense_key;
                }
-                if (blk_rq_unmap_user(bio, len))
+                rq->bio = bio;
+                if (blk_rq_unmap_user(rq))
                        ret = -EFAULT;
                if (ret)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 2af12fc45115..ad8b537ad47b 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -994,7 +994,7 @@ config HPET
        help
          If you say Y here, you will have a miscdevice named "/dev/hpet/".  Each
          open selects one of the timers supported by the HPET.  The timers are
-          non-periodioc and/or periodic.
+          non-periodic and/or periodic.
 config HPET_RTC_IRQ
        bool "HPET Control RTC IRQ" if !HPET_EMULATE_RTC
diff --git a/drivers/char/hw_random/core.c b/drivers/char/hw_random/core.c
index 154a81d328c1..ebace201bec6 100644
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
@@ -162,7 +162,8 @@ static struct miscdevice rng_miscdev = {
 };
-static ssize_t hwrng_attr_current_store(struct class_device *class,
+static ssize_t hwrng_attr_current_store(struct device *dev,
+                                        struct device_attribute *attr,
                                        const char *buf, size_t len)
 {
        int err;
@@ -192,7 +193,8 @@ static ssize_t hwrng_attr_current_store(struct class_device *class,
        return err ? : len;
 }
-static ssize_t hwrng_attr_current_show(struct class_device *class,
+static ssize_t hwrng_attr_current_show(struct device *dev,
+                                       struct device_attribute *attr,
                                       char *buf)
 {
        int err;
@@ -210,7 +212,8 @@ static ssize_t hwrng_attr_current_show(struct class_device *class,
        return ret;
 }
-static ssize_t hwrng_attr_available_show(struct class_device *class,
+static ssize_t hwrng_attr_available_show(struct device *dev,
+                                         struct device_attribute *attr,
                                         char *buf)
 {
        int err;
@@ -234,20 +237,18 @@ static ssize_t hwrng_attr_available_show(struct class_device *class,
        return ret;
 }
-static CLASS_DEVICE_ATTR(rng_current, S_IRUGO | S_IWUSR,
+static DEVICE_ATTR(rng_current, S_IRUGO | S_IWUSR,
-                         hwrng_attr_current_show,
+                   hwrng_attr_current_show,
-                         hwrng_attr_current_store);
+                   hwrng_attr_current_store);
-static CLASS_DEVICE_ATTR(rng_available, S_IRUGO,
+static DEVICE_ATTR(rng_available, S_IRUGO,
-                         hwrng_attr_available_show,
+                   hwrng_attr_available_show,
-                         NULL);
+                   NULL);
 static void unregister_miscdev(void)
 {
-        class_device_remove_file(rng_miscdev.class,
+        device_remove_file(rng_miscdev.this_device, &dev_attr_rng_available);
-                                 &class_device_attr_rng_available);
+        device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current);
-        class_device_remove_file(rng_miscdev.class,
-                                 &class_device_attr_rng_current);
        misc_deregister(&rng_miscdev);
 }
@@ -258,20 +259,19 @@ static int register_miscdev(void)
        err = misc_register(&rng_miscdev);
        if (err)
                goto out;
-        err = class_device_create_file(rng_miscdev.class,
+        err = device_create_file(rng_miscdev.this_device,
-                                       &class_device_attr_rng_current);
+                                 &dev_attr_rng_current);
        if (err)
                goto err_misc_dereg;
-        err = class_device_create_file(rng_miscdev.class,
+        err = device_create_file(rng_miscdev.this_device,
-                                       &class_device_attr_rng_available);
+                                 &dev_attr_rng_available);
        if (err)
                goto err_remove_current;
 out:
        return err;
 err_remove_current:
-        class_device_remove_file(rng_miscdev.class,
+        device_remove_file(rng_miscdev.this_device, &dev_attr_rng_current);
-                                 &class_device_attr_rng_current);
 err_misc_dereg:
        misc_deregister(&rng_miscdev);
        goto out;
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 55473371b7c6..e67eef4867ba 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -980,10 +980,10 @@ static int __init chr_dev_init(void)
        mem_class = class_create(THIS_MODULE, "mem");
        for (i = 0; i < ARRAY_SIZE(devlist); i++)
-                class_device_create(mem_class, NULL,
+                device_create(mem_class, NULL,
-                                        MKDEV(MEM_MAJOR, devlist[i].minor),
+                              MKDEV(MEM_MAJOR, devlist[i].minor),
-                                        NULL, devlist[i].name);
+                              devlist[i].name);
-        
        return 0;
 }
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 62ebe09656e3..7a484fc7cb9e 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -169,11 +169,6 @@ fail:
        return err;
 }
-/* 
- * TODO for 2.7:
- *  - add a struct kref to struct miscdevice and make all usages of
- *    them dynamic.
- */
 static struct class *misc_class;
 static const struct file_operations misc_fops = {
@@ -228,10 +223,10 @@ int misc_register(struct miscdevice * misc)
                misc_minors[misc->minor >> 3] |= 1 << (misc->minor & 7);
        dev = MKDEV(MISC_MAJOR, misc->minor);
-        misc->class = class_device_create(misc_class, NULL, dev, misc->dev,
+        misc->this_device = device_create(misc_class, misc->parent, dev,
                                          "%s", misc->name);
-        if (IS_ERR(misc->class)) {
+        if (IS_ERR(misc->this_device)) {
-                err = PTR_ERR(misc->class);
+                err = PTR_ERR(misc->this_device);
                goto out;
        }
@@ -264,7 +259,7 @@ int misc_deregister(struct miscdevice * misc)
        down(&misc_sem);
        list_del(&misc->list);
-        class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
+        device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor));
        if (i < DYNAMIC_MINORS && i>0) {
                misc_minors[i>>3] &= ~(1 << (misc->minor & 7));
        }
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index efc485edad1c..c1e3dd837fc8 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -752,13 +752,13 @@ static const struct file_operations pp_fops = {
 static void pp_attach(struct parport *port)
 {
-        class_device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number),
+        device_create(ppdev_class, NULL, MKDEV(PP_MAJOR, port->number),
-                        NULL, "parport%d", port->number);
+                        "parport%d", port->number);
 }
 static void pp_detach(struct parport *port)
 {
-        class_device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number));
+        device_destroy(ppdev_class, MKDEV(PP_MAJOR, port->number));
 }
 static struct parport_driver pp_driver = {
diff --git a/drivers/char/raw.c b/drivers/char/raw.c
index 89b718e326e5..3b32313f6eb4 100644
--- a/drivers/char/raw.c
+++ b/drivers/char/raw.c
@@ -127,9 +127,9 @@ raw_ioctl(struct inode *inode, struct file *filp,
 static void bind_device(struct raw_config_request *rq)
 {
-        class_device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));
+        device_destroy(raw_class, MKDEV(RAW_MAJOR, rq->raw_minor));
-        class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor),
+        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, rq->raw_minor),
-                                      NULL, "raw%d", rq->raw_minor);
+                      "raw%d", rq->raw_minor);
 }
 /*
@@ -200,7 +200,7 @@ static int raw_ctl_ioctl(struct inode *inode, struct file *filp,
                        if (rq.block_major == 0 && rq.block_minor == 0) {
                                /* unbind */
                                rawdev->binding = NULL;
-                                class_device_destroy(raw_class,
+                                device_destroy(raw_class,
                                                MKDEV(RAW_MAJOR, rq.raw_minor));
                        } else {
                                rawdev->binding = bdget(dev);
@@ -283,7 +283,7 @@ static int __init raw_init(void)
                ret = PTR_ERR(raw_class);
                goto error_region;
        }
-        class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
+        device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), "rawctl");
        return 0;
@@ -295,7 +295,7 @@ error:
 static void __exit raw_exit(void)
 {
-        class_device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));
+        device_destroy(raw_class, MKDEV(RAW_MAJOR, 0));
        class_destroy(raw_class);
        cdev_del(&raw_cdev);
        unregister_chrdev_region(MKDEV(RAW_MAJOR, 0), MAX_RAW_MINORS);
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c
index 4df6ab2206a1..167ebc84e8d7 100644
--- a/drivers/char/rio/riocmd.c
+++ b/drivers/char/rio/riocmd.c
@@ -922,7 +922,7 @@ int RIOUnUse(unsigned long iPortP, struct CmdBlk *CmdBlkP)
 ** 
 ** Packet is an actual packet structure to be filled in with the packet
 ** information associated with the command. You need to fill in everything,
-** as the command processore doesn't process the command packet in any way.
+** as the command processor doesn't process the command packet in any way.
 ** 
 ** The PreFuncP is called before the packet is enqueued on the host rup.
 ** PreFuncP is called as (*PreFuncP)(PreArg, CmdBlkP);. PreFuncP must
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c
index 99f3df02b61c..0794844369d6 100644
--- a/drivers/char/rio/rioinit.c
+++ b/drivers/char/rio/rioinit.c
@@ -222,7 +222,7 @@ int RIOBoardTest(unsigned long paddr, void __iomem *caddr, unsigned char type, i
 ** which value will be written into memory.
 ** Call with op set to zero means that the RAM will not be read and checked
 ** before it is written.
-** Call with op not zero, and the RAM will be read and compated with val[op-1]
+** Call with op not zero and the RAM will be read and compared with val[op-1]
 ** to check that the data from the previous phase was retained.
 */
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c
index 1066d9760704..bb498d24adcc 100644
--- a/drivers/char/rio/rioparam.c
+++ b/drivers/char/rio/rioparam.c
@@ -87,8 +87,8 @@ static char *_rioparam_c_sccs_ = "@(#)rioparam.c	1.3";
 ** command bit set onto the port. The command bit is in the len field,
 ** and gets ORed in with the actual byte count.
 **
-** When you send a packet with the command bit set, then the first
+** When you send a packet with the command bit set the first
-** data byte ( data[0] ) is interpretted as the command to execute.
+** data byte (data[0]) is interpreted as the command to execute.
 ** It also governs what data structure overlay should accompany the packet.
 ** Commands are defined in cirrus/cirrus.h
 **
@@ -103,7 +103,7 @@ static char *_rioparam_c_sccs_ = "@(#)rioparam.c	1.3";
 **
 ** Most commands do not use the remaining bytes in the data array. The
 ** exceptions are OPEN MOPEN and CONFIG. (NB. As with the SI CONFIG and
-** OPEN are currently analagous). With these three commands the following
+** OPEN are currently analogous). With these three commands the following
 ** 11 data bytes are all used to pass config information such as baud rate etc.
 ** The fields are also defined in cirrus.h. Some contain straightforward
 ** information such as the transmit XON character. Two contain the transmit and
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 6ad2d3bb945c..6e1329d404d2 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -1130,7 +1130,7 @@ struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
        scnprintf(devname, DEVNAME_SIZE, "%s%d", "tpm", chip->dev_num);
        chip->vendor.miscdev.name = devname;
-        chip->vendor.miscdev.dev = dev;
+        chip->vendor.miscdev.parent = dev;
        chip->dev = get_device(dev);
        if (misc_register(&chip->vendor.miscdev)) {
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index e90ea39c7c4b..50dc49205a23 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -3612,7 +3612,8 @@ static struct class *tty_class;
 *              This field is optional, if there is no known struct device
 *              for this tty device it can be set to NULL safely.
 *
- *      Returns a pointer to the class device (or ERR_PTR(-EFOO) on error).
+ *      Returns a pointer to the struct device for this tty device
+ *      (or ERR_PTR(-EFOO) on error).
 *
 *      This call is required to be made to register an individual tty device
 *      if the tty driver's flags have the TTY_DRIVER_DYNAMIC_DEV bit set.  If
@@ -3622,8 +3623,8 @@ static struct class *tty_class;
 *      Locking: ??
 */
-struct class_device *tty_register_device(struct tty_driver *driver,
+struct device *tty_register_device(struct tty_driver *driver, unsigned index,
-                                         unsigned index, struct device *device)
+                                   struct device *device)
 {
        char name[64];
        dev_t dev = MKDEV(driver->major, driver->minor_start) + index;
@@ -3639,7 +3640,7 @@ struct class_device *tty_register_device(struct tty_driver *driver,
        else
                tty_line_name(driver, index, name);
-        return class_device_create(tty_class, NULL, dev, device, "%s", name);
+        return device_create(tty_class, device, dev, name);
 }
 /**
@@ -3655,7 +3656,7 @@ struct class_device *tty_register_device(struct tty_driver *driver,
 void tty_unregister_device(struct tty_driver *driver, unsigned index)
 {
-        class_device_destroy(tty_class, MKDEV(driver->major, driver->minor_start) + index);
+        device_destroy(tty_class, MKDEV(driver->major, driver->minor_start) + index);
 }
 EXPORT_SYMBOL(tty_register_device);
@@ -3895,20 +3896,20 @@ static int __init tty_init(void)
        if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
                panic("Couldn't register /dev/tty driver\n");
-        class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
+        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), "tty");
        cdev_init(&console_cdev, &console_fops);
        if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
                panic("Couldn't register /dev/console driver\n");
-        class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
+        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), "console");
 #ifdef CONFIG_UNIX98_PTYS
        cdev_init(&ptmx_cdev, &ptmx_fops);
        if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
                panic("Couldn't register /dev/ptmx driver\n");
-        class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
+        device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), "ptmx");
 #endif
 #ifdef CONFIG_VT
@@ -3916,7 +3917,7 @@ static int __init tty_init(void)
        if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
            register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
                panic("Couldn't register /dev/tty0 driver\n");
-        class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
+        device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), "tty0");
        vty_init();
 #endif
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index bd7a98c6ea7a..f442b574b44a 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -476,16 +476,16 @@ static struct class *vc_class;
 void vcs_make_sysfs(struct tty_struct *tty)
 {
-        class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1),
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1),
-                        NULL, "vcs%u", tty->index + 1);
+                        "vcs%u", tty->index + 1);
-        class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129),
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129),
-                        NULL, "vcsa%u", tty->index + 1);
+                        "vcsa%u", tty->index + 1);
 }
 void vcs_remove_sysfs(struct tty_struct *tty)
 {
-        class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 1));
+        device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 1));
-        class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 129));
+        device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 129));
 }
 int __init vcs_init(void)
@@ -494,7 +494,7 @@ int __init vcs_init(void)
                panic("unable to get major %d for vcs device", VCS_MAJOR);
        vc_class = class_create(THIS_MODULE, "vc");
-        class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), "vcs");
-        class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), "vcsa");
        return 0;
 }
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 8e4413f6fbaf..87587b4385ab 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -112,7 +112,7 @@
 struct con_driver {
        const struct consw *con;
        const char *desc;
-        struct class_device *class_dev;
+        struct device *dev;
        int node;
        int first;
        int last;
@@ -3023,10 +3023,10 @@ static inline int vt_unbind(struct con_driver *con)
 }
 #endif /* CONFIG_VT_HW_CONSOLE_BINDING */
-static ssize_t store_bind(struct class_device *class_device,
+static ssize_t store_bind(struct device *dev, struct device_attribute *attr,
                          const char *buf, size_t count)
 {
-        struct con_driver *con = class_get_devdata(class_device);
+        struct con_driver *con = dev_get_drvdata(dev);
        int bind = simple_strtoul(buf, NULL, 0);
        if (bind)
@@ -3037,17 +3037,19 @@ static ssize_t store_bind(struct class_device *class_device,
        return count;
 }
-static ssize_t show_bind(struct class_device *class_device, char *buf)
+static ssize_t show_bind(struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
-        struct con_driver *con = class_get_devdata(class_device);
+        struct con_driver *con = dev_get_drvdata(dev);
        int bind = con_is_bound(con->con);
        return snprintf(buf, PAGE_SIZE, "%i\n", bind);
 }
-static ssize_t show_name(struct class_device *class_device, char *buf)
+static ssize_t show_name(struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
-        struct con_driver *con = class_get_devdata(class_device);
+        struct con_driver *con = dev_get_drvdata(dev);
        return snprintf(buf, PAGE_SIZE, "%s %s\n",
                        (con->flag & CON_DRIVER_FLAG_MODULE) ? "(M)" : "(S)",
@@ -3055,43 +3057,40 @@ static ssize_t show_name(struct class_device *class_device, char *buf)
 }
-static struct class_device_attribute class_device_attrs[] = {
+static struct device_attribute device_attrs[] = {
        __ATTR(bind, S_IRUGO|S_IWUSR, show_bind, store_bind),
        __ATTR(name, S_IRUGO, show_name, NULL),
 };
-static int vtconsole_init_class_device(struct con_driver *con)
+static int vtconsole_init_device(struct con_driver *con)
 {
        int i;
        int error = 0;
        con->flag |= CON_DRIVER_FLAG_ATTR;
-        class_set_devdata(con->class_dev, con);
+        dev_set_drvdata(con->dev, con);
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
+        for (i = 0; i < ARRAY_SIZE(device_attrs); i++) {
-                error = class_device_create_file(con->class_dev,
+                error = device_create_file(con->dev, &device_attrs[i]);
-                                         &class_device_attrs[i]);
                if (error)
                        break;
        }
        if (error) {
                while (--i >= 0)
-                        class_device_remove_file(con->class_dev,
+                        device_remove_file(con->dev, &device_attrs[i]);
-                                         &class_device_attrs[i]);
                con->flag &= ~CON_DRIVER_FLAG_ATTR;
        }
        return error;
 }
-static void vtconsole_deinit_class_device(struct con_driver *con)
+static void vtconsole_deinit_device(struct con_driver *con)
 {
        int i;
        if (con->flag & CON_DRIVER_FLAG_ATTR) {
-                for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+                for (i = 0; i < ARRAY_SIZE(device_attrs); i++)
-                        class_device_remove_file(con->class_dev,
+                        device_remove_file(con->dev, &device_attrs[i]);
-                                                 &class_device_attrs[i]);
                con->flag &= ~CON_DRIVER_FLAG_ATTR;
        }
 }
@@ -3179,18 +3178,17 @@ int register_con_driver(const struct consw *csw, int first, int last)
        if (retval)
                goto err;
-        con_driver->class_dev = class_device_create(vtconsole_class, NULL,
+        con_driver->dev = device_create(vtconsole_class, NULL,
-                                                    MKDEV(0, con_driver->node),
+                                        MKDEV(0, con_driver->node),
-                                                    NULL, "vtcon%i",
+                                        "vtcon%i", con_driver->node);
-                                                    con_driver->node);
-        if (IS_ERR(con_driver->class_dev)) {
+        if (IS_ERR(con_driver->dev)) {
-                printk(KERN_WARNING "Unable to create class_device for %s; "
+                printk(KERN_WARNING "Unable to create device for %s; "
                       "errno = %ld\n", con_driver->desc,
-                       PTR_ERR(con_driver->class_dev));
+                       PTR_ERR(con_driver->dev));
-                con_driver->class_dev = NULL;
+                con_driver->dev = NULL;
        } else {
-                vtconsole_init_class_device(con_driver);
+                vtconsole_init_device(con_driver);
        }
 err:
@@ -3226,12 +3224,12 @@ int unregister_con_driver(const struct consw *csw)
                if (con_driver->con == csw &&
                    con_driver->flag & CON_DRIVER_FLAG_MODULE) {
-                        vtconsole_deinit_class_device(con_driver);
+                        vtconsole_deinit_device(con_driver);
-                        class_device_destroy(vtconsole_class,
+                        device_destroy(vtconsole_class,
-                                             MKDEV(0, con_driver->node));
+                                       MKDEV(0, con_driver->node));
                        con_driver->con = NULL;
                        con_driver->desc = NULL;
-                        con_driver->class_dev = NULL;
+                        con_driver->dev = NULL;
                        con_driver->node = 0;
                        con_driver->flag = 0;
                        con_driver->first = 0;
@@ -3289,19 +3287,18 @@ static int __init vtconsole_class_init(void)
        for (i = 0; i < MAX_NR_CON_DRIVER; i++) {
                struct con_driver *con = &registered_con_driver[i];
-                if (con->con && !con->class_dev) {
+                if (con->con && !con->dev) {
-                        con->class_dev =
+                        con->dev = device_create(vtconsole_class, NULL,
-                                class_device_create(vtconsole_class, NULL,
+                                                 MKDEV(0, con->node),
-                                                    MKDEV(0, con->node), NULL,
+                                                 "vtcon%i", con->node);
-                                                    "vtcon%i", con->node);
-                        if (IS_ERR(con->class_dev)) {
+                        if (IS_ERR(con->dev)) {
                                printk(KERN_WARNING "Unable to create "
-                                       "class_device for %s; errno = %ld\n",
+                                       "device for %s; errno = %ld\n",
-                                       con->desc, PTR_ERR(con->class_dev));
+                                       con->desc, PTR_ERR(con->dev));
-                                con->class_dev = NULL;
+                                con->dev = NULL;
                        } else {
-                                vtconsole_init_class_device(con);
+                                vtconsole_init_device(con);
                        }
                }
        }
diff --git a/drivers/char/watchdog/pcwd_usb.c b/drivers/char/watchdog/pcwd_usb.c
index bda45334d802..e275dd4a705d 100644
--- a/drivers/char/watchdog/pcwd_usb.c
+++ b/drivers/char/watchdog/pcwd_usb.c
@@ -561,8 +561,7 @@ static struct notifier_block usb_pcwd_notifier = {
 */
 static inline void usb_pcwd_delete (struct usb_pcwd_private *usb_pcwd)
 {
-        if (usb_pcwd->intr_urb != NULL)
+        usb_free_urb(usb_pcwd->intr_urb);
-                usb_free_urb (usb_pcwd->intr_urb);
        if (usb_pcwd->intr_buffer != NULL)
                usb_buffer_free(usb_pcwd->udev, usb_pcwd->intr_size,
                                usb_pcwd->intr_buffer, usb_pcwd->intr_dma);
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 510816c16da3..04bee524e31a 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -125,6 +125,7 @@ config I2C_I801
            ICH7
            ESB2
            ICH8
+            ICH9
          This driver can also be built as a module.  If so, the module
          will be called i2c-i801.
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index bbb2fbee836f..c7be2fdbd86b 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -33,6 +33,7 @@
    ICH7                27DA
    ESB2                269B
    ICH8                283E
+    ICH9                2930
    This driver supports several versions of Intel's I/O Controller Hubs (ICH).
    For SMBus support, they are similar to the PIIX4 and are part
    of Intel's '810' and other chipsets.
@@ -457,6 +458,7 @@ static struct pci_device_id i801_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_17) },
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_6) },
        { 0, }
 };
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 3f869033ed70..94a4e9a3013c 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -42,7 +42,7 @@ static struct i2c_driver i2cdev_driver;
 struct i2c_dev {
        struct list_head list;
        struct i2c_adapter *adap;
-        struct class_device *class_dev;
+        struct device *dev;
 };
 #define I2C_MINORS      256
@@ -92,15 +92,16 @@ static void return_i2c_dev(struct i2c_dev *i2c_dev)
        spin_unlock(&i2c_dev_list_lock);
 }
-static ssize_t show_adapter_name(struct class_device *class_dev, char *buf)
+static ssize_t show_adapter_name(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
 {
-        struct i2c_dev *i2c_dev = i2c_dev_get_by_minor(MINOR(class_dev->devt));
+        struct i2c_dev *i2c_dev = i2c_dev_get_by_minor(MINOR(dev->devt));
        if (!i2c_dev)
                return -ENODEV;
        return sprintf(buf, "%s\n", i2c_dev->adap->name);
 }
-static CLASS_DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
+static DEVICE_ATTR(name, S_IRUGO, show_adapter_name, NULL);
 static ssize_t i2cdev_read (struct file *file, char __user *buf, size_t count,
                            loff_t *offset)
@@ -413,15 +414,14 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
                return PTR_ERR(i2c_dev);
        /* register this i2c device with the driver core */
-        i2c_dev->class_dev = class_device_create(i2c_dev_class, NULL,
+        i2c_dev->dev = device_create(i2c_dev_class, &adap->dev,
-                                                 MKDEV(I2C_MAJOR, adap->nr),
+                                     MKDEV(I2C_MAJOR, adap->nr),
-                                                 &adap->dev, "i2c-%d",
+                                     "i2c-%d", adap->nr);
-                                                 adap->nr);
+        if (!i2c_dev->dev) {
-        if (!i2c_dev->class_dev) {
                res = -ENODEV;
                goto error;
        }
-        res = class_device_create_file(i2c_dev->class_dev, &class_device_attr_name);
+        res = device_create_file(i2c_dev->dev, &dev_attr_name);
        if (res)
                goto error_destroy;
@@ -429,7 +429,7 @@ static int i2cdev_attach_adapter(struct i2c_adapter *adap)
                 adap->name, adap->nr);
        return 0;
 error_destroy:
-        class_device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
+        device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
 error:
        return_i2c_dev(i2c_dev);
        kfree(i2c_dev);
@@ -444,9 +444,9 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
        if (!i2c_dev) /* attach_adapter must have failed */
                return 0;
-        class_device_remove_file(i2c_dev->class_dev, &class_device_attr_name);
+        device_remove_file(i2c_dev->dev, &dev_attr_name);
        return_i2c_dev(i2c_dev);
-        class_device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
+        device_destroy(i2c_dev_class, MKDEV(I2C_MAJOR, adap->nr));
        kfree(i2c_dev);
        pr_debug("i2c-dev: adapter [%s] unregistered\n", adap->name);
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 8ccee9c769f8..e3a267622bb6 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1635,7 +1635,7 @@ static int idefloppy_begin_format(ide_drive_t *drive, int __user *arg)
 /*
 ** Get ATAPI_FORMAT_UNIT progress indication.
 **
-** Userland gives a pointer to an int.  The int is set to a progresss
+** Userland gives a pointer to an int.  The int is set to a progress
 ** indicator 0-65536, with 65536=100%.
 **
 ** If the drive does not support format progress indication, we just check
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index e11187ecc931..7767a11b6890 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -139,7 +139,7 @@ static void queue_req(struct addr_req *req)
        mutex_lock(&lock);
        list_for_each_entry_reverse(temp_req, &req_list, list) {
-                if (time_after(req->timeout, temp_req->timeout))
+                if (time_after_eq(req->timeout, temp_req->timeout))
                        break;
        }
@@ -225,19 +225,17 @@ static void process_req(void *data)
        mutex_lock(&lock);
        list_for_each_entry_safe(req, temp_req, &req_list, list) {
-                if (req->status) {
+                if (req->status == -ENODATA) {
                        src_in = (struct sockaddr_in *) &req->src_addr;
                        dst_in = (struct sockaddr_in *) &req->dst_addr;
                        req->status = addr_resolve_remote(src_in, dst_in,
                                                          req->addr);
+                        if (req->status && time_after_eq(jiffies, req->timeout))
+                                req->status = -ETIMEDOUT;
+                        else if (req->status == -ENODATA)
+                                continue;
                }
-                if (req->status && time_after(jiffies, req->timeout))
+                list_move_tail(&req->list, &done_list);
-                        req->status = -ETIMEDOUT;
-                else if (req->status == -ENODATA)
-                        continue;
-                list_del(&req->list);
-                list_add_tail(&req->list, &done_list);
        }
        if (!list_empty(&req_list)) {
@@ -347,8 +345,7 @@ void rdma_addr_cancel(struct rdma_dev_addr *addr)
                if (req->addr == addr) {
                        req->status = -ECANCELED;
                        req->timeout = jiffies;
-                        list_del(&req->list);
+                        list_move(&req->list, &req_list);
-                        list_add(&req->list, &req_list);
                        set_timeout(req->timeout);
                        break;
                }
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 25b1018a476c..e5dc4530808a 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -147,12 +147,12 @@ struct cm_id_private {
        __be32 rq_psn;
        int timeout_ms;
        enum ib_mtu path_mtu;
+        __be16 pkey;
        u8 private_data_len;
        u8 max_cm_retries;
        u8 peer_to_peer;
        u8 responder_resources;
        u8 initiator_depth;
-        u8 local_ack_timeout;
        u8 retry_count;
        u8 rnr_retry_count;
        u8 service_timeout;
@@ -240,11 +240,10 @@ static void * cm_copy_private_data(const void *private_data,
        if (!private_data || !private_data_len)
                return NULL;
-        data = kmalloc(private_data_len, GFP_KERNEL);
+        data = kmemdup(private_data, private_data_len, GFP_KERNEL);
        if (!data)
                return ERR_PTR(-ENOMEM);
-        memcpy(data, private_data, private_data_len);
        return data;
 }
@@ -691,7 +690,7 @@ static void cm_enter_timewait(struct cm_id_private *cm_id_priv)
         * timewait before notifying the user that we've exited timewait.
         */
        cm_id_priv->id.state = IB_CM_TIMEWAIT;
-        wait_time = cm_convert_to_ms(cm_id_priv->local_ack_timeout);
+        wait_time = cm_convert_to_ms(cm_id_priv->av.packet_life_time + 1);
        queue_delayed_work(cm.wq, &cm_id_priv->timewait_info->work.work,
                           msecs_to_jiffies(wait_time));
        cm_id_priv->timewait_info = NULL;
@@ -1010,6 +1009,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,
        cm_id_priv->responder_resources = param->responder_resources;
        cm_id_priv->retry_count = param->retry_count;
        cm_id_priv->path_mtu = param->primary_path->mtu;
+        cm_id_priv->pkey = param->primary_path->pkey;
        cm_id_priv->qp_type = param->qp_type;
        ret = cm_alloc_msg(cm_id_priv, &cm_id_priv->msg);
@@ -1024,8 +1024,6 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,
        cm_id_priv->local_qpn = cm_req_get_local_qpn(req_msg);
        cm_id_priv->rq_psn = cm_req_get_starting_psn(req_msg);
-        cm_id_priv->local_ack_timeout =
-                                cm_req_get_primary_local_ack_timeout(req_msg);
        spin_lock_irqsave(&cm_id_priv->lock, flags);
        ret = ib_post_send_mad(cm_id_priv->msg, NULL);
@@ -1410,9 +1408,8 @@ static int cm_req_handler(struct cm_work *work)
        cm_id_priv->initiator_depth = cm_req_get_resp_res(req_msg);
        cm_id_priv->responder_resources = cm_req_get_init_depth(req_msg);
        cm_id_priv->path_mtu = cm_req_get_path_mtu(req_msg);
+        cm_id_priv->pkey = req_msg->pkey;
        cm_id_priv->sq_psn = cm_req_get_starting_psn(req_msg);
-        cm_id_priv->local_ack_timeout =
-                                cm_req_get_primary_local_ack_timeout(req_msg);
        cm_id_priv->retry_count = cm_req_get_retry_count(req_msg);
        cm_id_priv->rnr_retry_count = cm_req_get_rnr_retry_count(req_msg);
        cm_id_priv->qp_type = cm_req_get_qp_type(req_msg);
@@ -1716,7 +1713,7 @@ static int cm_establish_handler(struct cm_work *work)
        unsigned long flags;
        int ret;
-        /* See comment in ib_cm_establish about lookup. */
+        /* See comment in cm_establish about lookup. */
        cm_id_priv = cm_acquire_id(work->local_id, work->remote_id);
        if (!cm_id_priv)
                return -EINVAL;
@@ -2402,11 +2399,16 @@ int ib_send_cm_lap(struct ib_cm_id *cm_id,
        cm_id_priv = container_of(cm_id, struct cm_id_private, id);
        spin_lock_irqsave(&cm_id_priv->lock, flags);
        if (cm_id->state != IB_CM_ESTABLISHED ||
-            cm_id->lap_state != IB_CM_LAP_IDLE) {
+            (cm_id->lap_state != IB_CM_LAP_UNINIT &&
+             cm_id->lap_state != IB_CM_LAP_IDLE)) {
                ret = -EINVAL;
                goto out;
        }
+        ret = cm_init_av_by_path(alternate_path, &cm_id_priv->alt_av);
+        if (ret)
+                goto out;
        ret = cm_alloc_msg(cm_id_priv, &msg);
        if (ret)
                goto out;
@@ -2431,7 +2433,8 @@ out:	spin_unlock_irqrestore(&cm_id_priv->lock, flags);
 }
 EXPORT_SYMBOL(ib_send_cm_lap);
-static void cm_format_path_from_lap(struct ib_sa_path_rec *path,
+static void cm_format_path_from_lap(struct cm_id_private *cm_id_priv,
+                                    struct ib_sa_path_rec *path,
                                    struct cm_lap_msg *lap_msg)
 {
        memset(path, 0, sizeof *path);
@@ -2443,10 +2446,10 @@ static void cm_format_path_from_lap(struct ib_sa_path_rec *path,
        path->hop_limit = lap_msg->alt_hop_limit;
        path->traffic_class = cm_lap_get_traffic_class(lap_msg);
        path->reversible = 1;
-        /* pkey is same as in REQ */
+        path->pkey = cm_id_priv->pkey;
        path->sl = cm_lap_get_sl(lap_msg);
        path->mtu_selector = IB_SA_EQ;
-        /* mtu is same as in REQ */
+        path->mtu = cm_id_priv->path_mtu;
        path->rate_selector = IB_SA_EQ;
        path->rate = cm_lap_get_packet_rate(lap_msg);
        path->packet_life_time_selector = IB_SA_EQ;
@@ -2472,7 +2475,7 @@ static int cm_lap_handler(struct cm_work *work)
        param = &work->cm_event.param.lap_rcvd;
        param->alternate_path = &work->path[0];
-        cm_format_path_from_lap(param->alternate_path, lap_msg);
+        cm_format_path_from_lap(cm_id_priv, param->alternate_path, lap_msg);
        work->cm_event.private_data = &lap_msg->private_data;
        spin_lock_irqsave(&cm_id_priv->lock, flags);
@@ -2480,6 +2483,7 @@ static int cm_lap_handler(struct cm_work *work)
                goto unlock;
        switch (cm_id_priv->id.lap_state) {
+        case IB_CM_LAP_UNINIT:
        case IB_CM_LAP_IDLE:
                break;
        case IB_CM_MRA_LAP_SENT:
@@ -2502,6 +2506,10 @@ static int cm_lap_handler(struct cm_work *work)
        cm_id_priv->id.lap_state = IB_CM_LAP_RCVD;
        cm_id_priv->tid = lap_msg->hdr.tid;
+        cm_init_av_for_response(work->port, work->mad_recv_wc->wc,
+                                work->mad_recv_wc->recv_buf.grh,
+                                &cm_id_priv->av);
+        cm_init_av_by_path(param->alternate_path, &cm_id_priv->alt_av);
        ret = atomic_inc_and_test(&cm_id_priv->work_count);
        if (!ret)
                list_add_tail(&work->list, &cm_id_priv->work_list);
@@ -3040,7 +3048,7 @@ static void cm_work_handler(void *data)
                cm_free_work(work);
 }
-int ib_cm_establish(struct ib_cm_id *cm_id)
+static int cm_establish(struct ib_cm_id *cm_id)
 {
        struct cm_id_private *cm_id_priv;
        struct cm_work *work;
@@ -3088,7 +3096,44 @@ int ib_cm_establish(struct ib_cm_id *cm_id)
 out:
        return ret;
 }
-EXPORT_SYMBOL(ib_cm_establish);
+static int cm_migrate(struct ib_cm_id *cm_id)
+{
+        struct cm_id_private *cm_id_priv;
+        unsigned long flags;
+        int ret = 0;
+        cm_id_priv = container_of(cm_id, struct cm_id_private, id);
+        spin_lock_irqsave(&cm_id_priv->lock, flags);
+        if (cm_id->state == IB_CM_ESTABLISHED &&
+            (cm_id->lap_state == IB_CM_LAP_UNINIT ||
+             cm_id->lap_state == IB_CM_LAP_IDLE)) {
+                cm_id->lap_state = IB_CM_LAP_IDLE;
+                cm_id_priv->av = cm_id_priv->alt_av;
+        } else
+                ret = -EINVAL;
+        spin_unlock_irqrestore(&cm_id_priv->lock, flags);
+        return ret;
+}
+int ib_cm_notify(struct ib_cm_id *cm_id, enum ib_event_type event)
+{
+        int ret;
+        switch (event) {
+        case IB_EVENT_COMM_EST:
+                ret = cm_establish(cm_id);
+                break;
+        case IB_EVENT_PATH_MIG:
+                ret = cm_migrate(cm_id);
+                break;
+        default:
+                ret = -EINVAL;
+        }
+        return ret;
+}
+EXPORT_SYMBOL(ib_cm_notify);
 static void cm_recv_handler(struct ib_mad_agent *mad_agent,
                            struct ib_mad_recv_wc *mad_recv_wc)
@@ -3173,8 +3218,7 @@ static int cm_init_qp_init_attr(struct cm_id_private *cm_id_priv,
        case IB_CM_ESTABLISHED:
                *qp_attr_mask = IB_QP_STATE | IB_QP_ACCESS_FLAGS |
                                IB_QP_PKEY_INDEX | IB_QP_PORT;
-                qp_attr->qp_access_flags = IB_ACCESS_LOCAL_WRITE |
+                qp_attr->qp_access_flags = IB_ACCESS_REMOTE_WRITE;
-                                           IB_ACCESS_REMOTE_WRITE;
                if (cm_id_priv->responder_resources)
                        qp_attr->qp_access_flags |= IB_ACCESS_REMOTE_READ |
                                                    IB_ACCESS_REMOTE_ATOMIC;
@@ -3222,6 +3266,9 @@ static int cm_init_qp_rtr_attr(struct cm_id_private *cm_id_priv,
                if (cm_id_priv->alt_av.ah_attr.dlid) {
                        *qp_attr_mask |= IB_QP_ALT_PATH;
                        qp_attr->alt_port_num = cm_id_priv->alt_av.port->port_num;
+                        qp_attr->alt_pkey_index = cm_id_priv->alt_av.pkey_index;
+                        qp_attr->alt_timeout =
+                                        cm_id_priv->alt_av.packet_life_time + 1;
                        qp_attr->alt_ah_attr = cm_id_priv->alt_av.ah_attr;
                }
                ret = 0;
@@ -3248,19 +3295,31 @@ static int cm_init_qp_rts_attr(struct cm_id_private *cm_id_priv,
        case IB_CM_REP_SENT:
        case IB_CM_MRA_REP_RCVD:
        case IB_CM_ESTABLISHED:
-                *qp_attr_mask = IB_QP_STATE | IB_QP_SQ_PSN;
+                if (cm_id_priv->id.lap_state == IB_CM_LAP_UNINIT) {
-                qp_attr->sq_psn = be32_to_cpu(cm_id_priv->sq_psn);
+                        *qp_attr_mask = IB_QP_STATE | IB_QP_SQ_PSN;
-                if (cm_id_priv->qp_type == IB_QPT_RC) {
+                        qp_attr->sq_psn = be32_to_cpu(cm_id_priv->sq_psn);
-                        *qp_attr_mask |= IB_QP_TIMEOUT | IB_QP_RETRY_CNT |
+                        if (cm_id_priv->qp_type == IB_QPT_RC) {
-                                         IB_QP_RNR_RETRY |
+                                *qp_attr_mask |= IB_QP_TIMEOUT | IB_QP_RETRY_CNT |
-                                         IB_QP_MAX_QP_RD_ATOMIC;
+                                                 IB_QP_RNR_RETRY |
-                        qp_attr->timeout = cm_id_priv->local_ack_timeout;
+                                                 IB_QP_MAX_QP_RD_ATOMIC;
-                        qp_attr->retry_cnt = cm_id_priv->retry_count;
+                                qp_attr->timeout =
-                        qp_attr->rnr_retry = cm_id_priv->rnr_retry_count;
+                                        cm_id_priv->av.packet_life_time + 1;
-                        qp_attr->max_rd_atomic = cm_id_priv->initiator_depth;
+                                qp_attr->retry_cnt = cm_id_priv->retry_count;
-                }
+                                qp_attr->rnr_retry = cm_id_priv->rnr_retry_count;
-                if (cm_id_priv->alt_av.ah_attr.dlid) {
+                                qp_attr->max_rd_atomic =
-                        *qp_attr_mask |= IB_QP_PATH_MIG_STATE;
+                                        cm_id_priv->initiator_depth;
+                        }
+                        if (cm_id_priv->alt_av.ah_attr.dlid) {
+                                *qp_attr_mask |= IB_QP_PATH_MIG_STATE;
+                                qp_attr->path_mig_state = IB_MIG_REARM;
+                        }
+                } else {
+                        *qp_attr_mask = IB_QP_ALT_PATH | IB_QP_PATH_MIG_STATE;
+                        qp_attr->alt_port_num = cm_id_priv->alt_av.port->port_num;
+                        qp_attr->alt_pkey_index = cm_id_priv->alt_av.pkey_index;
+                        qp_attr->alt_timeout =
+                                cm_id_priv->alt_av.packet_life_time + 1;
+                        qp_attr->alt_ah_attr = cm_id_priv->alt_av.ah_attr;
                        qp_attr->path_mig_state = IB_MIG_REARM;
                }
                ret = 0;
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 845090b0859c..cf48f2697434 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -344,7 +344,7 @@ static int cma_init_ib_qp(struct rdma_id_private *id_priv, struct ib_qp *qp)
                return ret;
        qp_attr.qp_state = IB_QPS_INIT;
-        qp_attr.qp_access_flags = IB_ACCESS_LOCAL_WRITE;
+        qp_attr.qp_access_flags = 0;
        qp_attr.port_num = id_priv->id.port_num;
        return ib_modify_qp(qp, &qp_attr, IB_QP_STATE | IB_QP_ACCESS_FLAGS |
                                          IB_QP_PKEY_INDEX | IB_QP_PORT);
@@ -935,13 +935,8 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
        mutex_lock(&lock);
        ret = cma_acquire_dev(conn_id);
        mutex_unlock(&lock);
-        if (ret) {
+        if (ret)
-                ret = -ENODEV;
+                goto release_conn_id;
-                cma_exch(conn_id, CMA_DESTROYING);
-                cma_release_remove(conn_id);
-                rdma_destroy_id(&conn_id->id);
-                goto out;
-        }
        conn_id->cm_id.ib = cm_id;
        cm_id->context = conn_id;
@@ -951,13 +946,17 @@ static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
        ret = cma_notify_user(conn_id, RDMA_CM_EVENT_CONNECT_REQUEST, 0,
                              ib_event->private_data + offset,
                              IB_CM_REQ_PRIVATE_DATA_SIZE - offset);
-        if (ret) {
+        if (!ret)
-                /* Destroy the CM ID by returning a non-zero value. */
+                goto out;
-                conn_id->cm_id.ib = NULL;
-                cma_exch(conn_id, CMA_DESTROYING);
+        /* Destroy the CM ID by returning a non-zero value. */
-                cma_release_remove(conn_id);
+        conn_id->cm_id.ib = NULL;
-                rdma_destroy_id(&conn_id->id);
-        }
+release_conn_id:
+        cma_exch(conn_id, CMA_DESTROYING);
+        cma_release_remove(conn_id);
+        rdma_destroy_id(&conn_id->id);
 out:
        cma_release_remove(listen_id);
        return ret;
@@ -1481,19 +1480,18 @@ static int cma_bind_loopback(struct rdma_id_private *id_priv)
        u8 p;
        mutex_lock(&lock);
+        if (list_empty(&dev_list)) {
+                ret = -ENODEV;
+                goto out;
+        }
        list_for_each_entry(cma_dev, &dev_list, list)
                for (p = 1; p <= cma_dev->device->phys_port_cnt; ++p)
-                        if (!ib_query_port (cma_dev->device, p, &port_attr) &&
+                        if (!ib_query_port(cma_dev->device, p, &port_attr) &&
                            port_attr.state == IB_PORT_ACTIVE)
                                goto port_found;
-        if (!list_empty(&dev_list)) {
+        p = 1;
-                p = 1;
+        cma_dev = list_entry(dev_list.next, struct cma_device, list);
-                cma_dev = list_entry(dev_list.next, struct cma_device, list);
-        } else {
-                ret = -ENODEV;
-                goto out;
-        }
 port_found:
        ret = ib_get_cached_gid(cma_dev->device, p, 0, &gid);
@@ -2123,8 +2121,6 @@ static void cma_add_one(struct ib_device *device)
        cma_dev->device = device;
        cma_dev->node_guid = device->node_guid;
-        if (!cma_dev->node_guid)
-                goto err;
        init_completion(&cma_dev->comp);
        atomic_set(&cma_dev->refcount, 1);
@@ -2136,9 +2132,6 @@ static void cma_add_one(struct ib_device *device)
        list_for_each_entry(id_priv, &listen_any_list, list)
                cma_listen_on_dev(id_priv, cma_dev);
        mutex_unlock(&lock);
-        return;
-err:
-        kfree(cma_dev);
 }
 static int cma_remove_id_dev(struct rdma_id_private *id_priv)
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c
index c3fb304a4e86..cf797d7aea09 100644
--- a/drivers/infiniband/core/iwcm.c
+++ b/drivers/infiniband/core/iwcm.c
@@ -80,7 +80,7 @@ struct iwcm_work {
 * 1) in the event upcall, cm_event_handler(), for a listening cm_id.  If
 *    the backlog is exceeded, then no more connection request events will
 *    be processed.  cm_event_handler() returns -ENOMEM in this case.  Its up
- *    to the provider to reject the connectino request.
+ *    to the provider to reject the connection request.
 * 2) in the connection request workqueue handler, cm_conn_req_handler().
 *    If work elements cannot be allocated for the new connect request cm_id,
 *    then IWCM will call the provider reject method.  This is ok since
@@ -131,26 +131,25 @@ static int alloc_work_entries(struct iwcm_id_private *cm_id_priv, int count)
 }
 /*
- * Save private data from incoming connection requests in the
+ * Save private data from incoming connection requests to
- * cm_id_priv so the low level driver doesn't have to.  Adjust
+ * iw_cm_event, so the low level driver doesn't have to. Adjust
 * the event ptr to point to the local copy.
 */
-static int copy_private_data(struct iwcm_id_private *cm_id_priv,
+static int copy_private_data(struct iw_cm_event *event)
-                       struct iw_cm_event *event)
 {
        void *p;
-        p = kmalloc(event->private_data_len, GFP_ATOMIC);
+        p = kmemdup(event->private_data, event->private_data_len, GFP_ATOMIC);
        if (!p)
                return -ENOMEM;
-        memcpy(p, event->private_data, event->private_data_len);
        event->private_data = p;
        return 0;
 }
 /*
- * Release a reference on cm_id. If the last reference is being removed
+ * Release a reference on cm_id. If the last reference is being
- * and iw_destroy_cm_id is waiting, wake up the waiting thread.
+ * released, enable the waiting thread (in iw_destroy_cm_id) to
+ * get woken up, and return 1 if a thread is already waiting.
 */
 static int iwcm_deref_id(struct iwcm_id_private *cm_id_priv)
 {
@@ -243,7 +242,7 @@ static int iwcm_modify_qp_sqd(struct ib_qp *qp)
 /*
 * CM_ID <-- CLOSING
 *
- * Block if a passive or active connection is currenlty being processed. Then
+ * Block if a passive or active connection is currently being processed. Then
 * process the event as follows:
 * - If we are ESTABLISHED, move to CLOSING and modify the QP state
 *   based on the abrupt flag
@@ -408,7 +407,7 @@ int iw_cm_listen(struct iw_cm_id *cm_id, int backlog)
 {
        struct iwcm_id_private *cm_id_priv;
        unsigned long flags;
-        int ret = 0;
+        int ret;
        cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
@@ -535,7 +534,7 @@ EXPORT_SYMBOL(iw_cm_accept);
 int iw_cm_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
 {
        struct iwcm_id_private *cm_id_priv;
-        int ret = 0;
+        int ret;
        unsigned long flags;
        struct ib_qp *qp;
@@ -620,7 +619,7 @@ static void cm_conn_req_handler(struct iwcm_id_private *listen_id_priv,
        spin_lock_irqsave(&listen_id_priv->lock, flags);
        if (listen_id_priv->state != IW_CM_STATE_LISTEN) {
                spin_unlock_irqrestore(&listen_id_priv->lock, flags);
-                return;
+                goto out;
        }
        spin_unlock_irqrestore(&listen_id_priv->lock, flags);
@@ -629,7 +628,7 @@ static void cm_conn_req_handler(struct iwcm_id_private *listen_id_priv,
                                listen_id_priv->id.context);
        /* If the cm_id could not be created, ignore the request */
        if (IS_ERR(cm_id))
-                return;
+                goto out;
        cm_id->provider_data = iw_event->provider_data;
        cm_id->local_addr = iw_event->local_addr;
@@ -642,7 +641,7 @@ static void cm_conn_req_handler(struct iwcm_id_private *listen_id_priv,
        if (ret) {
                iw_cm_reject(cm_id, NULL, 0);
                iw_destroy_cm_id(cm_id);
-                return;
+                goto out;
        }
        /* Call the client CM handler */
@@ -654,6 +653,7 @@ static void cm_conn_req_handler(struct iwcm_id_private *listen_id_priv,
                        kfree(cm_id);
        }
+out:
        if (iw_event->private_data_len)
                kfree(iw_event->private_data);
 }
@@ -674,7 +674,7 @@ static int cm_conn_est_handler(struct iwcm_id_private *cm_id_priv,
                               struct iw_cm_event *iw_event)
 {
        unsigned long flags;
-        int ret = 0;
+        int ret;
        spin_lock_irqsave(&cm_id_priv->lock, flags);
@@ -704,7 +704,7 @@ static int cm_conn_rep_handler(struct iwcm_id_private *cm_id_priv,
                               struct iw_cm_event *iw_event)
 {
        unsigned long flags;
-        int ret = 0;
+        int ret;
        spin_lock_irqsave(&cm_id_priv->lock, flags);
        /*
@@ -830,7 +830,8 @@ static int process_event(struct iwcm_id_private *cm_id_priv,
 */
 static void cm_work_handler(void *arg)
 {
-        struct iwcm_work *work = arg, lwork;
+        struct iwcm_work *work = arg;
+        struct iw_cm_event levent;
        struct iwcm_id_private *cm_id_priv = work->cm_id;
        unsigned long flags;
        int empty;
@@ -843,11 +844,11 @@ static void cm_work_handler(void *arg)
                                  struct iwcm_work, list);
                list_del_init(&work->list);
                empty = list_empty(&cm_id_priv->work_list);
-                lwork = *work;
+                levent = work->event;
                put_work(work);
                spin_unlock_irqrestore(&cm_id_priv->lock, flags);
-                ret = process_event(cm_id_priv, &work->event);
+                ret = process_event(cm_id_priv, &levent);
                if (ret) {
                        set_bit(IWCM_F_CALLBACK_DESTROY, &cm_id_priv->flags);
                        destroy_cm_id(&cm_id_priv->id);
@@ -906,7 +907,7 @@ static int cm_event_handler(struct iw_cm_id *cm_id,
        if ((work->event.event == IW_CM_EVENT_CONNECT_REQUEST ||
             work->event.event == IW_CM_EVENT_CONNECT_REPLY) &&
            work->event.private_data_len) {
-                ret = copy_private_data(cm_id_priv, &work->event);
+                ret = copy_private_data(&work->event);
                if (ret) {
                        put_work(work);
                        goto out;
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c
index a72bcea46ff6..3f9c16232c4d 100644
--- a/drivers/infiniband/core/mad.c
+++ b/drivers/infiniband/core/mad.c
@@ -46,7 +46,7 @@ MODULE_DESCRIPTION("kernel IB MAD API");
 MODULE_AUTHOR("Hal Rosenstock");
 MODULE_AUTHOR("Sean Hefty");
-static kmem_cache_t *ib_mad_cache;
+static struct kmem_cache *ib_mad_cache;
 static struct list_head ib_mad_port_list;
 static u32 ib_mad_client_id = 0;
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index ad4f4d5c2924..f15220a0ee75 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -161,12 +161,14 @@ static void ib_ucm_cleanup_events(struct ib_ucm_context *ctx)
                                    struct ib_ucm_event, ctx_list);
                list_del(&uevent->file_list);
                list_del(&uevent->ctx_list);
+                mutex_unlock(&ctx->file->file_mutex);
                /* clear incoming connections. */
                if (ib_ucm_new_cm_id(uevent->resp.event))
                        ib_destroy_cm_id(uevent->cm_id);
                kfree(uevent);
+                mutex_lock(&ctx->file->file_mutex);
        }
        mutex_unlock(&ctx->file->file_mutex);
 }
@@ -328,20 +330,18 @@ static int ib_ucm_event_process(struct ib_cm_event *evt,
        }
        if (uvt->data_len) {
-                uvt->data = kmalloc(uvt->data_len, GFP_KERNEL);
+                uvt->data = kmemdup(evt->private_data, uvt->data_len, GFP_KERNEL);
                if (!uvt->data)
                        goto err1;
-                memcpy(uvt->data, evt->private_data, uvt->data_len);
                uvt->resp.present |= IB_UCM_PRES_DATA;
        }
        if (uvt->info_len) {
-                uvt->info = kmalloc(uvt->info_len, GFP_KERNEL);
+                uvt->info = kmemdup(info, uvt->info_len, GFP_KERNEL);
                if (!uvt->info)
                        goto err2;
-                memcpy(uvt->info, info, uvt->info_len);
                uvt->resp.present |= IB_UCM_PRES_INFO;
        }
        return 0;
@@ -685,11 +685,11 @@ out:
        return result;
 }
-static ssize_t ib_ucm_establish(struct ib_ucm_file *file,
+static ssize_t ib_ucm_notify(struct ib_ucm_file *file,
-                                const char __user *inbuf,
+                             const char __user *inbuf,
-                                int in_len, int out_len)
+                             int in_len, int out_len)
 {
-        struct ib_ucm_establish cmd;
+        struct ib_ucm_notify cmd;
        struct ib_ucm_context *ctx;
        int result;
@@ -700,7 +700,7 @@ static ssize_t ib_ucm_establish(struct ib_ucm_file *file,
        if (IS_ERR(ctx))
                return PTR_ERR(ctx);
-        result = ib_cm_establish(ctx->cm_id);
+        result = ib_cm_notify(ctx->cm_id, (enum ib_event_type) cmd.event);
        ib_ucm_ctx_put(ctx);
        return result;
 }
@@ -1107,7 +1107,7 @@ static ssize_t (*ucm_cmd_table[])(struct ib_ucm_file *file,
        [IB_USER_CM_CMD_DESTROY_ID]    = ib_ucm_destroy_id,
        [IB_USER_CM_CMD_ATTR_ID]       = ib_ucm_attr_id,
        [IB_USER_CM_CMD_LISTEN]        = ib_ucm_listen,
-        [IB_USER_CM_CMD_ESTABLISH]     = ib_ucm_establish,
+        [IB_USER_CM_CMD_NOTIFY]        = ib_ucm_notify,
        [IB_USER_CM_CMD_SEND_REQ]      = ib_ucm_send_req,
        [IB_USER_CM_CMD_SEND_REP]      = ib_ucm_send_rep,
        [IB_USER_CM_CMD_SEND_RTU]      = ib_ucm_send_rtu,
diff --git a/drivers/infiniband/hw/amso1100/c2.h b/drivers/infiniband/hw/amso1100/c2.h
index 1b17dcdd0505..04a9db5de881 100644
--- a/drivers/infiniband/hw/amso1100/c2.h
+++ b/drivers/infiniband/hw/amso1100/c2.h
@@ -302,7 +302,7 @@ struct c2_dev {
        unsigned long pa;       /* PA device memory */
        void **qptr_array;
-        kmem_cache_t *host_msg_cache;
+        struct kmem_cache *host_msg_cache;
        struct list_head cca_link;              /* adapter list */
        struct list_head eh_wakeup_list;        /* event wakeup list */
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c
index 5bcf697aa335..179d005ed4a5 100644
--- a/drivers/infiniband/hw/amso1100/c2_qp.c
+++ b/drivers/infiniband/hw/amso1100/c2_qp.c
@@ -564,6 +564,32 @@ int c2_alloc_qp(struct c2_dev *c2dev,
        return err;
 }
+static inline void c2_lock_cqs(struct c2_cq *send_cq, struct c2_cq *recv_cq)
+{
+        if (send_cq == recv_cq)
+                spin_lock_irq(&send_cq->lock);
+        else if (send_cq > recv_cq) {
+                spin_lock_irq(&send_cq->lock);
+                spin_lock_nested(&recv_cq->lock, SINGLE_DEPTH_NESTING);
+        } else {
+                spin_lock_irq(&recv_cq->lock);
+                spin_lock_nested(&send_cq->lock, SINGLE_DEPTH_NESTING);
+        }
+}
+static inline void c2_unlock_cqs(struct c2_cq *send_cq, struct c2_cq *recv_cq)
+{
+        if (send_cq == recv_cq)
+                spin_unlock_irq(&send_cq->lock);
+        else if (send_cq > recv_cq) {
+                spin_unlock(&recv_cq->lock);
+                spin_unlock_irq(&send_cq->lock);
+        } else {
+                spin_unlock(&send_cq->lock);
+                spin_unlock_irq(&recv_cq->lock);
+        }
+}
 void c2_free_qp(struct c2_dev *c2dev, struct c2_qp *qp)
 {
        struct c2_cq *send_cq;
@@ -576,15 +602,9 @@ void c2_free_qp(struct c2_dev *c2dev, struct c2_qp *qp)
         * Lock CQs here, so that CQ polling code can do QP lookup
         * without taking a lock.
         */
-        spin_lock_irq(&send_cq->lock);
+        c2_lock_cqs(send_cq, recv_cq);
-        if (send_cq != recv_cq)
-                spin_lock(&recv_cq->lock);
        c2_free_qpn(c2dev, qp->qpn);
+        c2_unlock_cqs(send_cq, recv_cq);
-        if (send_cq != recv_cq)
-                spin_unlock(&recv_cq->lock);
-        spin_unlock_irq(&send_cq->lock);
        /*
         * Destory qp in the rnic...
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c
index 623dc95f91df..1687c511cb2f 100644
--- a/drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/drivers/infiniband/hw/amso1100/c2_rnic.c
@@ -441,7 +441,7 @@ static int c2_rnic_close(struct c2_dev *c2dev)
 * involves initalizing the various limits and resouce pools that
 * comprise the RNIC instance.
 */
-int c2_rnic_init(struct c2_dev *c2dev)
+int __devinit c2_rnic_init(struct c2_dev *c2dev)
 {
        int err;
        u32 qsize, msgsize;
@@ -611,7 +611,7 @@ int c2_rnic_init(struct c2_dev *c2dev)
 /*
 * Called by c2_remove to cleanup the RNIC resources.
 */
-void c2_rnic_term(struct c2_dev *c2dev)
+void __devexit c2_rnic_term(struct c2_dev *c2dev)
 {
        /* Close the open adapter instance */
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 01f5aa9cb56d..3d1c1c535038 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -52,7 +52,7 @@
 MODULE_LICENSE("Dual BSD/GPL");
 MODULE_AUTHOR("Christoph Raisch <raisch@de.ibm.com>");
 MODULE_DESCRIPTION("IBM eServer HCA InfiniBand Device Driver");
-MODULE_VERSION("SVNEHCA_0018");
+MODULE_VERSION("SVNEHCA_0019");
 int ehca_open_aqp1     = 0;
 int ehca_debug_level   = 0;
@@ -790,7 +790,7 @@ int __init ehca_module_init(void)
        int ret;
        printk(KERN_INFO "eHCA Infiniband Device Driver "
-                         "(Rel.: SVNEHCA_0018)\n");
+                         "(Rel.: SVNEHCA_0019)\n");
        idr_init(&ehca_qp_idr);
        idr_init(&ehca_cq_idr);
        spin_lock_init(&ehca_qp_idr_lock);
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index cf3e50ee2d06..8682aa50c707 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -732,8 +732,7 @@ static int prepare_sqe_rts(struct ehca_qp *my_qp, struct ehca_shca *shca,
        u64 h_ret;
        struct ipz_queue *squeue;
        void *bad_send_wqe_p, *bad_send_wqe_v;
-        void *squeue_start_p, *squeue_end_p;
+        u64 q_ofs;
-        void *squeue_start_v, *squeue_end_v;
        struct ehca_wqe *wqe;
        int qp_num = my_qp->ib_qp.qp_num;
@@ -755,26 +754,23 @@ static int prepare_sqe_rts(struct ehca_qp *my_qp, struct ehca_shca *shca,
        if (ehca_debug_level)
                ehca_dmp(bad_send_wqe_v, 32, "qp_num=%x bad_wqe", qp_num);
        squeue = &my_qp->ipz_squeue;
-        squeue_start_p = (void*)virt_to_abs(ipz_qeit_calc(squeue, 0L));
+        if (ipz_queue_abs_to_offset(squeue, (u64)bad_send_wqe_p, &q_ofs)) {
-        squeue_end_p = squeue_start_p+squeue->queue_length;
+                ehca_err(&shca->ib_device, "failed to get wqe offset qp_num=%x"
-        squeue_start_v = abs_to_virt((u64)squeue_start_p);
+                         " bad_send_wqe_p=%p", qp_num, bad_send_wqe_p);
-        squeue_end_v = abs_to_virt((u64)squeue_end_p);
+                return -EFAULT;
-        ehca_dbg(&shca->ib_device, "qp_num=%x squeue_start_v=%p squeue_end_v=%p",
+        }
-                 qp_num, squeue_start_v, squeue_end_v);
        /* loop sets wqe's purge bit */
-        wqe = (struct ehca_wqe*)bad_send_wqe_v;
+        wqe = (struct ehca_wqe*)ipz_qeit_calc(squeue, q_ofs);
        *bad_wqe_cnt = 0;
        while (wqe->optype != 0xff && wqe->wqef != 0xff) {
                if (ehca_debug_level)
                        ehca_dmp(wqe, 32, "qp_num=%x wqe", qp_num);
                wqe->nr_of_data_seg = 0; /* suppress data access */
                wqe->wqef = WQEF_PURGE; /* WQE to be purged */
-                wqe = (struct ehca_wqe*)((u8*)wqe+squeue->qe_size);
+                q_ofs = ipz_queue_advance_offset(squeue, q_ofs);
+                wqe = (struct ehca_wqe*)ipz_qeit_calc(squeue, q_ofs);
                *bad_wqe_cnt = (*bad_wqe_cnt)+1;
-                if ((void*)wqe >= squeue_end_v) {
-                        wqe = squeue_start_v;
-                }
        }
        /*
         * bad wqe will be reprocessed and ignored when pol_cq() is called,
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
index e028ff1588cc..bf7a40088f61 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c
@@ -70,6 +70,19 @@ void *ipz_qeit_eq_get_inc(struct ipz_queue *queue)
        return ret;
 }
+int ipz_queue_abs_to_offset(struct ipz_queue *queue, u64 addr, u64 *q_offset)
+{
+        int i;
+        for (i = 0; i < queue->queue_length / queue->pagesize; i++) {
+                u64 page = (u64)virt_to_abs(queue->queue_pages[i]);
+                if (addr >= page && addr < page + queue->pagesize) {
+                        *q_offset = addr - page + i * queue->pagesize;
+                        return 0;
+                }
+        }
+        return -EINVAL;
+}
 int ipz_queue_ctor(struct ipz_queue *queue,
                   const u32 nr_of_pages,
                   const u32 pagesize, const u32 qe_size, const u32 nr_of_sg)
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.h b/drivers/infiniband/hw/ehca/ipz_pt_fn.h
index 2f13509d5257..dc3bda2634b7 100644
--- a/drivers/infiniband/hw/ehca/ipz_pt_fn.h
+++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.h
@@ -150,6 +150,21 @@ static inline void *ipz_qeit_reset(struct ipz_queue *queue)
        return ipz_qeit_get(queue);
 }
+/*
+ * return the q_offset corresponding to an absolute address
+ */
+int ipz_queue_abs_to_offset(struct ipz_queue *queue, u64 addr, u64 *q_offset);
+/*
+ * return the next queue offset. don't modify the queue.
+ */
+static inline u64 ipz_queue_advance_offset(struct ipz_queue *queue, u64 offset)
+{
+        offset += queue->qe_size;
+        if (offset >= queue->queue_length) offset = 0;
+        return offset;
+}
 /* struct generic page table */
 struct ipz_pt {
        u64 entries[EHCA_PT_ENTRIES];
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index a5456108dbad..acdee33ee1f8 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -1487,7 +1487,7 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
        idev->pma_counter_select[1] = IB_PMA_PORT_RCV_DATA;
        idev->pma_counter_select[2] = IB_PMA_PORT_XMIT_PKTS;
        idev->pma_counter_select[3] = IB_PMA_PORT_RCV_PKTS;
-        idev->pma_counter_select[5] = IB_PMA_PORT_XMIT_WAIT;
+        idev->pma_counter_select[4] = IB_PMA_PORT_XMIT_WAIT;
        idev->link_width_enabled = 3;   /* 1x or 4x */
        /* Snapshot current HW counters to "clear" them. */
diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c
index 69599455aca2..57cdc1bc5f50 100644
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
@@ -33,7 +33,6 @@
 * $Id: mthca_av.c 1349 2004-12-16 21:09:43Z roland $
 */
-#include <linux/init.h>
 #include <linux/string.h>
 #include <linux/slab.h>
@@ -323,7 +322,7 @@ int mthca_ah_query(struct ib_ah *ibah, struct ib_ah_attr *attr)
        return 0;
 }
-int __devinit mthca_init_av_table(struct mthca_dev *dev)
+int mthca_init_av_table(struct mthca_dev *dev)
 {
        int err;
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index 149b36901239..283d50b76c3d 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -36,7 +36,6 @@
 * $Id: mthca_cq.c 1369 2004-12-20 16:17:07Z roland $
 */
-#include <linux/init.h>
 #include <linux/hardirq.h>
 #include <asm/io.h>
@@ -970,7 +969,7 @@ void mthca_free_cq(struct mthca_dev *dev,
        mthca_free_mailbox(dev, mailbox);
 }
-int __devinit mthca_init_cq_table(struct mthca_dev *dev)
+int mthca_init_cq_table(struct mthca_dev *dev)
 {
        int err;
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
index e284e0613a94..8ec9fa1ff9ea 100644
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -33,7 +33,6 @@
 * $Id: mthca_eq.c 1382 2004-12-24 02:21:02Z roland $
 */
-#include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
@@ -479,10 +478,10 @@ static irqreturn_t mthca_arbel_msi_x_interrupt(int irq, void *eq_ptr)
        return IRQ_HANDLED;
 }
-static int __devinit mthca_create_eq(struct mthca_dev *dev,
+static int mthca_create_eq(struct mthca_dev *dev,
-                                     int nent,
+                           int nent,
-                                     u8 intr,
+                           u8 intr,
-                                     struct mthca_eq *eq)
+                           struct mthca_eq *eq)
 {
        int npages;
        u64 *dma_list = NULL;
@@ -664,9 +663,9 @@ static void mthca_free_irqs(struct mthca_dev *dev)
                                 dev->eq_table.eq + i);
 }
-static int __devinit mthca_map_reg(struct mthca_dev *dev,
+static int mthca_map_reg(struct mthca_dev *dev,
-                                   unsigned long offset, unsigned long size,
+                         unsigned long offset, unsigned long size,
-                                   void __iomem **map)
+                         void __iomem **map)
 {
        unsigned long base = pci_resource_start(dev->pdev, 0);
@@ -691,7 +690,7 @@ static void mthca_unmap_reg(struct mthca_dev *dev, unsigned long offset,
        iounmap(map);
 }
-static int __devinit mthca_map_eq_regs(struct mthca_dev *dev)
+static int mthca_map_eq_regs(struct mthca_dev *dev)
 {
        if (mthca_is_memfree(dev)) {
                /*
@@ -781,7 +780,7 @@ static void mthca_unmap_eq_regs(struct mthca_dev *dev)
        }
 }
-int __devinit mthca_map_eq_icm(struct mthca_dev *dev, u64 icm_virt)
+int mthca_map_eq_icm(struct mthca_dev *dev, u64 icm_virt)
 {
        int ret;
        u8 status;
@@ -825,7 +824,7 @@ void mthca_unmap_eq_icm(struct mthca_dev *dev)
        __free_page(dev->eq_table.icm_page);
 }
-int __devinit mthca_init_eq_table(struct mthca_dev *dev)
+int mthca_init_eq_table(struct mthca_dev *dev)
 {
        int err;
        u8 status;
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c
index 45e106f14807..acfa41d968ee 100644
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c
@@ -317,7 +317,7 @@ err:
        return ret;
 }
-void __devexit mthca_free_agents(struct mthca_dev *dev)
+void mthca_free_agents(struct mthca_dev *dev)
 {
        struct ib_mad_agent *agent;
        int p, q;
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index 47ea02148368..0491ec7a7c0a 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -98,7 +98,7 @@ static struct mthca_profile default_profile = {
        .uarc_size         = 1 << 18,   /* Arbel only */
 };
-static int __devinit mthca_tune_pci(struct mthca_dev *mdev)
+static int mthca_tune_pci(struct mthca_dev *mdev)
 {
        int cap;
        u16 val;
@@ -143,7 +143,7 @@ static int __devinit mthca_tune_pci(struct mthca_dev *mdev)
        return 0;
 }
-static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim *dev_lim)
+static int mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim *dev_lim)
 {
        int err;
        u8 status;
@@ -255,7 +255,7 @@ static int __devinit mthca_dev_lim(struct mthca_dev *mdev, struct mthca_dev_lim
        return 0;
 }
-static int __devinit mthca_init_tavor(struct mthca_dev *mdev)
+static int mthca_init_tavor(struct mthca_dev *mdev)
 {
        u8 status;
        int err;
@@ -333,7 +333,7 @@ err_disable:
        return err;
 }
-static int __devinit mthca_load_fw(struct mthca_dev *mdev)
+static int mthca_load_fw(struct mthca_dev *mdev)
 {
        u8 status;
        int err;
@@ -379,10 +379,10 @@ err_free:
        return err;
 }
-static int __devinit mthca_init_icm(struct mthca_dev *mdev,
+static int mthca_init_icm(struct mthca_dev *mdev,
-                                    struct mthca_dev_lim *dev_lim,
+                          struct mthca_dev_lim *dev_lim,
-                                    struct mthca_init_hca_param *init_hca,
+                          struct mthca_init_hca_param *init_hca,
-                                    u64 icm_size)
+                          u64 icm_size)
 {
        u64 aux_pages;
        u8 status;
@@ -575,7 +575,7 @@ static void mthca_free_icms(struct mthca_dev *mdev)
        mthca_free_icm(mdev, mdev->fw.arbel.aux_icm);
 }
-static int __devinit mthca_init_arbel(struct mthca_dev *mdev)
+static int mthca_init_arbel(struct mthca_dev *mdev)
 {
        struct mthca_dev_lim        dev_lim;
        struct mthca_profile        profile;
@@ -683,7 +683,7 @@ static void mthca_close_hca(struct mthca_dev *mdev)
                mthca_SYS_DIS(mdev, &status);
 }
-static int __devinit mthca_init_hca(struct mthca_dev *mdev)
+static int mthca_init_hca(struct mthca_dev *mdev)
 {
        u8 status;
        int err;
@@ -720,7 +720,7 @@ err_close:
        return err;
 }
-static int __devinit mthca_setup_hca(struct mthca_dev *dev)
+static int mthca_setup_hca(struct mthca_dev *dev)
 {
        int err;
        u8 status;
@@ -875,8 +875,7 @@ err_uar_table_free:
        return err;
 }
-static int __devinit mthca_request_regions(struct pci_dev *pdev,
+static int mthca_request_regions(struct pci_dev *pdev, int ddr_hidden)
-                                           int ddr_hidden)
 {
        int err;
@@ -928,7 +927,7 @@ static void mthca_release_regions(struct pci_dev *pdev,
                           MTHCA_HCR_SIZE);
 }
-static int __devinit mthca_enable_msi_x(struct mthca_dev *mdev)
+static int mthca_enable_msi_x(struct mthca_dev *mdev)
 {
        struct msix_entry entries[3];
        int err;
@@ -1213,7 +1212,7 @@ int __mthca_restart_one(struct pci_dev *pdev)
 }
 static int __devinit mthca_init_one(struct pci_dev *pdev,
-                             const struct pci_device_id *id)
+                                    const struct pci_device_id *id)
 {
        static int mthca_version_printed = 0;
        int ret;
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
index 47ca8a9b7247..a8ad072be074 100644
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -32,7 +32,6 @@
 * $Id: mthca_mcg.c 1349 2004-12-16 21:09:43Z roland $
 */
-#include <linux/init.h>
 #include <linux/string.h>
 #include <linux/slab.h>
@@ -371,7 +370,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
        return err;
 }
-int __devinit mthca_init_mcg_table(struct mthca_dev *dev)
+int mthca_init_mcg_table(struct mthca_dev *dev)
 {
        int err;
        int table_size = dev->limits.num_mgms + dev->limits.num_amgms;
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index a486dec1707e..f71ffa88db3a 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -34,7 +34,6 @@
 */
 #include <linux/slab.h>
-#include <linux/init.h>
 #include <linux/errno.h>
 #include "mthca_dev.h"
@@ -135,7 +134,7 @@ static void mthca_buddy_free(struct mthca_buddy *buddy, u32 seg, int order)
        spin_unlock(&buddy->lock);
 }
-static int __devinit mthca_buddy_init(struct mthca_buddy *buddy, int max_order)
+static int mthca_buddy_init(struct mthca_buddy *buddy, int max_order)
 {
        int i, s;
@@ -759,7 +758,7 @@ void mthca_arbel_fmr_unmap(struct mthca_dev *dev, struct mthca_fmr *fmr)
        *(u8 *) fmr->mem.arbel.mpt = MTHCA_MPT_STATUS_SW;
 }
-int __devinit mthca_init_mr_table(struct mthca_dev *dev)
+int mthca_init_mr_table(struct mthca_dev *dev)
 {
        unsigned long addr;
        int err, i;
diff --git a/drivers/infiniband/hw/mthca/mthca_pd.c b/drivers/infiniband/hw/mthca/mthca_pd.c
index 59df51614c85..c1e950764bd8 100644
--- a/drivers/infiniband/hw/mthca/mthca_pd.c
+++ b/drivers/infiniband/hw/mthca/mthca_pd.c
@@ -34,7 +34,6 @@
 * $Id: mthca_pd.c 1349 2004-12-16 21:09:43Z roland $
 */
-#include <linux/init.h>
 #include <linux/errno.h>
 #include "mthca_dev.h"
@@ -69,7 +68,7 @@ void mthca_pd_free(struct mthca_dev *dev, struct mthca_pd *pd)
        mthca_free(&dev->pd_table.alloc, pd->pd_num);
 }
-int __devinit mthca_init_pd_table(struct mthca_dev *dev)
+int mthca_init_pd_table(struct mthca_dev *dev)
 {
        return mthca_alloc_init(&dev->pd_table.alloc,
                                dev->limits.num_pds,
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
index fc67f780581b..21422a3336ad 100644
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@@ -1100,11 +1100,10 @@ static struct ib_fmr *mthca_alloc_fmr(struct ib_pd *pd, int mr_access_flags,
        struct mthca_fmr *fmr;
        int err;
-        fmr = kmalloc(sizeof *fmr, GFP_KERNEL);
+        fmr = kmemdup(fmr_attr, sizeof *fmr, GFP_KERNEL);
        if (!fmr)
                return ERR_PTR(-ENOMEM);
-        memcpy(&fmr->attr, fmr_attr, sizeof *fmr_attr);
        err = mthca_fmr_alloc(to_mdev(pd->device), to_mpd(pd)->pd_num,
                             convert_access(mr_access_flags), fmr);
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 6a7822e0fc19..33e3ba7937f1 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -35,7 +35,6 @@
 * $Id: mthca_qp.c 1355 2004-12-17 15:23:43Z roland $
 */
-#include <linux/init.h>
 #include <linux/string.h>
 #include <linux/slab.h>
@@ -2241,7 +2240,7 @@ void mthca_free_err_wqe(struct mthca_dev *dev, struct mthca_qp *qp, int is_send,
                *new_wqe = 0;
 }
-int __devinit mthca_init_qp_table(struct mthca_dev *dev)
+int mthca_init_qp_table(struct mthca_dev *dev)
 {
        int err;
        u8 status;
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
index f5d7677d1079..34d2c4768962 100644
--- a/drivers/infiniband/hw/mthca/mthca_srq.c
+++ b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -120,7 +120,7 @@ static void mthca_arbel_init_srq_context(struct mthca_dev *dev,
        memset(context, 0, sizeof *context);
-        logsize = long_log2(srq->max) + srq->wqe_shift;
+        logsize = long_log2(srq->max);
        context->state_logsize_srqn = cpu_to_be32(logsize << 24 | srq->srqn);
        context->lkey = cpu_to_be32(srq->mr.ibmr.lkey);
        context->db_index = cpu_to_be32(srq->db_index);
@@ -715,7 +715,7 @@ int mthca_max_srq_sge(struct mthca_dev *dev)
                     sizeof (struct mthca_data_seg));
 }
-int __devinit mthca_init_srq_table(struct mthca_dev *dev)
+int mthca_init_srq_table(struct mthca_dev *dev)
 {
        int err;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index 0b8a79d53a00..f2b61851a49c 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -233,7 +233,7 @@ static inline struct ipoib_neigh **to_ipoib_neigh(struct neighbour *neigh)
 }
 struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neigh);
-void ipoib_neigh_free(struct ipoib_neigh *neigh);
+void ipoib_neigh_free(struct net_device *dev, struct ipoib_neigh *neigh);
 extern struct workqueue_struct *ipoib_workqueue;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 85522daeb946..5ba3154320b4 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -264,7 +264,7 @@ static void path_free(struct net_device *dev, struct ipoib_path *path)
                if (neigh->ah)
                        ipoib_put_ah(neigh->ah);
-                ipoib_neigh_free(neigh);
+                ipoib_neigh_free(dev, neigh);
        }
        spin_unlock_irqrestore(&priv->lock, flags);
@@ -525,10 +525,11 @@ static void neigh_add_path(struct sk_buff *skb, struct net_device *dev)
                ipoib_send(dev, skb, path->ah, IPOIB_QPN(skb->dst->neighbour->ha));
        } else {
                neigh->ah  = NULL;
-                __skb_queue_tail(&neigh->queue, skb);
                if (!path->query && path_rec_start(dev, path))
                        goto err_list;
+                __skb_queue_tail(&neigh->queue, skb);
        }
        spin_unlock(&priv->lock);
@@ -538,7 +539,7 @@ err_list:
        list_del(&neigh->list);
 err_path:
-        ipoib_neigh_free(neigh);
+        ipoib_neigh_free(dev, neigh);
        ++priv->stats.tx_dropped;
        dev_kfree_skb_any(skb);
@@ -655,7 +656,7 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                 */
                                ipoib_put_ah(neigh->ah);
                                list_del(&neigh->list);
-                                ipoib_neigh_free(neigh);
+                                ipoib_neigh_free(dev, neigh);
                                spin_unlock(&priv->lock);
                                ipoib_path_lookup(skb, dev);
                                goto out;
@@ -786,7 +787,7 @@ static void ipoib_neigh_destructor(struct neighbour *n)
                if (neigh->ah)
                        ah = neigh->ah;
                list_del(&neigh->list);
-                ipoib_neigh_free(neigh);
+                ipoib_neigh_free(n->dev, neigh);
        }
        spin_unlock_irqrestore(&priv->lock, flags);
@@ -809,9 +810,15 @@ struct ipoib_neigh *ipoib_neigh_alloc(struct neighbour *neighbour)
        return neigh;
 }
-void ipoib_neigh_free(struct ipoib_neigh *neigh)
+void ipoib_neigh_free(struct net_device *dev, struct ipoib_neigh *neigh)
 {
+        struct ipoib_dev_priv *priv = netdev_priv(dev);
+        struct sk_buff *skb;
        *to_ipoib_neigh(neigh->neighbour) = NULL;
+        while ((skb = __skb_dequeue(&neigh->queue))) {
+                ++priv->stats.tx_dropped;
+                dev_kfree_skb_any(skb);
+        }
        kfree(neigh);
 }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 3faa1820f0e9..d282d65e3ee0 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -114,7 +114,7 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
                 */
                if (neigh->ah)
                        ipoib_put_ah(neigh->ah);
-                ipoib_neigh_free(neigh);
+                ipoib_neigh_free(dev, neigh);
        }
        spin_unlock_irqrestore(&priv->lock, flags);
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.h b/drivers/infiniband/ulp/iser/iscsi_iser.h
index 9c53916f28c2..234e5b061a75 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.h
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.h
@@ -283,7 +283,7 @@ struct iser_global {
        struct mutex      connlist_mutex;
        struct list_head  connlist;             /* all iSER IB connections */
-        kmem_cache_t *desc_cache;
+        struct kmem_cache *desc_cache;
 };
 extern struct iser_global ig;
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 4b09147f438f..64ab5fc7cca3 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1176,9 +1176,11 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
                        break;
                }
-                target->status = srp_alloc_iu_bufs(target);
+                if (!target->rx_ring[0]) {
-                if (target->status)
+                        target->status = srp_alloc_iu_bufs(target);
-                        break;
+                        if (target->status)
+                                break;
+                }
                qp_attr = kmalloc(sizeof *qp_attr, GFP_KERNEL);
                if (!qp_attr) {
@@ -1716,7 +1718,8 @@ static ssize_t srp_create_target(struct class_device *class_dev,
        if (!target_host)
                return -ENOMEM;
-        target_host->max_lun = SRP_MAX_LUN;
+        target_host->max_lun     = SRP_MAX_LUN;
+        target_host->max_cmd_len = sizeof ((struct srp_cmd *) (void *) 0L)->cdb;
        target = host_to_target(target_host);
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index 105112fb7b57..80cdebcbcb99 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -178,9 +178,9 @@ static int iforce_usb_probe(struct usb_interface *intf,
 fail:
        if (iforce) {
-                if (iforce->irq) usb_free_urb(iforce->irq);
+                usb_free_urb(iforce->irq);
-                if (iforce->out) usb_free_urb(iforce->out);
+                usb_free_urb(iforce->out);
-                if (iforce->ctrl) usb_free_urb(iforce->ctrl);
+                usb_free_urb(iforce->ctrl);
                kfree(iforce);
        }
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index ba2a2035d648..7c8d0399ae82 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -297,7 +297,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
        serio_raw->dev.minor = PSMOUSE_MINOR;
        serio_raw->dev.name = serio_raw->name;
-        serio_raw->dev.dev = &serio->dev;
+        serio_raw->dev.parent = &serio->dev;
        serio_raw->dev.fops = &serio_raw_fops;
        err = misc_register(&serio_raw->dev);
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 5800beeebb85..defd5743dba6 100644
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -702,7 +702,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
        cs->open_count = 0;
        cs->dev = NULL;
        cs->tty = NULL;
-        cs->class = NULL;
+        cs->tty_dev = NULL;
        cs->cidmode = cidmode != 0;
        //if(onechannel) { //FIXME
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index 884bd72c1bf4..06298cc52bf5 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -444,7 +444,7 @@ struct cardstate {
        struct gigaset_driver *driver;
        unsigned minor_index;
        struct device *dev;
-        struct class_device *class;
+        struct device *tty_dev;
        const struct gigaset_ops *ops;
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 596f3aebe2f7..7edea015867e 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -625,13 +625,13 @@ void gigaset_if_init(struct cardstate *cs)
                return;
        tasklet_init(&cs->if_wake_tasklet, &if_wake, (unsigned long) cs);
-        cs->class = tty_register_device(drv->tty, cs->minor_index, NULL);
+        cs->tty_dev = tty_register_device(drv->tty, cs->minor_index, NULL);
-        if (!IS_ERR(cs->class))
+        if (!IS_ERR(cs->tty_dev))
-                class_set_devdata(cs->class, cs);
+                dev_set_drvdata(cs->tty_dev, cs);
        else {
                warn("could not register device to the tty subsystem");
-                cs->class = NULL;
+                cs->tty_dev = NULL;
        }
 }
@@ -645,7 +645,7 @@ void gigaset_if_free(struct cardstate *cs)
        tasklet_disable(&cs->if_wake_tasklet);
        tasklet_kill(&cs->if_wake_tasklet);
-        cs->class = NULL;
+        cs->tty_dev = NULL;
        tty_unregister_device(drv->tty, cs->minor_index);
 }
diff --git a/drivers/isdn/gigaset/proc.c b/drivers/isdn/gigaset/proc.c
index 9ad840e95dbe..e767afa55abf 100644
--- a/drivers/isdn/gigaset/proc.c
+++ b/drivers/isdn/gigaset/proc.c
@@ -16,11 +16,12 @@
 #include "gigaset.h"
 #include <linux/ctype.h>
-static ssize_t show_cidmode(struct class_device *class, char *buf)
+static ssize_t show_cidmode(struct device *dev,
+                            struct device_attribute *attr, char *buf)
 {
        int ret;
        unsigned long flags;
-        struct cardstate *cs = class_get_devdata(class);
+        struct cardstate *cs = dev_get_drvdata(dev);
        spin_lock_irqsave(&cs->lock, flags);
        ret = sprintf(buf, "%u\n", cs->cidmode);
@@ -29,10 +30,10 @@ static ssize_t show_cidmode(struct class_device *class, char *buf)
        return ret;
 }
-static ssize_t set_cidmode(struct class_device *class,
+static ssize_t set_cidmode(struct device *dev, struct device_attribute *attr,
                           const char *buf, size_t count)
 {
-        struct cardstate *cs = class_get_devdata(class);
+        struct cardstate *cs = dev_get_drvdata(dev);
        long int value;
        char *end;
@@ -64,25 +65,25 @@ static ssize_t set_cidmode(struct class_device *class,
        return count;
 }
-static CLASS_DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
+static DEVICE_ATTR(cidmode, S_IRUGO|S_IWUSR, show_cidmode, set_cidmode);
 /* free sysfs for device */
 void gigaset_free_dev_sysfs(struct cardstate *cs)
 {
-        if (!cs->class)
+        if (!cs->tty_dev)
                return;
        gig_dbg(DEBUG_INIT, "removing sysfs entries");
-        class_device_remove_file(cs->class, &class_device_attr_cidmode);
+        device_remove_file(cs->tty_dev, &dev_attr_cidmode);
 }
 /* initialize sysfs for device */
 void gigaset_init_dev_sysfs(struct cardstate *cs)
 {
-        if (!cs->class)
+        if (!cs->tty_dev)
                return;
        gig_dbg(DEBUG_INIT, "setting up sysfs");
-        if (class_device_create_file(cs->class, &class_device_attr_cidmode))
+        if (device_create_file(cs->tty_dev, &dev_attr_cidmode))
                dev_err(cs->dev, "could not create sysfs attribute\n");
 }
diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
index 4ffa9eb1c28e..5ebf49ac9b23 100644
--- a/drivers/isdn/gigaset/usb-gigaset.c
+++ b/drivers/isdn/gigaset/usb-gigaset.c
@@ -815,14 +815,11 @@ static int gigaset_probe(struct usb_interface *interface,
        return 0;
 error:
-        if (ucs->read_urb)
+        usb_kill_urb(ucs->read_urb);
-                usb_kill_urb(ucs->read_urb);
        kfree(ucs->bulk_out_buffer);
-        if (ucs->bulk_out_urb != NULL)
+        usb_free_urb(ucs->bulk_out_urb);
-                usb_free_urb(ucs->bulk_out_urb);
        kfree(cs->inbuf[0].rcvbuf);
-        if (ucs->read_urb != NULL)
+        usb_free_urb(ucs->read_urb);
-                usb_free_urb(ucs->read_urb);
        usb_set_intfdata(interface, NULL);
        ucs->read_urb = ucs->bulk_out_urb = NULL;
        cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
@@ -850,11 +847,9 @@ static void gigaset_disconnect(struct usb_interface *interface)
        usb_kill_urb(ucs->bulk_out_urb);        /* FIXME: only if active? */
        kfree(ucs->bulk_out_buffer);
-        if (ucs->bulk_out_urb != NULL)
+        usb_free_urb(ucs->bulk_out_urb);
-                usb_free_urb(ucs->bulk_out_urb);
        kfree(cs->inbuf[0].rcvbuf);
-        if (ucs->read_urb != NULL)
+        usb_free_urb(ucs->read_urb);
-                usb_free_urb(ucs->read_urb);
        ucs->read_urb = ucs->bulk_out_urb = NULL;
        cs->inbuf[0].rcvbuf = ucs->bulk_out_buffer = NULL;
diff --git a/drivers/isdn/hardware/eicon/os_4bri.c b/drivers/isdn/hardware/eicon/os_4bri.c
index 11e6f937c1e4..7b4ec3f60dbf 100644
--- a/drivers/isdn/hardware/eicon/os_4bri.c
+++ b/drivers/isdn/hardware/eicon/os_4bri.c
@@ -464,7 +464,7 @@ int diva_4bri_init_card(diva_os_xdi_adapter_t * a)
 /*
 **  Cleanup function will be called for master adapter only
-**  this is garanteed by design: cleanup callback is set
+**  this is guaranteed by design: cleanup callback is set
 **  by master adapter only
 */
 static int diva_4bri_cleanup_adapter(diva_os_xdi_adapter_t * a)
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.h b/drivers/isdn/hisax/hfc4s8s_l1.h
index e8f9c077fa85..9d5d2a56b4e9 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.h
+++ b/drivers/isdn/hisax/hfc4s8s_l1.h
@@ -16,7 +16,7 @@
 /*
 *  include Genero generated HFC-4S/8S header file hfc48scu.h
-*  for comlete register description. This will define _HFC48SCU_H_
+*  for complete register description. This will define _HFC48SCU_H_
 *  to prevent redefinitions
 */
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index 6d0431725555..cd3b5ad53491 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -1442,7 +1442,7 @@ l2_tei_remove(struct FsmInst *fi, int event, void *arg)
 }
 static void
-l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st14_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
        
@@ -1453,7 +1453,7 @@ l2_st14_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 static void
-l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st5_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
@@ -1466,7 +1466,7 @@ l2_st5_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 static void
-l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_st6_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
@@ -1477,7 +1477,7 @@ l2_st6_persistant_da(struct FsmInst *fi, int event, void *arg)
 }
 static void
-l2_persistant_da(struct FsmInst *fi, int event, void *arg)
+l2_persistent_da(struct FsmInst *fi, int event, void *arg)
 {
        struct PStack *st = fi->userdata;
@@ -1612,14 +1612,14 @@ static struct FsmNode L2FnList[] __initdata =
        {ST_L2_6, EV_L2_FRAME_ERROR, l2_frame_error},
        {ST_L2_7, EV_L2_FRAME_ERROR, l2_frame_error_reest},
        {ST_L2_8, EV_L2_FRAME_ERROR, l2_frame_error_reest},
-        {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistant_da},
+        {ST_L2_1, EV_L1_DEACTIVATE, l2_st14_persistent_da},
        {ST_L2_2, EV_L1_DEACTIVATE, l2_st24_tei_remove},
        {ST_L2_3, EV_L1_DEACTIVATE, l2_st3_tei_remove},
-        {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistant_da},
+        {ST_L2_4, EV_L1_DEACTIVATE, l2_st14_persistent_da},
-        {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistant_da},
+        {ST_L2_5, EV_L1_DEACTIVATE, l2_st5_persistent_da},
-        {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistant_da},
+        {ST_L2_6, EV_L1_DEACTIVATE, l2_st6_persistent_da},
-        {ST_L2_7, EV_L1_DEACTIVATE, l2_persistant_da},
+        {ST_L2_7, EV_L1_DEACTIVATE, l2_persistent_da},
-        {ST_L2_8, EV_L1_DEACTIVATE, l2_persistant_da},
+        {ST_L2_8, EV_L1_DEACTIVATE, l2_persistent_da},
 };
 #define L2_FN_COUNT (sizeof(L2FnList)/sizeof(struct FsmNode))
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index ff7d4f56ced3..55bc891768c2 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -275,8 +275,7 @@ static void cinergyt2_free_stream_urbs (struct cinergyt2 *cinergyt2)
        int i;
        for (i=0; i<STREAM_URB_COUNT; i++)
-                if (cinergyt2->stream_urb[i])
+                usb_free_urb(cinergyt2->stream_urb[i]);
-                        usb_free_urb(cinergyt2->stream_urb[i]);
        usb_buffer_free(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE,
                            cinergyt2->streambuf, cinergyt2->streambuf_dmahandle);
@@ -320,8 +319,7 @@ static void cinergyt2_stop_stream_xfer (struct cinergyt2 *cinergyt2)
        cinergyt2_control_stream_transfer(cinergyt2, 0);
        for (i=0; i<STREAM_URB_COUNT; i++)
-                if (cinergyt2->stream_urb[i])
+                usb_kill_urb(cinergyt2->stream_urb[i]);
-                        usb_kill_urb(cinergyt2->stream_urb[i]);
 }
 static int cinergyt2_start_stream_xfer (struct cinergyt2 *cinergyt2)
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index fc1267b8c892..9a155396d6ac 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -500,14 +500,14 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 /*      New design (By Emard)
 **      this rps1 code will copy internal HS event to GPIO3 pin.
-**      GPIO3 is in budget-patch hardware connectd to port B VSYNC
+**      GPIO3 is in budget-patch hardware connected to port B VSYNC
 **      HS is an internal event of 7146, accessible with RPS
 **      and temporarily raised high every n lines
 **      (n in defined in the RPS_THRESH1 counter threshold)
 **      I think HS is raised high on the beginning of the n-th line
 **      and remains high until this n-th line that triggered
-**      it is completely received. When the receiption of n-th line
+**      it is completely received. When the reception of n-th line
 **      ends, HS is lowered.
 **      To transmit data over DMA, 7146 needs changing state at
@@ -541,7 +541,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 **      hardware debug note: a working budget card (including budget patch)
 **      with vpeirq() interrupt setup in mode "0x90" (every 64K) will
 **      generate 3 interrupts per 25-Hz DMA frame of 2*188*512 bytes
-**      and that means 3*25=75 Hz of interrupt freqency, as seen by
+**      and that means 3*25=75 Hz of interrupt frequency, as seen by
 **      watch cat /proc/interrupts
 **
 **      If this frequency is 3x lower (and data received in the DMA
@@ -550,7 +550,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
 **      this means VSYNC line is not connected in the hardware.
 **      (check soldering pcb and pins)
 **      The same behaviour of missing VSYNC can be duplicated on budget
-**      cards, by seting DD1_INIT trigger mode 7 in 3rd nibble.
+**      cards, by setting DD1_INIT trigger mode 7 in 3rd nibble.
 */
        // Setup RPS1 "program" (p35)
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index a1c9fa9919ea..8135f3e76aeb 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1135,8 +1135,7 @@ static void ttusb_dec_free_iso_urbs(struct ttusb_dec *dec)
        dprintk("%s\n", __FUNCTION__);
        for (i = 0; i < ISO_BUF_COUNT; i++)
-                if (dec->iso_urb[i])
+                usb_free_urb(dec->iso_urb[i]);
-                        usb_free_urb(dec->iso_urb[i]);
        pci_free_consistent(NULL,
                            ISO_FRAME_SIZE * (FRAMES_PER_ISO_BUF *
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bf267552941f..b8fde5cf4735 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -24,7 +24,7 @@ config VIDEO_HELPER_CHIPS_AUTO
          decode audio/video standards. This option will autoselect
          all pertinent modules to each selected video module.
-          Unselect this only if you know exaclty what you are doing, since
+          Unselect this only if you know exactly what you are doing, since
          it may break support on some boards.
          In doubt, say Y.
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index f920e0ccacd3..1f787333d18c 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1953,8 +1953,8 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf,
        return hdw;
 fail:
        if (hdw) {
-                if (hdw->ctl_read_urb) usb_free_urb(hdw->ctl_read_urb);
+                usb_free_urb(hdw->ctl_read_urb);
-                if (hdw->ctl_write_urb) usb_free_urb(hdw->ctl_write_urb);
+                usb_free_urb(hdw->ctl_write_urb);
                if (hdw->ctl_read_buffer) kfree(hdw->ctl_read_buffer);
                if (hdw->ctl_write_buffer) kfree(hdw->ctl_write_buffer);
                if (hdw->controls) kfree(hdw->controls);
@@ -2575,12 +2575,10 @@ static void pvr2_ctl_timeout(unsigned long data)
        struct pvr2_hdw *hdw = (struct pvr2_hdw *)data;
        if (hdw->ctl_write_pend_flag || hdw->ctl_read_pend_flag) {
                hdw->ctl_timeout_flag = !0;
-                if (hdw->ctl_write_pend_flag && hdw->ctl_write_urb) {
+                if (hdw->ctl_write_pend_flag)
                        usb_unlink_urb(hdw->ctl_write_urb);
-                }
+                if (hdw->ctl_read_pend_flag)
-                if (hdw->ctl_read_pend_flag && hdw->ctl_read_urb) {
                        usb_unlink_urb(hdw->ctl_read_urb);
-                }
        }
 }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index 70aa63eba0cb..57fb32033543 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -289,7 +289,7 @@ static void pvr2_buffer_done(struct pvr2_buffer *bp)
        pvr2_buffer_set_none(bp);
        bp->signature = 0;
        bp->stream = NULL;
-        if (bp->purb) usb_free_urb(bp->purb);
+        usb_free_urb(bp->purb);
        pvr2_trace(PVR2_TRACE_BUF_POOL,"/*---TRACE_FLOW---*/"
                   " bufferDone     %p",bp);
 }
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 46c114830884..a996aad79276 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -866,11 +866,9 @@ int pwc_isoc_init(struct pwc_device *pdev)
        }
        if (ret) {
                /* De-allocate in reverse order */
-                while (i >= 0) {
+                while (i--) {
-                        if (pdev->sbuf[i].urb != NULL)
+                        usb_free_urb(pdev->sbuf[i].urb);
-                                usb_free_urb(pdev->sbuf[i].urb);
                        pdev->sbuf[i].urb = NULL;
-                        i--;
                }
                return ret;
        }
@@ -1095,8 +1093,7 @@ static int pwc_video_open(struct inode *inode, struct file *file)
        PWC_DEBUG_OPEN(">> video_open called(vdev = 0x%p).\n", vdev);
        pdev = (struct pwc_device *)vdev->priv;
-        if (pdev == NULL)
+        BUG_ON(!pdev);
-                BUG();
        if (pdev->vopen) {
                PWC_DEBUG_OPEN("I'm busy, someone is using the device.\n");
                return -EBUSY;
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 42fb60d985b9..18458d46c0ff 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -775,7 +775,7 @@ static int sn9c102_start_transfer(struct sn9c102_device* cam)
        return 0;
 free_urbs:
-        for (i = 0; (i < SN9C102_URBS) &&  cam->urb[i]; i++)
+        for (i = 0; i < SN9C102_URBS; i++)
                usb_free_urb(cam->urb[i]);
 free_buffers:
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
index 9a26b9484aae..bbf2beeeb449 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -190,8 +190,7 @@ static int qcm_alloc_int_urb(struct qcm *cam)
 static void qcm_free_int(struct qcm *cam)
 {
-        if (cam->button_urb)
+        usb_free_urb(cam->button_urb);
-                usb_free_urb(cam->button_urb);
 }
 #endif /* CONFIG_INPUT */
diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 5b5563424422..52d0f759ee00 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -489,7 +489,7 @@ static int zc0301_start_transfer(struct zc0301_device* cam)
        return 0;
 free_urbs:
-        for (i = 0; (i < ZC0301_URBS) &&  cam->urb[i]; i++)
+        for (i = 0; i < ZC0301_URBS; i++)
                usb_free_urb(cam->urb[i]);
 free_buffers:
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index e5c72719debc..051b7c5b8f03 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -6185,7 +6185,7 @@ mpt_spi_log_info(MPT_ADAPTER *ioc, u32 log_info)
                "Abort",                                        /* 12h */
                "IO Not Yet Executed",                          /* 13h */
                "IO Executed",                                  /* 14h */
-                "Persistant Reservation Out Not Affiliation Owner", /* 15h */
+                "Persistent Reservation Out Not Affiliation Owner", /* 15h */
                "Open Transmit DMA Abort",                      /* 16h */
                "IO Device Missing Delay Retry",                /* 17h */
                NULL,                                           /* 18h */
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 62f1ac08332c..8287f95c8c42 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -320,7 +320,6 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
        struct i2o_controller *c;
        int rc;
        struct pci_dev *i960 = NULL;
-        int enabled = pdev->is_enabled;
        printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n");
@@ -330,12 +329,11 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
                return -ENODEV;
        }
-        if (!enabled)
+        if ((rc = pci_enable_device(pdev))) {
-                if ((rc = pci_enable_device(pdev))) {
+                printk(KERN_WARNING "i2o: couldn't enable device %s\n",
-                        printk(KERN_WARNING "i2o: couldn't enable device %s\n",
+                       pci_name(pdev));
-                               pci_name(pdev));
+                return rc;
-                        return rc;
+        }
-                }
        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
                printk(KERN_WARNING "i2o: no suitable DMA found for %s\n",
@@ -442,8 +440,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
        i2o_iop_free(c);
      disable:
-        if (!enabled)
+        pci_disable_device(pdev);
-                pci_disable_device(pdev);
        return rc;
 }
diff --git a/drivers/mmc/mmc_queue.c b/drivers/mmc/mmc_queue.c
index 4ccdd82b680f..61a1de85cb23 100644
--- a/drivers/mmc/mmc_queue.c
+++ b/drivers/mmc/mmc_queue.c
@@ -130,8 +130,8 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, spinlock_t *lock
        u64 limit = BLK_BOUNCE_HIGH;
        int ret;
-        if (host->dev->dma_mask && *host->dev->dma_mask)
+        if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)
-                limit = *host->dev->dma_mask;
+                limit = *mmc_dev(host)->dma_mask;
        mq->card = card;
        mq->queue = blk_init_queue(mmc_request, lock);
diff --git a/drivers/mmc/mmc_sysfs.c b/drivers/mmc/mmc_sysfs.c
index 10cc9734eaa0..ac5329636045 100644
--- a/drivers/mmc/mmc_sysfs.c
+++ b/drivers/mmc/mmc_sysfs.c
@@ -199,7 +199,7 @@ void mmc_init_card(struct mmc_card *card, struct mmc_host *host)
        memset(card, 0, sizeof(struct mmc_card));
        card->host = host;
        device_initialize(&card->dev);
-        card->dev.parent = card->host->dev;
+        card->dev.parent = mmc_dev(host);
        card->dev.bus = &mmc_bus_type;
        card->dev.release = mmc_release_card;
 }
@@ -242,7 +242,7 @@ void mmc_remove_card(struct mmc_card *card)
 }
-static void mmc_host_classdev_release(struct class_device *dev)
+static void mmc_host_classdev_release(struct device *dev)
 {
        struct mmc_host *host = cls_dev_to_mmc_host(dev);
        kfree(host);
@@ -250,7 +250,7 @@ static void mmc_host_classdev_release(struct class_device *dev)
 static struct class mmc_host_class = {
        .name           = "mmc_host",
-        .release        = mmc_host_classdev_release,
+        .dev_release    = mmc_host_classdev_release,
 };
 static DEFINE_IDR(mmc_host_idr);
@@ -267,10 +267,10 @@ struct mmc_host *mmc_alloc_host_sysfs(int extra, struct device *dev)
        if (host) {
                memset(host, 0, sizeof(struct mmc_host) + extra);
-                host->dev = dev;
+                host->parent = dev;
-                host->class_dev.dev = host->dev;
+                host->class_dev.parent = dev;
                host->class_dev.class = &mmc_host_class;
-                class_device_initialize(&host->class_dev);
+                device_initialize(&host->class_dev);
        }
        return host;
@@ -292,10 +292,10 @@ int mmc_add_host_sysfs(struct mmc_host *host)
        if (err)
                return err;
-        snprintf(host->class_dev.class_id, BUS_ID_SIZE,
+        snprintf(host->class_dev.bus_id, BUS_ID_SIZE,
                 "mmc%d", host->index);
-        return class_device_add(&host->class_dev);
+        return device_add(&host->class_dev);
 }
 /*
@@ -303,7 +303,7 @@ int mmc_add_host_sysfs(struct mmc_host *host)
 */
 void mmc_remove_host_sysfs(struct mmc_host *host)
 {
-        class_device_del(&host->class_dev);
+        device_del(&host->class_dev);
        spin_lock(&mmc_host_lock);
        idr_remove(&mmc_host_idr, host->index);
@@ -315,7 +315,7 @@ void mmc_remove_host_sysfs(struct mmc_host *host)
 */
 void mmc_free_host_sysfs(struct mmc_host *host)
 {
-        class_device_put(&host->class_dev);
+        put_device(&host->class_dev);
 }
 static struct workqueue_struct *workqueue;
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 762fa2895891..d593ef342e75 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -640,8 +640,7 @@ mmc_omap_prepare_dma(struct mmc_omap_host *host, struct mmc_data *data)
        }
        /* Max limit for DMA frame count is 0xffff */
-        if (unlikely(count > 0xffff))
+        BUG_ON(count > 0xffff);
-                BUG();
        OMAP_MMC_WRITE(host->base, BUF, buf);
        omap_set_dma_transfer_params(dma_ch, OMAP_DMA_DATA_TYPE_S16,
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index ced309b37a8f..682e62b0b09d 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/wbsd.c
@@ -1488,7 +1488,7 @@ static void __devinit wbsd_request_dma(struct wbsd_host *host, int dma)
        /*
         * Translate the address to a physical address.
         */
-        host->dma_addr = dma_map_single(host->mmc->dev, host->dma_buffer,
+        host->dma_addr = dma_map_single(mmc_dev(host->mmc), host->dma_buffer,
                WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
        /*
@@ -1512,7 +1512,7 @@ kfree:
         */
        BUG_ON(1);
-        dma_unmap_single(host->mmc->dev, host->dma_addr,
+        dma_unmap_single(mmc_dev(host->mmc), host->dma_addr,
                WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
        host->dma_addr = (dma_addr_t)NULL;
@@ -1530,7 +1530,7 @@ err:
 static void __devexit wbsd_release_dma(struct wbsd_host *host)
 {
        if (host->dma_addr) {
-                dma_unmap_single(host->mmc->dev, host->dma_addr,
+                dma_unmap_single(mmc_dev(host->mmc), host->dma_addr,
                        WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
        }
        kfree(host->dma_buffer);
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 24747bdc3e19..d132ed571f13 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -607,7 +607,7 @@ config MTD_BAST_MAXSIZE
        default "4"
 config MTD_SHARP_SL
-        bool "ROM maped on Sharp SL Series"
+        bool "ROM mapped on Sharp SL Series"
        depends on MTD && ARCH_PXA
        help
          This enables access to the flash chip on the Sharp SL Series of PDAs.
diff --git a/drivers/mtd/maps/cfi_flagadm.c b/drivers/mtd/maps/cfi_flagadm.c
index 92b5d883d7b0..65e5ee552010 100644
--- a/drivers/mtd/maps/cfi_flagadm.c
+++ b/drivers/mtd/maps/cfi_flagadm.c
@@ -80,7 +80,7 @@ struct mtd_partition flagadm_parts[] = {
                .size =         FLASH_PARTITION2_SIZE
        },
        {
-                .name =         "Persistant storage",
+                .name =         "Persistent storage",
                .offset =       FLASH_PARTITION3_ADDR,
                .size =         FLASH_PARTITION3_SIZE
        }
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 6e863aa9894c..b6c70c58ae99 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -32,7 +32,7 @@ config IFB
        tristate "Intermediate Functional Block support"
        depends on NET_CLS_ACT
        ---help---
-          This is an intermidiate driver that allows sharing of
+          This is an intermediate driver that allows sharing of
          resources.
          To compile this driver as a module, choose M here: the module
          will be called ifb.  If you want to use more than one ifb
@@ -2136,7 +2136,7 @@ config SK98LIN
          This driver supports the original Yukon chipset. A cleaner driver is 
          also available (skge) which seems to work better than this one.
-          This driver does not support the newer Yukon2 chipset. A seperate
+          This driver does not support the newer Yukon2 chipset. A separate
          driver, sky2, is provided to support Yukon2-based adapters.
          The following adapters are supported by this driver:
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 19ab3441269c..3a8df479cbda 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1215,7 +1215,7 @@ static void e100_setup_ucode(struct nic *nic, struct cb *cb, struct sk_buff *skb
 *  the literal in the instruction before the code is loaded, the
 *  driver can change the algorithm.
 *
-*  INTDELAY - This loads the dead-man timer with its inital value.
+*  INTDELAY - This loads the dead-man timer with its initial value.
 *    When this timer expires the interrupt is asserted, and the
 *    timer is reset each time a new packet is received.  (see
 *    BUNDLEMAX below to set the limit on number of chained packets)
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index 65077f39da69..796c4f7d4260 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -3868,7 +3868,7 @@ e1000_phy_hw_reset(struct e1000_hw *hw)
 *
 * hw - Struct containing variables accessed by shared code
 *
-* Sets bit 15 of the MII Control regiser
+* Sets bit 15 of the MII Control register
 ******************************************************************************/
 int32_t
 e1000_phy_reset(struct e1000_hw *hw)
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 14bda765c2fa..6e95645e7245 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1793,10 +1793,8 @@ err_out_3:
 err_out_2:
        usb_free_urb(self->tx_urb);
 err_out_1:
-        for (i = 0; i < self->max_rx_urb; i++) {
+        for (i = 0; i < self->max_rx_urb; i++)
-                if (self->rx_urb[i])
+                usb_free_urb(self->rx_urb[i]);
-                        usb_free_urb(self->rx_urb[i]);
-        }
        free_netdev(net);
 err_out:
        return ret;
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index b79ec0d7480f..ecb61f876f27 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -61,8 +61,8 @@ config FIXED_PHY
        depends on PHYLIB
        ---help---
          Adds the driver to PHY layer to cover the boards that do not have any PHY bound,
-          but with the ability to manipulate with speed/link in software. The relavant MII
+          but with the ability to manipulate the speed/link in software. The relevant MII
-          speed/duplex parameters could be effectively handled in user-specified  fuction.
+          speed/duplex parameters could be effectively handled in a user-specified function.
          Currently tested with mpc866ads.
 config FIXED_MII_10_FDX
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c
index f5802e7b08e9..c6de566188e4 100644
--- a/drivers/net/ppp_generic.c
+++ b/drivers/net/ppp_generic.c
@@ -860,7 +860,7 @@ static int __init ppp_init(void)
                        err = PTR_ERR(ppp_class);
                        goto out_chrdev;
                }
-                class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
+                device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), "ppp");
        }
 out:
@@ -2675,7 +2675,7 @@ static void __exit ppp_cleanup(void)
        cardmap_destroy(&all_ppp_units);
        if (unregister_chrdev(PPP_MAJOR, "ppp") != 0)
                printk(KERN_ERR "PPP: failed to unregister PPP device\n");
-        class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
+        device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0));
        class_destroy(ppp_class);
 }
diff --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h
index 778d9e618ebd..3fa67171e832 100644
--- a/drivers/net/sk98lin/h/skdrv2nd.h
+++ b/drivers/net/sk98lin/h/skdrv2nd.h
@@ -160,7 +160,7 @@ struct s_IOCTL {
 /*
 ** Interim definition of SK_DRV_TIMER placed in this file until 
-** common modules have boon finallized
+** common modules have been finalized
 */
 #define SK_DRV_TIMER                    11 
 #define SK_DRV_MODERATION_TIMER         1
diff --git a/drivers/net/sk98lin/skdim.c b/drivers/net/sk98lin/skdim.c
index 07c1b4c8699d..37ce03fb8de3 100644
--- a/drivers/net/sk98lin/skdim.c
+++ b/drivers/net/sk98lin/skdim.c
@@ -252,7 +252,7 @@ SkDimEnableModerationIfNeeded(SK_AC *pAC) {
 /*******************************************************************************
 ** Function     : SkDimDisplayModerationSettings
-** Description  : Displays the current settings regaring interrupt moderation
+** Description  : Displays the current settings regarding interrupt moderation
 ** Programmer   : Ralph Roesler
 ** Last Modified: 22-mar-03
 ** Returns      : void (!)
@@ -510,7 +510,7 @@ EnableIntMod(SK_AC *pAC) {
 /*******************************************************************************
 ** Function     : DisableIntMod()
-** Description  : Disbles the interrupt moderation independent of what inter-
+** Description  : Disables the interrupt moderation independent of what inter-
 **                rupts are running or not
 ** Programmer   : Ralph Roesler
 ** Last Modified: 23-mar-03
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 1f742814a01c..72120d5c2f7b 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -6920,8 +6920,8 @@ static int ipw_qos_association(struct ipw_priv *priv,
 }
 /*
-* handling the beaconing responces. if we get different QoS setting
+* handling the beaconing responses. if we get different QoS setting
-* of the network from the the associated setting adjust the QoS
+* off the network from the associated setting, adjust the QoS
 * setting
 */
 static int ipw_qos_association_resp(struct ipw_priv *priv,
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 36b29ff05814..6cb66a356c96 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -1828,10 +1828,8 @@ err_start:
        /* Leave the device in reset state */
        zd1201_docmd(zd, ZD1201_CMDCODE_INIT, 0, 0, 0);
 err_zd:
-        if (zd->tx_urb)
+        usb_free_urb(zd->tx_urb);
-                usb_free_urb(zd->tx_urb);
+        usb_free_urb(zd->rx_urb);
-        if (zd->rx_urb)
-                usb_free_urb(zd->rx_urb);
        kfree(zd);
        return err;
 }
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 68cb3a080050..fe3f5f5365c5 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -486,7 +486,7 @@ typedef unsigned long space_t;
 **   This bit tells U2 to do R/M/W for partial cachelines. "Streaming"
 **   data can avoid this if the mapping covers full cache lines.
 ** o STOP_MOST is needed for atomicity across cachelines.
-**   Apperently only "some EISA devices" need this.
+**   Apparently only "some EISA devices" need this.
 **   Using CONFIG_ISA is hack. Only the IOA with EISA under it needs
 **   to use this hint iff the EISA devices needs this feature.
 **   According to the U2 ERS, STOP_MOST enabled pages hurt performance.
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index c2949b4367e5..12bab64a62a1 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -50,12 +50,12 @@
 **
 ** PA Firmware
 ** -----------
-** PA-RISC platforms have two fundementally different types of firmware.
+** PA-RISC platforms have two fundamentally different types of firmware.
 ** For PCI devices, "Legacy" PDC initializes the "INTERRUPT_LINE" register
 ** and BARs similar to a traditional PC BIOS.
 ** The newer "PAT" firmware supports PDC calls which return tables.
-** PAT firmware only initializes PCI Console and Boot interface.
+** PAT firmware only initializes the PCI Console and Boot interface.
-** With these tables, the OS can progam all other PCI devices.
+** With these tables, the OS can program all other PCI devices.
 **
 ** One such PAT PDC call returns the "Interrupt Routing Table" (IRT).
 ** The IRT maps each PCI slot's INTA-D "output" line to an I/O SAPIC
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 5f1b9f58070e..f1dd81a1d592 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -19,7 +19,7 @@ config PCI_MSI
 config PCI_MULTITHREAD_PROBE
        bool "PCI Multi-threaded probe (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL && BROKEN
+        depends on PCI && EXPERIMENTAL
        help
          Say Y here if you want the PCI core to spawn a new thread for
          every PCI device that is probed.  This can cause a huge
@@ -27,14 +27,14 @@ config PCI_MULTITHREAD_PROBE
          smaller speedup on single processor machines.
          But it can also cause lots of bad things to happen.  A number
-          of PCI drivers can not properly handle running in this way,
+          of PCI drivers cannot properly handle running in this way,
          some will just not work properly at all, while others might
          decide to blow up power supplies with a huge load all at once,
          so use this option at your own risk.
          It is very unwise to use this option if you are not using a
          boot process that can handle devices being created in any
-          order.  A program that can create persistant block and network
+          order.  A program that can create persistent block and network
          device names (like udev) is a good idea if you wish to use
          this option.
diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index ea16805a153c..73a58c73d526 100644
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -1,6 +1,7 @@
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/ioport.h>
+#include <linux/wait.h>
 #include "pci.h"
@@ -63,30 +64,42 @@ EXPORT_SYMBOL(pci_bus_write_config_byte);
 EXPORT_SYMBOL(pci_bus_write_config_word);
 EXPORT_SYMBOL(pci_bus_write_config_dword);
-static u32 pci_user_cached_config(struct pci_dev *dev, int pos)
+/*
-{
+ * The following routines are to prevent the user from accessing PCI config
-        u32 data;
+ * space when it's unsafe to do so.  Some devices require this during BIST and
+ * we're required to prevent it during D-state transitions.
+ *
+ * We have a bit per device to indicate it's blocked and a global wait queue
+ * for callers to sleep on until devices are unblocked.
+ */
+static DECLARE_WAIT_QUEUE_HEAD(pci_ucfg_wait);
-        data = dev->saved_config_space[pos/sizeof(dev->saved_config_space[0])];
+static noinline void pci_wait_ucfg(struct pci_dev *dev)
-        data >>= (pos % sizeof(dev->saved_config_space[0])) * 8;
+{
-        return data;
+        DECLARE_WAITQUEUE(wait, current);
+        __add_wait_queue(&pci_ucfg_wait, &wait);
+        do {
+                set_current_state(TASK_UNINTERRUPTIBLE);
+                spin_unlock_irq(&pci_lock);
+                schedule();
+                spin_lock_irq(&pci_lock);
+        } while (dev->block_ucfg_access);
+        __remove_wait_queue(&pci_ucfg_wait, &wait);
 }
 #define PCI_USER_READ_CONFIG(size,type)                                 \
 int pci_user_read_config_##size                                         \
        (struct pci_dev *dev, int pos, type *val)                       \
 {                                                                       \
-        unsigned long flags;                                            \
        int ret = 0;                                                    \
        u32 data = -1;                                                  \
        if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;       \
-        spin_lock_irqsave(&pci_lock, flags);                            \
+        spin_lock_irq(&pci_lock);                                       \
-        if (likely(!dev->block_ucfg_access))                            \
+        if (unlikely(dev->block_ucfg_access)) pci_wait_ucfg(dev);       \
-                ret = dev->bus->ops->read(dev->bus, dev->devfn,         \
+        ret = dev->bus->ops->read(dev->bus, dev->devfn,                 \
                                        pos, sizeof(type), &data);      \
-        else if (pos < sizeof(dev->saved_config_space))                 \
+        spin_unlock_irq(&pci_lock);                                     \
-                data = pci_user_cached_config(dev, pos);                \
-        spin_unlock_irqrestore(&pci_lock, flags);                       \
        *val = (type)data;                                              \
        return ret;                                                     \
 }
@@ -95,14 +108,13 @@ int pci_user_read_config_##size						\
 int pci_user_write_config_##size                                        \
        (struct pci_dev *dev, int pos, type val)                        \
 {                                                                       \
-        unsigned long flags;                                            \
        int ret = -EIO;                                                 \
        if (PCI_##size##_BAD) return PCIBIOS_BAD_REGISTER_NUMBER;       \
-        spin_lock_irqsave(&pci_lock, flags);                            \
+        spin_lock_irq(&pci_lock);                                       \
-        if (likely(!dev->block_ucfg_access))                            \
+        if (unlikely(dev->block_ucfg_access)) pci_wait_ucfg(dev);       \
-                ret = dev->bus->ops->write(dev->bus, dev->devfn,        \
+        ret = dev->bus->ops->write(dev->bus, dev->devfn,                \
                                        pos, sizeof(type), val);        \
-        spin_unlock_irqrestore(&pci_lock, flags);                       \
+        spin_unlock_irq(&pci_lock);                                     \
        return ret;                                                     \
 }
@@ -117,21 +129,23 @@ PCI_USER_WRITE_CONFIG(dword, u32)
 * pci_block_user_cfg_access - Block userspace PCI config reads/writes
 * @dev:        pci device struct
 *
- * This function blocks any userspace PCI config accesses from occurring.
+ * When user access is blocked, any reads or writes to config space will
- * When blocked, any writes will be bit bucketed and reads will return the
+ * sleep until access is unblocked again.  We don't allow nesting of
- * data saved using pci_save_state for the first 64 bytes of config
+ * block/unblock calls.
- * space and return 0xff for all other config reads.
+ */
- **/
 void pci_block_user_cfg_access(struct pci_dev *dev)
 {
        unsigned long flags;
+        int was_blocked;
-        pci_save_state(dev);
-        /* spinlock to synchronize with anyone reading config space now */
        spin_lock_irqsave(&pci_lock, flags);
+        was_blocked = dev->block_ucfg_access;
        dev->block_ucfg_access = 1;
        spin_unlock_irqrestore(&pci_lock, flags);
+        /* If we BUG() inside the pci_lock, we're guaranteed to hose
+         * the machine */
+        BUG_ON(was_blocked);
 }
 EXPORT_SYMBOL_GPL(pci_block_user_cfg_access);
@@ -140,14 +154,19 @@ EXPORT_SYMBOL_GPL(pci_block_user_cfg_access);
 * @dev:        pci device struct
 *
 * This function allows userspace PCI config accesses to resume.
- **/
+ */
 void pci_unblock_user_cfg_access(struct pci_dev *dev)
 {
        unsigned long flags;
-        /* spinlock to synchronize with anyone reading saved config space */
        spin_lock_irqsave(&pci_lock, flags);
+        /* This indicates a problem in the caller, but we don't need
+         * to kill them, unlike a double-block above. */
+        WARN_ON(!dev->block_ucfg_access);
        dev->block_ucfg_access = 0;
+        wake_up_all(&pci_ucfg_wait);
        spin_unlock_irqrestore(&pci_lock, flags);
 }
 EXPORT_SYMBOL_GPL(pci_unblock_user_cfg_access);
diff --git a/drivers/pci/hotplug/acpiphp.h b/drivers/pci/hotplug/acpiphp.h
index 59c5b242d86d..ddbadd95387e 100644
--- a/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@ -62,10 +62,10 @@ struct acpiphp_slot;
 struct slot {
        struct hotplug_slot     *hotplug_slot;
        struct acpiphp_slot     *acpi_slot;
+        struct hotplug_slot_info info;
+        char name[SLOT_NAME_SIZE];
 };
 /**
 * struct acpiphp_bridge - PCI bridge information
 *
diff --git a/drivers/pci/hotplug/acpiphp_core.c b/drivers/pci/hotplug/acpiphp_core.c
index c57d9d5ce84e..40c79b03c7ef 100644
--- a/drivers/pci/hotplug/acpiphp_core.c
+++ b/drivers/pci/hotplug/acpiphp_core.c
@@ -303,25 +303,15 @@ static int __init init_acpi(void)
        /* read initial number of slots */
        if (!retval) {
                num_slots = acpiphp_get_num_slots();
-                if (num_slots == 0)
+                if (num_slots == 0) {
+                        acpiphp_glue_exit();
                        retval = -ENODEV;
+                }
        }
        return retval;
 }
-/**
- * make_slot_name - make a slot name that appears in pcihpfs
- * @slot: slot to name
- *
- */
-static void make_slot_name(struct slot *slot)
-{
-        snprintf(slot->hotplug_slot->name, SLOT_NAME_SIZE, "%u",
-                 slot->acpi_slot->sun);
-}
 /**
 * release_slot - free up the memory used by a slot
 * @hotplug_slot: slot to free
@@ -332,8 +322,6 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
-        kfree(slot->hotplug_slot->info);
-        kfree(slot->hotplug_slot->name);
        kfree(slot->hotplug_slot);
        kfree(slot);
 }
@@ -342,26 +330,19 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
 int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot)
 {
        struct slot *slot;
-        struct hotplug_slot *hotplug_slot;
-        struct hotplug_slot_info *hotplug_slot_info;
        int retval = -ENOMEM;
        slot = kzalloc(sizeof(*slot), GFP_KERNEL);
        if (!slot)
                goto error;
-        slot->hotplug_slot = kzalloc(sizeof(*hotplug_slot), GFP_KERNEL);
+        slot->hotplug_slot = kzalloc(sizeof(*slot->hotplug_slot), GFP_KERNEL);
        if (!slot->hotplug_slot)
                goto error_slot;
-        slot->hotplug_slot->info = kzalloc(sizeof(*hotplug_slot_info),
+        slot->hotplug_slot->info = &slot->info;
-                                           GFP_KERNEL);
-        if (!slot->hotplug_slot->info)
-                goto error_hpslot;
-        slot->hotplug_slot->name = kzalloc(SLOT_NAME_SIZE, GFP_KERNEL);
+        slot->hotplug_slot->name = slot->name;
-        if (!slot->hotplug_slot->name)
-                goto error_info;
        slot->hotplug_slot->private = slot;
        slot->hotplug_slot->release = &release_slot;
@@ -376,21 +357,17 @@ int acpiphp_register_hotplug_slot(struct acpiphp_slot *acpiphp_slot)
        slot->hotplug_slot->info->cur_bus_speed = PCI_SPEED_UNKNOWN;
        acpiphp_slot->slot = slot;
-        make_slot_name(slot);
+        snprintf(slot->name, sizeof(slot->name), "%u", slot->acpi_slot->sun);
        retval = pci_hp_register(slot->hotplug_slot);
        if (retval) {
                err("pci_hp_register failed with error %d\n", retval);
-                goto error_name;
+                goto error_hpslot;
        }
        info("Slot [%s] registered\n", slot->hotplug_slot->name);
        return 0;
-error_name:
-        kfree(slot->hotplug_slot->name);
-error_info:
-        kfree(slot->hotplug_slot->info);
 error_hpslot:
        kfree(slot->hotplug_slot);
 error_slot:
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 16167b016266..0b9d0db1590a 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -1693,14 +1693,10 @@ void __exit acpiphp_glue_exit(void)
 */
 int __init acpiphp_get_num_slots(void)
 {
-        struct list_head *node;
        struct acpiphp_bridge *bridge;
-        int num_slots;
+        int num_slots = 0;
-        num_slots = 0;
-        list_for_each (node, &bridge_list) {
+        list_for_each_entry (bridge, &bridge_list, list) {
-                bridge = (struct acpiphp_bridge *)node;
                dbg("Bus %04x:%02x has %d slot%s\n",
                                pci_domain_nr(bridge->pci_bus),
                                bridge->pci_bus->number, bridge->nr_slots,
diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c
index c3ac98a0a6a6..f55ac3885cb3 100644
--- a/drivers/pci/hotplug/ibmphp_hpc.c
+++ b/drivers/pci/hotplug/ibmphp_hpc.c
@@ -531,7 +531,7 @@ static u8 hpc_readcmdtoindex (u8 cmd, u8 index)
 *
 * Action:  issue a READ command to HPC
 *
-* Input:   pslot   - can not be NULL for READ_ALLSTAT
+* Input:   pslot   - cannot be NULL for READ_ALLSTAT
 *          pstatus - can be NULL for READ_ALLSTAT
 *
 * Return   0 or error codes
diff --git a/drivers/pci/hotplug/ibmphp_pci.c b/drivers/pci/hotplug/ibmphp_pci.c
index d87a9e3eaeeb..d8f05d7a3c72 100644
--- a/drivers/pci/hotplug/ibmphp_pci.c
+++ b/drivers/pci/hotplug/ibmphp_pci.c
@@ -1371,12 +1371,12 @@ static int unconfigure_boot_bridge (u8 busno, u8 device, u8 function)
        }
        bus = ibmphp_find_res_bus (sec_number);
-        debug ("bus->busno is %x\n", bus->busno);
-        debug ("sec_number is %x\n", sec_number);
        if (!bus) {
                err ("cannot find Bus structure for the bridged device\n");
                return -EINVAL;
        }
+        debug("bus->busno is %x\n", bus->busno);
+        debug("sec_number is %x\n", sec_number);
        ibmphp_remove_bus (bus, busno);
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index f93e81e2d2c7..f13f31323e85 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -521,14 +521,9 @@ static void __exit unload_pciehpd(void)
 }
-static int hpdriver_context = 0;
 static void pciehp_remove (struct pcie_device *device)
 {
-        printk("%s ENTRY\n", __FUNCTION__);     
+        /* XXX - Needs to be adapted to device driver model */
-        printk("%s -> Call free_irq for irq = %d\n",  
-                __FUNCTION__, device->irq);
-        free_irq(device->irq, &hpdriver_context);
 }
 #ifdef CONFIG_PM
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 1c551c697c35..6d3f580f2666 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -718,8 +718,6 @@ static void hpc_release_ctlr(struct controller *ctrl)
                if (php_ctlr->irq) {
                        free_irq(php_ctlr->irq, ctrl);
                        php_ctlr->irq = 0;
-                        if (!pcie_mch_quirk) 
-                                pci_disable_msi(php_ctlr->pci_dev);
                }
        }
        if (php_ctlr->pci_dev) 
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index 46825fee3ae4..72383467a0d5 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -63,7 +63,7 @@ static struct device_node *find_php_slot_pci_node(char *drc_name,
        char *type;
        int rc;
-        while ((np = of_find_node_by_type(np, "pci"))) {
+        while ((np = of_find_node_by_name(np, "pci"))) {
                rc = rpaphp_get_drc_props(np, NULL, &name, &type, NULL);
                if (rc == 0)
                        if (!strcmp(drc_name, name) && !strcmp(drc_type, type))
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 141486df235b..71a2cb8baa4a 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -356,7 +356,7 @@ static int __init rpaphp_init(void)
        info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
        init_MUTEX(&rpaphp_sem);
-        while ((dn = of_find_node_by_type(dn, "pci")))
+        while ((dn = of_find_node_by_name(dn, "pci")))
                rpaphp_add_slot(dn);
        return 0;
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index b62ad31a9739..5d188c558386 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -205,21 +205,6 @@ static struct hotplug_slot * sn_hp_destroy(void)
        return bss_hotplug_slot;
 }
-static void sn_bus_alloc_data(struct pci_dev *dev)
-{
-        struct pci_bus *subordinate_bus;
-        struct pci_dev *child;
-        sn_pci_fixup_slot(dev);
-        /* Recursively sets up the sn_irq_info structs */
-        if (dev->subordinate) {
-                subordinate_bus = dev->subordinate;
-                list_for_each_entry(child, &subordinate_bus->devices, bus_list)
-                        sn_bus_alloc_data(child);
-        }
-}
 static void sn_bus_free_data(struct pci_dev *dev)
 {
        struct pci_bus *subordinate_bus;
@@ -337,6 +322,11 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
        return rc;
 }
+/*
+ * Power up and configure the slot via a SAL call to PROM.
+ * Scan slot (and any children), do any platform specific fixup,
+ * and find device driver.
+ */
 static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
 {
        struct slot *slot = bss_hotplug_slot->private;
@@ -345,6 +335,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
        int func, num_funcs;
        int new_ppb = 0;
        int rc;
+        void pcibios_fixup_device_resources(struct pci_dev *);
        /* Serialize the Linux PCI infrastructure */
        mutex_lock(&sn_hotplug_mutex);
@@ -367,9 +358,6 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                return -ENODEV;
        }
-        sn_pci_controller_fixup(pci_domain_nr(slot->pci_bus),
-                                slot->pci_bus->number,
-                                slot->pci_bus);
        /*
         * Map SN resources for all functions on the card
         * to the Linux PCI interface and tell the drivers
@@ -380,6 +368,13 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                                   PCI_DEVFN(slot->device_num + 1,
                                             PCI_FUNC(func)));
                if (dev) {
+                        /* Need to do slot fixup on PPB before fixup of children
+                         * (PPB's pcidev_info needs to be in pcidev_info list
+                         * before child's SN_PCIDEV_INFO() call to setup
+                         * pdi_host_pcidev_info).
+                         */
+                        pcibios_fixup_device_resources(dev);
+                        sn_pci_fixup_slot(dev);
                        if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
                                unsigned char sec_bus;
                                pci_read_config_byte(dev, PCI_SECONDARY_BUS,
@@ -387,12 +382,8 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                                new_bus = pci_add_new_bus(dev->bus, dev,
                                                          sec_bus);
                                pci_scan_child_bus(new_bus);
-                                sn_pci_controller_fixup(pci_domain_nr(new_bus),
-                                                        new_bus->number,
-                                                        new_bus);
                                new_ppb = 1;
                        }
-                        sn_bus_alloc_data(dev);
                        pci_dev_put(dev);
                }
        }
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index f0cca1772f9c..3898f5237144 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -6,14 +6,6 @@
 #ifndef MSI_H
 #define MSI_H
-/*
- * MSI-X Address Register
- */
-#define PCI_MSIX_FLAGS_QSIZE            0x7FF
-#define PCI_MSIX_FLAGS_ENABLE           (1 << 15)
-#define PCI_MSIX_FLAGS_BIRMASK          (7 << 0)
-#define PCI_MSIX_FLAGS_BITMASK          (1 << 0)
 #define PCI_MSIX_ENTRY_SIZE                     16
 #define  PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET       0
 #define  PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET       4
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index bb7456c1dbac..a064f36a0805 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -36,6 +36,7 @@ acpi_query_osc (
        struct acpi_buffer      output = {ACPI_ALLOCATE_BUFFER, NULL};
        union acpi_object       *out_obj;
        u32                     osc_dw0;
+        acpi_status *ret_status = (acpi_status *)retval;
        
        /* Setting up input parameters */
@@ -56,6 +57,7 @@ acpi_query_osc (
        if (ACPI_FAILURE (status)) {
                printk(KERN_DEBUG  
                        "Evaluate _OSC Set fails. Status = 0x%04x\n", status);
+                *ret_status = status;
                return status;
        }
        out_obj = output.pointer;
@@ -90,6 +92,7 @@ acpi_query_osc (
 query_osc_out:
        kfree(output.pointer);
+        *ret_status = status;
        return status;
 }
@@ -166,6 +169,7 @@ run_osc_out:
 acpi_status pci_osc_support_set(u32 flags)
 {
        u32 temp;
+        acpi_status retval;
        if (!(flags & OSC_SUPPORT_MASKS)) {
                return AE_TYPE;
@@ -179,9 +183,13 @@ acpi_status pci_osc_support_set(u32 flags)
        acpi_get_devices ( PCI_ROOT_HID_STRING,
                        acpi_query_osc,
                        ctrlset_buf,
-                        NULL );
+                        (void **) &retval );
        ctrlset_buf[OSC_QUERY_TYPE] = !OSC_QUERY_ENABLE;
        ctrlset_buf[OSC_CONTROL_TYPE] = temp;
+        if (ACPI_FAILURE(retval)) {
+                /* no osc support at all */
+                ctrlset_buf[OSC_SUPPORT_TYPE] = 0;
+        }
        return AE_OK;
 }
 EXPORT_SYMBOL(pci_osc_support_set);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 194f1d21d3d7..e5ae3a0c13bb 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -329,8 +329,8 @@ static int pci_default_resume(struct pci_dev *pci_dev)
        /* restore the PCI config space */
        pci_restore_state(pci_dev);
        /* if the device was enabled before suspend, reenable */
-        if (pci_dev->is_enabled)
+        if (atomic_read(&pci_dev->enable_cnt))
-                retval = pci_enable_device(pci_dev);
+                retval = __pci_enable_device(pci_dev);
        /* if the device was busmaster before the suspend, make it busmaster again */
        if (pci_dev->is_busmaster)
                pci_set_master(pci_dev);
@@ -445,9 +445,12 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner)
        /* register with core */
        error = driver_register(&drv->driver);
+        if (error)
+                return error;
-        if (!error)
+        error = pci_create_newid_file(drv);
-                error = pci_create_newid_file(drv);
+        if (error)
+                driver_unregister(&drv->driver);
        return error;
 }
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index f952bfea48a6..7a94076752d0 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -42,7 +42,6 @@ pci_config_attr(subsystem_vendor, "0x%04x\n");
 pci_config_attr(subsystem_device, "0x%04x\n");
 pci_config_attr(class, "0x%06x\n");
 pci_config_attr(irq, "%u\n");
-pci_config_attr(is_enabled, "%u\n");
 static ssize_t broken_parity_status_show(struct device *dev,
                                         struct device_attribute *attr,
@@ -112,26 +111,36 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                       (u8)(pci_dev->class >> 16), (u8)(pci_dev->class >> 8),
                       (u8)(pci_dev->class));
 }
-static ssize_t
-is_enabled_store(struct device *dev, struct device_attribute *attr,
+static ssize_t is_enabled_store(struct device *dev,
-                const char *buf, size_t count)
+                                struct device_attribute *attr, const char *buf,
+                                size_t count)
 {
+        ssize_t result = -EINVAL;
        struct pci_dev *pdev = to_pci_dev(dev);
-        int retval = 0;
        /* this can crash the machine when done on the "wrong" device */
        if (!capable(CAP_SYS_ADMIN))
                return count;
-        if (*buf == '0')
+        if (*buf == '0') {
-                pci_disable_device(pdev);
+                if (atomic_read(&pdev->enable_cnt) != 0)
+                        pci_disable_device(pdev);
+                else
+                        result = -EIO;
+        } else if (*buf == '1')
+                result = pci_enable_device(pdev);
+        return result < 0 ? result : count;
+}
-        if (*buf == '1')
+static ssize_t is_enabled_show(struct device *dev,
-                retval = pci_enable_device(pdev);
+                               struct device_attribute *attr, char *buf)
+{
+        struct pci_dev *pdev;
-        if (retval)
+        pdev = to_pci_dev (dev);
-                return retval;
+        return sprintf (buf, "%u\n", atomic_read(&pdev->enable_cnt));
-        return count;
 }
 static ssize_t
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index a544997399b3..5a14b73cf3a1 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -490,6 +490,47 @@ static void pci_restore_pcie_state(struct pci_dev *dev)
        kfree(save_state);
 }
+static int pci_save_pcix_state(struct pci_dev *dev)
+{
+        int pos, i = 0;
+        struct pci_cap_saved_state *save_state;
+        u16 *cap;
+        pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
+        if (pos <= 0)
+                return 0;
+        save_state = kzalloc(sizeof(*save_state) + sizeof(u16), GFP_KERNEL);
+        if (!save_state) {
+                dev_err(&dev->dev, "Out of memory in pci_save_pcie_state\n");
+                return -ENOMEM;
+        }
+        cap = (u16 *)&save_state->data[0];
+        pci_read_config_word(dev, pos + PCI_X_CMD, &cap[i++]);
+        pci_add_saved_cap(dev, save_state);
+        return 0;
+}
+static void pci_restore_pcix_state(struct pci_dev *dev)
+{
+        int i = 0, pos;
+        struct pci_cap_saved_state *save_state;
+        u16 *cap;
+        save_state = pci_find_saved_cap(dev, PCI_CAP_ID_PCIX);
+        pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
+        if (!save_state || pos <= 0)
+                return;
+        cap = (u16 *)&save_state->data[0];
+        pci_write_config_word(dev, pos + PCI_X_CMD, cap[i++]);
+        pci_remove_saved_cap(save_state);
+        kfree(save_state);
+}
 /**
 * pci_save_state - save the PCI configuration space of a device before suspending
 * @dev: - PCI device that we're dealing with
@@ -507,6 +548,8 @@ pci_save_state(struct pci_dev *dev)
                return i;
        if ((i = pci_save_pcie_state(dev)) != 0)
                return i;
+        if ((i = pci_save_pcix_state(dev)) != 0)
+                return i;
        return 0;
 }
@@ -538,6 +581,7 @@ pci_restore_state(struct pci_dev *dev)
                                dev->saved_config_space[i]);
                }
        }
+        pci_restore_pcix_state(dev);
        pci_restore_msi_state(dev);
        pci_restore_msix_state(dev);
        return 0;
@@ -568,30 +612,51 @@ pci_enable_device_bars(struct pci_dev *dev, int bars)
 }
 /**
- * pci_enable_device - Initialize device before it's used by a driver.
+ * __pci_enable_device - Initialize device before it's used by a driver.
 * @dev: PCI device to be initialized
 *
 *  Initialize device before it's used by a driver. Ask low-level code
 *  to enable I/O and memory. Wake up the device if it was suspended.
 *  Beware, this function can fail.
+ *
+ * Note this function is a backend and is not supposed to be called by
+ * normal code, use pci_enable_device() instead.
 */
 int
-pci_enable_device(struct pci_dev *dev)
+__pci_enable_device(struct pci_dev *dev)
 {
        int err;
-        if (dev->is_enabled)
-                return 0;
        err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);
        if (err)
                return err;
        pci_fixup_device(pci_fixup_enable, dev);
-        dev->is_enabled = 1;
        return 0;
 }
 /**
+ * pci_enable_device - Initialize device before it's used by a driver.
+ * @dev: PCI device to be initialized
+ *
+ *  Initialize device before it's used by a driver. Ask low-level code
+ *  to enable I/O and memory. Wake up the device if it was suspended.
+ *  Beware, this function can fail.
+ *
+ *  Note we don't actually enable the device many times if we call
+ *  this function repeatedly (we just increment the count).
+ */
+int pci_enable_device(struct pci_dev *dev)
+{
+        int result;
+        if (atomic_add_return(1, &dev->enable_cnt) > 1)
+                return 0;               /* already enabled */
+        result = __pci_enable_device(dev);
+        if (result < 0)
+                atomic_dec(&dev->enable_cnt);
+        return result;
+}
+/**
 * pcibios_disable_device - disable arch specific PCI resources for device dev
 * @dev: the PCI device to disable
 *
@@ -607,12 +672,18 @@ void __attribute__ ((weak)) pcibios_disable_device (struct pci_dev *dev) {}
 *
 * Signal to the system that the PCI device is not in use by the system
 * anymore.  This only involves disabling PCI bus-mastering, if active.
+ *
+ * Note we don't actually disable the device until all callers of
+ * pci_device_enable() have called pci_device_disable().
 */
 void
 pci_disable_device(struct pci_dev *dev)
 {
        u16 pci_command;
+        if (atomic_sub_return(1, &dev->enable_cnt) != 0)
+                return;
        if (dev->msi_enabled)
                disable_msi_mode(dev, pci_find_capability(dev, PCI_CAP_ID_MSI),
                        PCI_CAP_ID_MSI);
@@ -628,7 +699,6 @@ pci_disable_device(struct pci_dev *dev)
        dev->is_busmaster = 0;
        pcibios_disable_device(dev);
-        dev->is_enabled = 0;
 }
 /**
@@ -831,22 +901,38 @@ pci_set_master(struct pci_dev *dev)
        pcibios_set_master(dev);
 }
-#ifndef HAVE_ARCH_PCI_MWI
+#ifdef PCI_DISABLE_MWI
+int pci_set_mwi(struct pci_dev *dev)
+{
+        return 0;
+}
+void pci_clear_mwi(struct pci_dev *dev)
+{
+}
+#else
+#ifndef PCI_CACHE_LINE_BYTES
+#define PCI_CACHE_LINE_BYTES L1_CACHE_BYTES
+#endif
 /* This can be overridden by arch code. */
-u8 pci_cache_line_size = L1_CACHE_BYTES >> 2;
+/* Don't forget this is measured in 32-bit words, not bytes */
+u8 pci_cache_line_size = PCI_CACHE_LINE_BYTES / 4;
 /**
- * pci_generic_prep_mwi - helper function for pci_set_mwi
+ * pci_set_cacheline_size - ensure the CACHE_LINE_SIZE register is programmed
- * @dev: the PCI device for which MWI is enabled
+ * @dev: the PCI device for which MWI is to be enabled
 *
- * Helper function for generic implementation of pcibios_prep_mwi
+ * Helper function for pci_set_mwi.
- * function.  Originally copied from drivers/net/acenic.c.
+ * Originally copied from drivers/net/acenic.c.
 * Copyright 1998-2001 by Jes Sorensen, <jes@trained-monkey.org>.
 *
 * RETURNS: An appropriate -ERRNO error value on error, or zero for success.
 */
 static int
-pci_generic_prep_mwi(struct pci_dev *dev)
+pci_set_cacheline_size(struct pci_dev *dev)
 {
        u8 cacheline_size;
@@ -872,7 +958,6 @@ pci_generic_prep_mwi(struct pci_dev *dev)
        return -EINVAL;
 }
-#endif /* !HAVE_ARCH_PCI_MWI */
 /**
 * pci_set_mwi - enables memory-write-invalidate PCI transaction
@@ -890,12 +975,7 @@ pci_set_mwi(struct pci_dev *dev)
        int rc;
        u16 cmd;
-#ifdef HAVE_ARCH_PCI_MWI
+        rc = pci_set_cacheline_size(dev);
-        rc = pcibios_prep_mwi(dev);
-#else
-        rc = pci_generic_prep_mwi(dev);
-#endif
        if (rc)
                return rc;
@@ -926,6 +1006,7 @@ pci_clear_mwi(struct pci_dev *dev)
                pci_write_config_word(dev, PCI_COMMAND, cmd);
        }
 }
+#endif /* ! PCI_DISABLE_MWI */
 /**
 * pci_intx - enables/disables PCI INTx for device dev
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 6bf327db5c5e..398852f526a6 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -1,5 +1,6 @@
 /* Functions internal to the PCI core code */
+extern int __must_check __pci_enable_device(struct pci_dev *);
 extern int pci_uevent(struct device *dev, char **envp, int num_envp,
                      char *buffer, int buffer_size);
 extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index e159d6604494..0eeac60042b3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -679,6 +679,33 @@ static int pci_setup_device(struct pci_dev * dev)
                pci_read_bases(dev, 6, PCI_ROM_ADDRESS);
                pci_read_config_word(dev, PCI_SUBSYSTEM_VENDOR_ID, &dev->subsystem_vendor);
                pci_read_config_word(dev, PCI_SUBSYSTEM_ID, &dev->subsystem_device);
+                /*
+                 *      Do the ugly legacy mode stuff here rather than broken chip
+                 *      quirk code. Legacy mode ATA controllers have fixed
+                 *      addresses. These are not always echoed in BAR0-3, and
+                 *      BAR0-3 in a few cases contain junk!
+                 */
+                if (class == PCI_CLASS_STORAGE_IDE) {
+                        u8 progif;
+                        pci_read_config_byte(dev, PCI_CLASS_PROG, &progif);
+                        if ((progif & 1) == 0) {
+                                dev->resource[0].start = 0x1F0;
+                                dev->resource[0].end = 0x1F7;
+                                dev->resource[0].flags = IORESOURCE_IO;
+                                dev->resource[1].start = 0x3F6;
+                                dev->resource[1].end = 0x3F6;
+                                dev->resource[1].flags = IORESOURCE_IO;
+                        }
+                        if ((progif & 4) == 0) {
+                                dev->resource[2].start = 0x170;
+                                dev->resource[2].end = 0x177;
+                                dev->resource[2].flags = IORESOURCE_IO;
+                                dev->resource[3].start = 0x376;
+                                dev->resource[3].end = 0x376;
+                                dev->resource[3].flags = IORESOURCE_IO;
+                        }
+                }
                break;
        case PCI_HEADER_TYPE_BRIDGE:                /* bridge header */
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 5b4483811691..9ca9b9bf6160 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -797,56 +797,6 @@ static void __init quirk_mediagx_master(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_CYRIX,    PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master );
 /*
- * As per PCI spec, ignore base address registers 0-3 of the IDE controllers
- * running in Compatible mode (bits 0 and 2 in the ProgIf for primary and
- * secondary channels respectively). If the device reports Compatible mode
- * but does use BAR0-3 for address decoding, we assume that firmware has
- * programmed these BARs with standard values (0x1f0,0x3f4 and 0x170,0x374).
- * Exceptions (if they exist) must be handled in chip/architecture specific
- * fixups.
- *
- * Note: for non x86 people. You may need an arch specific quirk to handle
- * moving IDE devices to native mode as well. Some plug in card devices power
- * up in compatible mode and assume the BIOS will adjust them.
- *
- * Q: should we load the 0x1f0,0x3f4 into the registers or zap them as
- * we do now ? We don't want is pci_enable_device to come along
- * and assign new resources. Both approaches work for that.
- */ 
-static void __devinit quirk_ide_bases(struct pci_dev *dev)
-{
-       struct resource *res;
-       int first_bar = 2, last_bar = 0;
-       if ((dev->class >> 8) != PCI_CLASS_STORAGE_IDE)
-               return;
-       res = &dev->resource[0];
-       /* primary channel: ProgIf bit 0, BAR0, BAR1 */
-       if (!(dev->class & 1) && (res[0].flags || res[1].flags)) { 
-               res[0].start = res[0].end = res[0].flags = 0;
-               res[1].start = res[1].end = res[1].flags = 0;
-               first_bar = 0;
-               last_bar = 1;
-       }
-       /* secondary channel: ProgIf bit 2, BAR2, BAR3 */
-       if (!(dev->class & 4) && (res[2].flags || res[3].flags)) { 
-               res[2].start = res[2].end = res[2].flags = 0;
-               res[3].start = res[3].end = res[3].flags = 0;
-               last_bar = 3;
-       }
-       if (!last_bar)
-               return;
-       printk(KERN_INFO "PCI: Ignoring BAR%d-%d of IDE controller %s\n",
-              first_bar, last_bar, pci_name(dev));
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, quirk_ide_bases);
-/*
 *      Ensure C0 rev restreaming is off. This is normally done by
 *      the BIOS but in the odd case it is not the results are corruption
 *      hence the presence of a Linux check
@@ -880,11 +830,10 @@ static void __devinit quirk_svwks_csb5ide(struct pci_dev *pdev)
                prog &= ~5;
                pdev->class &= ~5;
                pci_write_config_byte(pdev, PCI_CLASS_PROG, prog);
-                /* need to re-assign BARs for compat mode */
+                /* PCI layer will sort out resources */
-                quirk_ide_bases(pdev);
        }
 }
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, quirk_svwks_csb5ide );
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5IDE, quirk_svwks_csb5ide );
 /*
 *      Intel 82801CAM ICH3-M datasheet says IDE modes must be the same
@@ -900,11 +849,9 @@ static void __init quirk_ide_samemode(struct pci_dev *pdev)
                prog &= ~5;
                pdev->class &= ~5;
                pci_write_config_byte(pdev, PCI_CLASS_PROG, prog);
-                /* need to re-assign BARs for compat mode */
-                quirk_ide_bases(pdev);
        }
 }
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, quirk_ide_samemode);
+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_10, quirk_ide_samemode);
 /* This was originally an Alpha specific thing, but it really fits here.
 * The i82375 PCI/EISA bridge appears as non-classified. Fix that.
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index e1dcefc69bb4..d087e0817715 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -81,7 +81,8 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
                start = (loff_t)0xC0000;
                *size = 0x20000; /* cover C000:0 through E000:0 */
        } else {
-                if (res->flags & IORESOURCE_ROM_COPY) {
+                if (res->flags &
+                        (IORESOURCE_ROM_COPY | IORESOURCE_ROM_BIOS_COPY)) {
                        *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
                        return (void __iomem *)(unsigned long)
                                pci_resource_start(pdev, PCI_ROM_RESOURCE);
@@ -165,7 +166,8 @@ void __iomem *pci_map_rom_copy(struct pci_dev *pdev, size_t *size)
        if (!rom)
                return NULL;
-        if (res->flags & (IORESOURCE_ROM_COPY | IORESOURCE_ROM_SHADOW))
+        if (res->flags & (IORESOURCE_ROM_COPY | IORESOURCE_ROM_SHADOW |
+                          IORESOURCE_ROM_BIOS_COPY))
                return rom;
        res->start = (unsigned long)kmalloc(*size, GFP_KERNEL);
@@ -191,7 +193,7 @@ void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom)
 {
        struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
-        if (res->flags & IORESOURCE_ROM_COPY)
+        if (res->flags & (IORESOURCE_ROM_COPY | IORESOURCE_ROM_BIOS_COPY))
                return;
        iounmap(rom);
@@ -215,6 +217,7 @@ void pci_remove_rom(struct pci_dev *pdev)
                sysfs_remove_bin_file(&pdev->dev.kobj, pdev->rom_attr);
        if (!(res->flags & (IORESOURCE_ROM_ENABLE |
                            IORESOURCE_ROM_SHADOW |
+                            IORESOURCE_ROM_BIOS_COPY |
                            IORESOURCE_ROM_COPY)))
                pci_disable_rom(pdev);
 }
diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 969be465309c..1ee9a6f06541 100644
--- a/drivers/s390/net/claw.h
+++ b/drivers/s390/net/claw.h
@@ -29,7 +29,7 @@
 #define CLAW_COMPLETE           0xff   /* flag to indicate i/o completed */
 /*-----------------------------------------------------*
-*     CLAW control comand code                         *
+*     CLAW control command code                        *
 *------------------------------------------------------*/
 #define SYSTEM_VALIDATE_REQUEST   0x01  /* System Validate request */
diff --git a/drivers/scsi/aic94xx/aic94xx_reg_def.h b/drivers/scsi/aic94xx/aic94xx_reg_def.h
index b79f45f3ad47..a11f4e6d8bd9 100644
--- a/drivers/scsi/aic94xx/aic94xx_reg_def.h
+++ b/drivers/scsi/aic94xx/aic94xx_reg_def.h
@@ -2000,7 +2000,7 @@
 * The host accesses this scratch in a different manner from the
 * central sequencer. The sequencer has to use CSEQ registers CSCRPAGE
 * and CMnSCRPAGE to access the scratch memory. A flat mapping of the
- * scratch memory is avaliable for software convenience and to prevent
+ * scratch memory is available for software convenience and to prevent
 * corruption while the sequencer is running. This memory is mapped
 * onto addresses 800h - BFFh, total of 400h bytes.
 *
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c
index de7c04d4254d..e5a0ec37e954 100644
--- a/drivers/scsi/aic94xx/aic94xx_sds.c
+++ b/drivers/scsi/aic94xx/aic94xx_sds.c
@@ -64,7 +64,7 @@ struct asd_ocm_dir {
 #define OCM_INIT_DIR_ENTRIES    5
 /***************************************************************************
-*  OCM dircetory default
+*  OCM directory default
 ***************************************************************************/
 static struct asd_ocm_dir OCMDirInit =
 {
@@ -73,7 +73,7 @@ static struct asd_ocm_dir OCMDirInit =
 };
 /***************************************************************************
-*  OCM dircetory Entries default
+*  OCM directory Entries default
 ***************************************************************************/
 static struct asd_ocm_dir_ent OCMDirEntriesInit[OCM_INIT_DIR_ENTRIES] =
 {
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 6cc2bc2f62be..adb8eb4f5fd1 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -185,7 +185,7 @@ static inline struct list_head *ncr_list_pop(struct list_head *head)
 **      power of 2 cache line size.
 **      Enhanced in linux-2.3.44 to provide a memory pool 
 **      per pcidev to support dynamic dma mapping. (I would 
-**      have preferred a real bus astraction, btw).
+**      have preferred a real bus abstraction, btw).
 **
 **==========================================================
 */
@@ -1438,7 +1438,7 @@ struct head {
 **      The first four bytes (scr_st[4]) are used inside the script by 
 **      "COPY" commands.
 **      Because source and destination must have the same alignment
-**      in a DWORD, the fields HAVE to be at the choosen offsets.
+**      in a DWORD, the fields HAVE to be at the chosen offsets.
 **              xerr_st         0       (0x34)  scratcha
 **              sync_st         1       (0x05)  sxfer
 **              wide_st         3       (0x03)  scntl3
@@ -1498,7 +1498,7 @@ struct head {
 **      the DSA (data structure address) register points
 **      to this substructure of the ccb.
 **      This substructure contains the header with
-**      the script-processor-changable data and
+**      the script-processor-changeable data and
 **      data blocks for the indirect move commands.
 **
 **----------------------------------------------------------
@@ -5107,7 +5107,7 @@ void ncr_complete (struct ncb *np, struct ccb *cp)
 /*
 **      This CCB has been skipped by the NCR.
-**      Queue it in the correponding unit queue.
+**      Queue it in the corresponding unit queue.
 */
 static void ncr_ccb_skipped(struct ncb *np, struct ccb *cp)
 {
@@ -5896,8 +5896,8 @@ static void ncr_log_hard_error(struct ncb *np, u16 sist, u_char dstat)
 **
 **      In normal cases, interrupt conditions occur one at a 
 **      time. The ncr is able to stack in some extra registers 
-**      other interrupts that will occurs after the first one.
+**      other interrupts that will occur after the first one.
-**      But severall interrupts may occur at the same time.
+**      But, several interrupts may occur at the same time.
 **
 **      We probably should only try to deal with the normal 
 **      case, but it seems that multiple interrupts occur in 
@@ -6796,7 +6796,7 @@ void ncr_int_sir (struct ncb *np)
 **      The host status field is set to HS_NEGOTIATE to mark this
 **      situation.
 **
-**      If the target doesn't answer this message immidiately
+**      If the target doesn't answer this message immediately
 **      (as required by the standard), the SIR_NEGO_FAIL interrupt
 **      will be raised eventually.
 **      The handler removes the HS_NEGOTIATE status, and sets the
diff --git a/drivers/scsi/ncr53c8xx.h b/drivers/scsi/ncr53c8xx.h
index cb8b7701431e..b39357d9af8d 100644
--- a/drivers/scsi/ncr53c8xx.h
+++ b/drivers/scsi/ncr53c8xx.h
@@ -218,7 +218,7 @@
 **      Same as option 1, but also deal with 
 **      misconfigured interrupts.
 **
-**      - Edge triggerred instead of level sensitive.
+**      - Edge triggered instead of level sensitive.
 **      - No interrupt line connected.
 **      - IRQ number misconfigured.
 **      
@@ -549,7 +549,7 @@ struct ncr_driver_setup {
 /*
 **      Initial setup.
-**      Can be overriden at startup by a command line.
+**      Can be overridden at startup by a command line.
 */
 #define SCSI_NCR_DRIVER_SETUP                   \
 {                                               \
@@ -1093,7 +1093,7 @@ struct scr_tblsel {
 **-----------------------------------------------------------
 **      On 810A, 860, 825A, 875, 895 and 896 chips the content 
 **      of SFBR register can be used as data (SCR_SFBR_DATA).
-**      The 896 has additionnal IO registers starting at 
+**      The 896 has additional IO registers starting at 
 **      offset 0x80. Bit 7 of register offset is stored in 
 **      bit 7 of the SCRIPTS instruction first DWORD.
 **-----------------------------------------------------------
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 23334c8bc4c7..d895a1adb428 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -16,7 +16,7 @@ config SPI
          controller and a chipselect.  Most SPI slaves don't support
          dynamic device discovery; some are even write-only or read-only.
-          SPI is widely used by microcontollers to talk with sensors,
+          SPI is widely used by microcontrollers to talk with sensors,
          eeprom and flash memory, codecs and various other controller
          chips, analog to digital (and d-to-a) converters, and more.
          MMC and SD cards can be accessed using SPI protocol; and for
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c
index c870c804470f..a823486495c3 100644
--- a/drivers/usb/atm/speedtch.c
+++ b/drivers/usb/atm/speedtch.c
@@ -834,8 +834,8 @@ static int speedtch_bind(struct usbatm_data *usbatm,
                        const struct usb_endpoint_descriptor *endpoint_desc = &desc->endpoint[i].desc;
                        if ((endpoint_desc->bEndpointAddress == target_address)) {
-                                use_isoc = (endpoint_desc->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
+                                use_isoc =
-                                        USB_ENDPOINT_XFER_ISOC;
+                                        usb_endpoint_xfer_isoc(endpoint_desc);
                                break;
                        }
                }
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index f6b9f7e1f716..c137c041f7a4 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -401,9 +401,8 @@ static int uea_send_modem_cmd(struct usb_device *usb,
        int ret = -ENOMEM;
        u8 *xfer_buff;
-        xfer_buff = kmalloc(size, GFP_KERNEL);
+        xfer_buff = kmemdup(buff, size, GFP_KERNEL);
        if (xfer_buff) {
-                memcpy(xfer_buff, buff, size);
                ret = usb_control_msg(usb,
                                      usb_sndctrlpipe(usb, 0),
                                      LOAD_INTERNAL,
@@ -595,14 +594,12 @@ static int uea_idma_write(struct uea_softc *sc, void *data, u32 size)
        u8 *xfer_buff;
        int bytes_read;
-        xfer_buff = kmalloc(size, GFP_KERNEL);
+        xfer_buff = kmemdup(data, size, GFP_KERNEL);
        if (!xfer_buff) {
                uea_err(INS_TO_USBDEV(sc), "can't allocate xfer_buff\n");
                return ret;
        }
-        memcpy(xfer_buff, data, size);
        ret = usb_bulk_msg(sc->usb_dev,
                         usb_sndbulkpipe(sc->usb_dev, UEA_IDMA_PIPE),
                         xfer_buff, size, &bytes_read, BULK_TIMEOUT);
@@ -765,12 +762,11 @@ static int uea_request(struct uea_softc *sc,
        u8 *xfer_buff;
        int ret = -ENOMEM;
-        xfer_buff = kmalloc(size, GFP_KERNEL);
+        xfer_buff = kmemdup(data, size, GFP_KERNEL);
        if (!xfer_buff) {
                uea_err(INS_TO_USBDEV(sc), "can't allocate xfer_buff\n");
                return ret;
        }
-        memcpy(xfer_buff, data, size);
        ret = usb_control_msg(sc->usb_dev, usb_sndctrlpipe(sc->usb_dev, 0),
                              UCDC_SEND_ENCAPSULATED_COMMAND,
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 9a9012fd284b..ec3438dc8ee5 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -892,7 +892,7 @@ skip_normal_probe:
        /* workaround for switched endpoints */
-        if ((epread->bEndpointAddress & USB_DIR_IN) != USB_DIR_IN) {
+        if (!usb_endpoint_dir_in(epread)) {
                /* descriptors are swapped */
                struct usb_endpoint_descriptor *t;
                dev_dbg(&intf->dev,"The data interface has switched endpoints");
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 6e3b5358a760..f8324d8d06ac 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -72,6 +72,21 @@ config USB_SUSPEND
          If you are unsure about this, say N here.
+config USB_MULTITHREAD_PROBE
+        bool "USB Multi-threaded probe (EXPERIMENTAL)"
+        depends on USB && EXPERIMENTAL
+        default n
+        help
+          Say Y here if you want the USB core to spawn a new thread for
+          every USB device that is probed.  This can cause a small speedup
+          in boot times on systems with a lot of different USB devices.
+          This option should be safe to enable, but if any odd probing
+          problems are found, please disable it, or dynamically turn it
+          off in the /sys/module/usbcore/parameters/multithread_probe
+          file
+          When in doubt, say N.
 config USB_OTG
        bool
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index 3538c2fdadfe..ea398e5d50af 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -175,12 +175,13 @@ static char *usb_dump_endpoint_descriptor (
 )
 {
        char dir, unit, *type;
-        unsigned interval, in, bandwidth = 1;
+        unsigned interval, bandwidth = 1;
        if (start > end)
                return start;
-        in = (desc->bEndpointAddress & USB_DIR_IN);
-        dir = in ? 'I' : 'O';
+        dir = usb_endpoint_dir_in(desc) ? 'I' : 'O';
        if (speed == USB_SPEED_HIGH) {
                switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) {
                case 1 << 11:   bandwidth = 2; break;
@@ -204,7 +205,7 @@ static char *usb_dump_endpoint_descriptor (
                break;
        case USB_ENDPOINT_XFER_BULK:
                type = "Bulk";
-                if (speed == USB_SPEED_HIGH && !in)     /* uframes per NAK */
+                if (speed == USB_SPEED_HIGH && dir == 'O') /* uframes per NAK */
                        interval = desc->bInterval;
                else
                        interval = 0;
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index fed92be63b5e..3ed4cb2d56d9 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -561,7 +561,7 @@ static int usbdev_open(struct inode *inode, struct file *file)
                dev = inode->i_private;
        if (!dev)
                goto out;
-        ret = usb_autoresume_device(dev, 1);
+        ret = usb_autoresume_device(dev);
        if (ret)
                goto out;
@@ -609,7 +609,7 @@ static int usbdev_release(struct inode *inode, struct file *file)
                        releaseintf(ps, ifnum);
        }
        destroy_all_async(ps);
-        usb_autosuspend_device(dev, 1);
+        usb_autosuspend_device(dev);
        usb_unlock_device(dev);
        usb_put_dev(dev);
        put_pid(ps->disc_pid);
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 113e484c763e..d6eb5ce1dd1d 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -205,7 +205,7 @@ static int usb_probe_interface(struct device *dev)
        if (id) {
                dev_dbg(dev, "%s - got id\n", __FUNCTION__);
-                error = usb_autoresume_device(udev, 1);
+                error = usb_autoresume_device(udev);
                if (error)
                        return error;
@@ -229,7 +229,7 @@ static int usb_probe_interface(struct device *dev)
                } else
                        intf->condition = USB_INTERFACE_BOUND;
-                usb_autosuspend_device(udev, 1);
+                usb_autosuspend_device(udev);
        }
        return error;
@@ -247,7 +247,7 @@ static int usb_unbind_interface(struct device *dev)
        /* Autoresume for set_interface call below */
        udev = interface_to_usbdev(intf);
-        error = usb_autoresume_device(udev, 1);
+        error = usb_autoresume_device(udev);
        /* release all urbs for this interface */
        usb_disable_interface(interface_to_usbdev(intf), intf);
@@ -265,7 +265,7 @@ static int usb_unbind_interface(struct device *dev)
        intf->needs_remote_wakeup = 0;
        if (!error)
-                usb_autosuspend_device(udev, 1);
+                usb_autosuspend_device(udev);
        return 0;
 }
@@ -408,6 +408,16 @@ static int usb_match_one_id(struct usb_interface *interface,
            (id->bDeviceProtocol != dev->descriptor.bDeviceProtocol))
                return 0;
+        /* The interface class, subclass, and protocol should never be
+         * checked for a match if the device class is Vendor Specific,
+         * unless the match record specifies the Vendor ID. */
+        if (dev->descriptor.bDeviceClass == USB_CLASS_VENDOR_SPEC &&
+                        !(id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) &&
+                        (id->match_flags & (USB_DEVICE_ID_MATCH_INT_CLASS |
+                                USB_DEVICE_ID_MATCH_INT_SUBCLASS |
+                                USB_DEVICE_ID_MATCH_INT_PROTOCOL)))
+                return 0;
        if ((id->match_flags & USB_DEVICE_ID_MATCH_INT_CLASS) &&
            (id->bInterfaceClass != intf->desc.bInterfaceClass))
                return 0;
@@ -476,7 +486,17 @@ static int usb_match_one_id(struct usb_interface *interface,
 * most general; they let drivers bind to any interface on a
 * multiple-function device.  Use the USB_INTERFACE_INFO
 * macro, or its siblings, to match class-per-interface style
- * devices (as recorded in bDeviceClass).
+ * devices (as recorded in bInterfaceClass).
+ *
+ * Note that an entry created by USB_INTERFACE_INFO won't match
+ * any interface if the device class is set to Vendor-Specific.
+ * This is deliberate; according to the USB spec the meanings of
+ * the interface class/subclass/protocol for these devices are also
+ * vendor-specific, and hence matching against a standard product
+ * class wouldn't work anyway.  If you really want to use an
+ * interface-based match for such a device, create a match record
+ * that also specifies the vendor ID.  (Unforunately there isn't a
+ * standard macro for creating records like this.)
 *
 * Within those groups, remember that not all combinations are
 * meaningful.  For example, don't give a product version range
@@ -505,7 +525,7 @@ const struct usb_device_id *usb_match_id(struct usb_interface *interface,
 }
 EXPORT_SYMBOL_GPL_FUTURE(usb_match_id);
-int usb_device_match(struct device *dev, struct device_driver *drv)
+static int usb_device_match(struct device *dev, struct device_driver *drv)
 {
        /* devices and interfaces are handled separately */
        if (is_usb_device(dev)) {
@@ -790,7 +810,7 @@ EXPORT_SYMBOL_GPL_FUTURE(usb_deregister);
 #ifdef CONFIG_PM
 /* Caller has locked udev's pm_mutex */
-static int suspend_device(struct usb_device *udev, pm_message_t msg)
+static int usb_suspend_device(struct usb_device *udev, pm_message_t msg)
 {
        struct usb_device_driver        *udriver;
        int                             status = 0;
@@ -817,7 +837,7 @@ done:
 }
 /* Caller has locked udev's pm_mutex */
-static int resume_device(struct usb_device *udev)
+static int usb_resume_device(struct usb_device *udev)
 {
        struct usb_device_driver        *udriver;
        int                             status = 0;
@@ -843,7 +863,7 @@ done:
 }
 /* Caller has locked intf's usb_device's pm mutex */
-static int suspend_interface(struct usb_interface *intf, pm_message_t msg)
+static int usb_suspend_interface(struct usb_interface *intf, pm_message_t msg)
 {
        struct usb_driver       *driver;
        int                     status = 0;
@@ -880,7 +900,7 @@ done:
 }
 /* Caller has locked intf's usb_device's pm_mutex */
-static int resume_interface(struct usb_interface *intf)
+static int usb_resume_interface(struct usb_interface *intf)
 {
        struct usb_driver       *driver;
        int                     status = 0;
@@ -920,6 +940,44 @@ done:
        return status;
 }
+#ifdef  CONFIG_USB_SUSPEND
+/* Internal routine to check whether we may autosuspend a device. */
+static int autosuspend_check(struct usb_device *udev)
+{
+        int                     i;
+        struct usb_interface    *intf;
+        /* For autosuspend, fail fast if anything is in use.
+         * Also fail if any interfaces require remote wakeup but it
+         * isn't available. */
+        udev->do_remote_wakeup = device_may_wakeup(&udev->dev);
+        if (udev->pm_usage_cnt > 0)
+                return -EBUSY;
+        if (udev->actconfig) {
+                for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
+                        intf = udev->actconfig->interface[i];
+                        if (!is_active(intf))
+                                continue;
+                        if (intf->pm_usage_cnt > 0)
+                                return -EBUSY;
+                        if (intf->needs_remote_wakeup &&
+                                        !udev->do_remote_wakeup) {
+                                dev_dbg(&udev->dev, "remote wakeup needed "
+                                                "for autosuspend\n");
+                                return -EOPNOTSUPP;
+                        }
+                }
+        }
+        return 0;
+}
+#else
+#define autosuspend_check(udev)         0
+#endif
 /**
 * usb_suspend_both - suspend a USB device and its interfaces
 * @udev: the usb_device to suspend
@@ -971,52 +1029,34 @@ int usb_suspend_both(struct usb_device *udev, pm_message_t msg)
        udev->do_remote_wakeup = device_may_wakeup(&udev->dev);
-        /* For autosuspend, fail fast if anything is in use.
-         * Also fail if any interfaces require remote wakeup but it
-         * isn't available. */
        if (udev->auto_pm) {
-                if (udev->pm_usage_cnt > 0)
+                status = autosuspend_check(udev);
-                        return -EBUSY;
+                if (status < 0)
-                if (udev->actconfig) {
+                        return status;
-                        for (; i < udev->actconfig->desc.bNumInterfaces; i++) {
-                                intf = udev->actconfig->interface[i];
-                                if (!is_active(intf))
-                                        continue;
-                                if (intf->pm_usage_cnt > 0)
-                                        return -EBUSY;
-                                if (intf->needs_remote_wakeup &&
-                                                !udev->do_remote_wakeup) {
-                                        dev_dbg(&udev->dev,
-        "remote wakeup needed for autosuspend\n");
-                                        return -EOPNOTSUPP;
-                                }
-                        }
-                        i = 0;
-                }
        }
        /* Suspend all the interfaces and then udev itself */
        if (udev->actconfig) {
                for (; i < udev->actconfig->desc.bNumInterfaces; i++) {
                        intf = udev->actconfig->interface[i];
-                        status = suspend_interface(intf, msg);
+                        status = usb_suspend_interface(intf, msg);
                        if (status != 0)
                                break;
                }
        }
        if (status == 0)
-                status = suspend_device(udev, msg);
+                status = usb_suspend_device(udev, msg);
        /* If the suspend failed, resume interfaces that did get suspended */
        if (status != 0) {
                while (--i >= 0) {
                        intf = udev->actconfig->interface[i];
-                        resume_interface(intf);
+                        usb_resume_interface(intf);
                }
        /* If the suspend succeeded, propagate it up the tree */
        } else if (parent)
-                usb_autosuspend_device(parent, 0);
+                usb_autosuspend_device(parent);
        // dev_dbg(&udev->dev, "%s: status %d\n", __FUNCTION__, status);
        return status;
@@ -1064,9 +1104,25 @@ int usb_resume_both(struct usb_device *udev)
        /* Propagate the resume up the tree, if necessary */
        if (udev->state == USB_STATE_SUSPENDED) {
                if (parent) {
-                        usb_pm_lock(parent);
+                        status = usb_autoresume_device(parent);
-                        parent->auto_pm = 1;
+                        if (status == 0) {
-                        status = usb_resume_both(parent);
+                                status = usb_resume_device(udev);
+                                if (status) {
+                                        usb_autosuspend_device(parent);
+                                        /* It's possible usb_resume_device()
+                                         * failed after the port was
+                                         * unsuspended, causing udev to be
+                                         * logically disconnected.  We don't
+                                         * want usb_disconnect() to autosuspend
+                                         * the parent again, so tell it that
+                                         * udev disconnected while still
+                                         * suspended. */
+                                        if (udev->state ==
+                                                        USB_STATE_NOTATTACHED)
+                                                udev->discon_suspended = 1;
+                                }
+                        }
                } else {
                        /* We can't progagate beyond the USB subsystem,
@@ -1075,24 +1131,20 @@ int usb_resume_both(struct usb_device *udev)
                        if (udev->dev.parent->power.power_state.event !=
                                        PM_EVENT_ON)
                                status = -EHOSTUNREACH;
-                }
+                        else
-                if (status == 0)
+                                status = usb_resume_device(udev);
-                        status = resume_device(udev);
+                }
-                if (parent)
-                        usb_pm_unlock(parent);
        } else {
                /* Needed only for setting udev->dev.power.power_state.event
                 * and for possible debugging message. */
-                status = resume_device(udev);
+                status = usb_resume_device(udev);
        }
-        /* Now the parent won't suspend until we are finished */
        if (status == 0 && udev->actconfig) {
                for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
                        intf = udev->actconfig->interface[i];
-                        resume_interface(intf);
+                        usb_resume_interface(intf);
                }
        }
@@ -1102,39 +1154,53 @@ int usb_resume_both(struct usb_device *udev)
 #ifdef CONFIG_USB_SUSPEND
+/* Internal routine to adjust a device's usage counter and change
+ * its autosuspend state.
+ */
+static int usb_autopm_do_device(struct usb_device *udev, int inc_usage_cnt)
+{
+        int     status = 0;
+        usb_pm_lock(udev);
+        udev->pm_usage_cnt += inc_usage_cnt;
+        WARN_ON(udev->pm_usage_cnt < 0);
+        if (inc_usage_cnt >= 0 && udev->pm_usage_cnt > 0) {
+                udev->auto_pm = 1;
+                status = usb_resume_both(udev);
+                if (status != 0)
+                        udev->pm_usage_cnt -= inc_usage_cnt;
+        } else if (inc_usage_cnt <= 0 && autosuspend_check(udev) == 0)
+                queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend,
+                                USB_AUTOSUSPEND_DELAY);
+        usb_pm_unlock(udev);
+        return status;
+}
 /**
 * usb_autosuspend_device - delayed autosuspend of a USB device and its interfaces
 * @udev: the usb_device to autosuspend
- * @dec_usage_cnt: flag to decrement @udev's PM-usage counter
 *
 * This routine should be called when a core subsystem is finished using
 * @udev and wants to allow it to autosuspend.  Examples would be when
 * @udev's device file in usbfs is closed or after a configuration change.
 *
- * @dec_usage_cnt should be 1 if the subsystem previously incremented
+ * @udev's usage counter is decremented.  If it or any of the usage counters
- * @udev's usage counter (such as by passing 1 to usb_autoresume_device);
+ * for an active interface is greater than 0, no autosuspend request will be
- * otherwise it should be 0.
+ * queued.  (If an interface driver does not support autosuspend then its
- *
+ * usage counter is permanently positive.)  Furthermore, if an interface
- * If the usage counter for @udev or any of its active interfaces is greater
+ * driver requires remote-wakeup capability during autosuspend but remote
- * than 0, the autosuspend request will not be queued.  (If an interface
+ * wakeup is disabled, the autosuspend will fail.
- * driver does not support autosuspend then its usage counter is permanently
- * positive.)  Likewise, if an interface driver requires remote-wakeup
- * capability during autosuspend but remote wakeup is disabled, the
- * autosuspend will fail.
 *
 * Often the caller will hold @udev's device lock, but this is not
 * necessary.
 *
 * This routine can run only in process context.
 */
-void usb_autosuspend_device(struct usb_device *udev, int dec_usage_cnt)
+void usb_autosuspend_device(struct usb_device *udev)
 {
-        usb_pm_lock(udev);
+        int     status;
-        udev->pm_usage_cnt -= dec_usage_cnt;
-        if (udev->pm_usage_cnt <= 0)
+        status = usb_autopm_do_device(udev, -1);
-                queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend,
-                                USB_AUTOSUSPEND_DELAY);
-        usb_pm_unlock(udev);
        // dev_dbg(&udev->dev, "%s: cnt %d\n",
        //              __FUNCTION__, udev->pm_usage_cnt);
 }
@@ -1142,44 +1208,59 @@ void usb_autosuspend_device(struct usb_device *udev, int dec_usage_cnt)
 /**
 * usb_autoresume_device - immediately autoresume a USB device and its interfaces
 * @udev: the usb_device to autoresume
- * @inc_usage_cnt: flag to increment @udev's PM-usage counter
 *
 * This routine should be called when a core subsystem wants to use @udev
- * and needs to guarantee that it is not suspended.  In addition, the
+ * and needs to guarantee that it is not suspended.  No autosuspend will
- * caller can prevent @udev from being autosuspended subsequently.  (Note
+ * occur until usb_autosuspend_device is called.  (Note that this will not
- * that this will not prevent suspend events originating in the PM core.)
+ * prevent suspend events originating in the PM core.)  Examples would be
- * Examples would be when @udev's device file in usbfs is opened (autosuspend
+ * when @udev's device file in usbfs is opened or when a remote-wakeup
- * should be prevented until the file is closed) or when a remote-wakeup
+ * request is received.
- * request is received (later autosuspends should not be prevented).
 *
- * @inc_usage_cnt should be 1 to increment @udev's usage counter and prevent
+ * @udev's usage counter is incremented to prevent subsequent autosuspends.
- * autosuspends.  This prevention will persist until the usage counter is
+ * However if the autoresume fails then the usage counter is re-decremented.
- * decremented again (such as by passing 1 to usb_autosuspend_device).
- * Otherwise @inc_usage_cnt should be 0 to leave the usage counter unchanged.
- * Regardless, if the autoresume fails then the usage counter is not
- * incremented.
 *
 * Often the caller will hold @udev's device lock, but this is not
 * necessary (and attempting it might cause deadlock).
 *
 * This routine can run only in process context.
 */
-int usb_autoresume_device(struct usb_device *udev, int inc_usage_cnt)
+int usb_autoresume_device(struct usb_device *udev)
 {
        int     status;
-        usb_pm_lock(udev);
+        status = usb_autopm_do_device(udev, 1);
-        udev->pm_usage_cnt += inc_usage_cnt;
-        udev->auto_pm = 1;
-        status = usb_resume_both(udev);
-        if (status != 0)
-                udev->pm_usage_cnt -= inc_usage_cnt;
-        usb_pm_unlock(udev);
        // dev_dbg(&udev->dev, "%s: status %d cnt %d\n",
        //              __FUNCTION__, status, udev->pm_usage_cnt);
        return status;
 }
+/* Internal routine to adjust an interface's usage counter and change
+ * its device's autosuspend state.
+ */
+static int usb_autopm_do_interface(struct usb_interface *intf,
+                int inc_usage_cnt)
+{
+        struct usb_device       *udev = interface_to_usbdev(intf);
+        int                     status = 0;
+        usb_pm_lock(udev);
+        if (intf->condition == USB_INTERFACE_UNBOUND)
+                status = -ENODEV;
+        else {
+                intf->pm_usage_cnt += inc_usage_cnt;
+                if (inc_usage_cnt >= 0 && intf->pm_usage_cnt > 0) {
+                        udev->auto_pm = 1;
+                        status = usb_resume_both(udev);
+                        if (status != 0)
+                                intf->pm_usage_cnt -= inc_usage_cnt;
+                } else if (inc_usage_cnt <= 0 && autosuspend_check(udev) == 0)
+                        queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend,
+                                        USB_AUTOSUSPEND_DELAY);
+        }
+        usb_pm_unlock(udev);
+        return status;
+}
 /**
 * usb_autopm_put_interface - decrement a USB interface's PM-usage counter
 * @intf: the usb_interface whose counter should be decremented
@@ -1213,17 +1294,11 @@ int usb_autoresume_device(struct usb_device *udev, int inc_usage_cnt)
 */
 void usb_autopm_put_interface(struct usb_interface *intf)
 {
-        struct usb_device       *udev = interface_to_usbdev(intf);
+        int     status;
-        usb_pm_lock(udev);
+        status = usb_autopm_do_interface(intf, -1);
-        if (intf->condition != USB_INTERFACE_UNBOUND &&
+        // dev_dbg(&intf->dev, "%s: status %d cnt %d\n",
-                        --intf->pm_usage_cnt <= 0) {
+        //              __FUNCTION__, status, intf->pm_usage_cnt);
-                queue_delayed_work(ksuspend_usb_wq, &udev->autosuspend,
-                                USB_AUTOSUSPEND_DELAY);
-        }
-        usb_pm_unlock(udev);
-        // dev_dbg(&intf->dev, "%s: cnt %d\n",
-        //              __FUNCTION__, intf->pm_usage_cnt);
 }
 EXPORT_SYMBOL_GPL(usb_autopm_put_interface);
@@ -1260,26 +1335,37 @@ EXPORT_SYMBOL_GPL(usb_autopm_put_interface);
 */
 int usb_autopm_get_interface(struct usb_interface *intf)
 {
-        struct usb_device       *udev = interface_to_usbdev(intf);
+        int     status;
-        int                     status;
-        usb_pm_lock(udev);
+        status = usb_autopm_do_interface(intf, 1);
-        if (intf->condition == USB_INTERFACE_UNBOUND)
-                status = -ENODEV;
-        else {
-                ++intf->pm_usage_cnt;
-                udev->auto_pm = 1;
-                status = usb_resume_both(udev);
-                if (status != 0)
-                        --intf->pm_usage_cnt;
-        }
-        usb_pm_unlock(udev);
        // dev_dbg(&intf->dev, "%s: status %d cnt %d\n",
        //              __FUNCTION__, status, intf->pm_usage_cnt);
        return status;
 }
 EXPORT_SYMBOL_GPL(usb_autopm_get_interface);
+/**
+ * usb_autopm_set_interface - set a USB interface's autosuspend state
+ * @intf: the usb_interface whose state should be set
+ *
+ * This routine sets the autosuspend state of @intf's device according
+ * to @intf's usage counter, which the caller must have set previously.
+ * If the counter is <= 0, the device is autosuspended (if it isn't
+ * already suspended and if nothing else prevents the autosuspend).  If
+ * the counter is > 0, the device is autoresumed (if it isn't already
+ * awake).
+ */
+int usb_autopm_set_interface(struct usb_interface *intf)
+{
+        int     status;
+        status = usb_autopm_do_interface(intf, 0);
+        // dev_dbg(&intf->dev, "%s: status %d cnt %d\n",
+        //              __FUNCTION__, status, intf->pm_usage_cnt);
+        return status;
+}
+EXPORT_SYMBOL_GPL(usb_autopm_set_interface);
 #endif /* CONFIG_USB_SUSPEND */
 static int usb_suspend(struct device *dev, pm_message_t message)
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c
index 3b2d137912be..c505b767cee1 100644
--- a/drivers/usb/core/endpoint.c
+++ b/drivers/usb/core/endpoint.c
@@ -10,15 +10,20 @@
 */
 #include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/idr.h>
 #include <linux/usb.h>
 #include "usb.h"
-/* endpoint stuff */
+#define MAX_ENDPOINT_MINORS (64*128*32)
+static int usb_endpoint_major;
+static DEFINE_IDR(endpoint_idr);
 struct ep_device {
        struct usb_endpoint_descriptor *desc;
        struct usb_device *udev;
        struct device dev;
+        int minor;
 };
 #define to_ep_device(_dev) \
        container_of(_dev, struct ep_device, dev)
@@ -152,6 +157,55 @@ static struct attribute_group ep_dev_attr_grp = {
        .attrs = ep_dev_attrs,
 };
+static int usb_endpoint_major_init(void)
+{
+        dev_t dev;
+        int error;
+        error = alloc_chrdev_region(&dev, 0, MAX_ENDPOINT_MINORS,
+                                    "usb_endpoint");
+        if (error) {
+                err("unable to get a dynamic major for usb endpoints");
+                return error;
+        }
+        usb_endpoint_major = MAJOR(dev);
+        return error;
+}
+static void usb_endpoint_major_cleanup(void)
+{
+        unregister_chrdev_region(MKDEV(usb_endpoint_major, 0),
+                                 MAX_ENDPOINT_MINORS);
+}
+static int endpoint_get_minor(struct ep_device *ep_dev)
+{
+        static DEFINE_MUTEX(minor_lock);
+        int retval = -ENOMEM;
+        int id;
+        mutex_lock(&minor_lock);
+        if (idr_pre_get(&endpoint_idr, GFP_KERNEL) == 0)
+                goto exit;
+        retval = idr_get_new(&endpoint_idr, ep_dev, &id);
+        if (retval < 0) {
+                if (retval == -EAGAIN)
+                        retval = -ENOMEM;
+                goto exit;
+        }
+        ep_dev->minor = id & MAX_ID_MASK;
+exit:
+        mutex_unlock(&minor_lock);
+        return retval;
+}
+static void endpoint_free_minor(struct ep_device *ep_dev)
+{
+        idr_remove(&endpoint_idr, ep_dev->minor);
+}
 static struct endpoint_class {
        struct kref kref;
        struct class *class;
@@ -176,11 +230,20 @@ static int init_endpoint_class(void)
        ep_class->class = class_create(THIS_MODULE, "usb_endpoint");
        if (IS_ERR(ep_class->class)) {
                result = IS_ERR(ep_class->class);
-                kfree(ep_class);
+                goto class_create_error;
-                ep_class = NULL;
-                goto exit;
        }
+        result = usb_endpoint_major_init();
+        if (result)
+                goto endpoint_major_error;
+        goto exit;
+endpoint_major_error:
+        class_destroy(ep_class->class);
+class_create_error:
+        kfree(ep_class);
+        ep_class = NULL;
 exit:
        return result;
 }
@@ -191,6 +254,7 @@ static void release_endpoint_class(struct kref *kref)
        class_destroy(ep_class->class);
        kfree(ep_class);
        ep_class = NULL;
+        usb_endpoint_major_cleanup();
 }
 static void destroy_endpoint_class(void)
@@ -213,7 +277,6 @@ int usb_create_ep_files(struct device *parent,
 {
        char name[8];
        struct ep_device *ep_dev;
-        int minor;
        int retval;
        retval = init_endpoint_class();
@@ -226,12 +289,16 @@ int usb_create_ep_files(struct device *parent,
                goto error_alloc;
        }
-        /* fun calculation to determine the minor of this endpoint */
+        retval = endpoint_get_minor(ep_dev);
-        minor = (((udev->bus->busnum - 1) * 128) * 16) + (udev->devnum - 1);
+        if (retval) {
+                dev_err(parent, "can not allocate minor number for %s",
+                        ep_dev->dev.bus_id);
+                goto error_register;
+        }
        ep_dev->desc = &endpoint->desc;
        ep_dev->udev = udev;
-        ep_dev->dev.devt = MKDEV(442, minor);   // FIXME fake number...
+        ep_dev->dev.devt = MKDEV(usb_endpoint_major, ep_dev->minor);
        ep_dev->dev.class = ep_class->class;
        ep_dev->dev.parent = parent;
        ep_dev->dev.release = ep_device_release;
@@ -241,7 +308,7 @@ int usb_create_ep_files(struct device *parent,
        retval = device_register(&ep_dev->dev);
        if (retval)
-                goto error_register;
+                goto error_chrdev;
        retval = sysfs_create_group(&ep_dev->dev.kobj, &ep_dev_attr_grp);
        if (retval)
                goto error_group;
@@ -261,6 +328,9 @@ error_group:
        destroy_endpoint_class();
        return retval;
+error_chrdev:
+        endpoint_free_minor(ep_dev);
 error_register:
        kfree(ep_dev);
 error_alloc:
@@ -271,14 +341,16 @@ exit:
 void usb_remove_ep_files(struct usb_host_endpoint *endpoint)
 {
+        struct ep_device *ep_dev = endpoint->ep_dev;
-        if (endpoint->ep_dev) {
+        if (ep_dev) {
                char name[8];
                sprintf(name, "ep_%02x", endpoint->desc.bEndpointAddress);
-                sysfs_remove_link(&endpoint->ep_dev->dev.parent->kobj, name);
+                sysfs_remove_link(&ep_dev->dev.parent->kobj, name);
-                sysfs_remove_group(&endpoint->ep_dev->dev.kobj, &ep_dev_attr_grp);
+                sysfs_remove_group(&ep_dev->dev.kobj, &ep_dev_attr_grp);
-                device_unregister(&endpoint->ep_dev->dev);
+                endpoint_free_minor(ep_dev);
+                device_unregister(&ep_dev->dev);
                endpoint->ep_dev = NULL;
                destroy_endpoint_class();
        }
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index afa2dd203329..10064af65d17 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -256,7 +256,9 @@ static const u8 hs_rh_config_descriptor [] = {
        0x05,       /*  __u8  ep_bDescriptorType; Endpoint */
        0x81,       /*  __u8  ep_bEndpointAddress; IN Endpoint 1 */
        0x03,       /*  __u8  ep_bmAttributes; Interrupt */
-        0x02, 0x00, /*  __le16 ep_wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8) */
+                    /* __le16 ep_wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8)
+                     * see hub.c:hub_configure() for details. */
+        (USB_MAXCHILDREN + 1 + 7) / 8, 0x00,
        0x0c        /*  __u8  ep_bInterval; (256ms -- usb 2.0 spec) */
 };
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index ba165aff9ea4..0ce393eb3c4b 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -31,6 +31,47 @@
 #include "hcd.h"
 #include "hub.h"
+struct usb_hub {
+        struct device           *intfdev;       /* the "interface" device */
+        struct usb_device       *hdev;
+        struct urb              *urb;           /* for interrupt polling pipe */
+        /* buffer for urb ... with extra space in case of babble */
+        char                    (*buffer)[8];
+        dma_addr_t              buffer_dma;     /* DMA address for buffer */
+        union {
+                struct usb_hub_status   hub;
+                struct usb_port_status  port;
+        }                       *status;        /* buffer for status reports */
+        int                     error;          /* last reported error */
+        int                     nerrors;        /* track consecutive errors */
+        struct list_head        event_list;     /* hubs w/data or errs ready */
+        unsigned long           event_bits[1];  /* status change bitmask */
+        unsigned long           change_bits[1]; /* ports with logical connect
+                                                        status change */
+        unsigned long           busy_bits[1];   /* ports being reset or
+                                                        resumed */
+#if USB_MAXCHILDREN > 31 /* 8*sizeof(unsigned long) - 1 */
+#error event_bits[] is too short!
+#endif
+        struct usb_hub_descriptor *descriptor;  /* class descriptor */
+        struct usb_tt           tt;             /* Transaction Translator */
+        unsigned                mA_per_port;    /* current for each child */
+        unsigned                limited_power:1;
+        unsigned                quiescing:1;
+        unsigned                activating:1;
+        unsigned                has_indicators:1;
+        u8                      indicator[USB_MAXCHILDREN];
+        struct work_struct      leds;
+};
 /* Protect struct usb_device->state and ->children members
 * Note: Both are also protected by ->dev.sem, except that ->state can
 * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
@@ -45,6 +86,16 @@ static DECLARE_WAIT_QUEUE_HEAD(khubd_wait);
 static struct task_struct *khubd_task;
+/* multithreaded probe logic */
+static int multithread_probe =
+#ifdef CONFIG_USB_MULTITHREAD_PROBE
+        1;
+#else
+        0;
+#endif
+module_param(multithread_probe, bool, S_IRUGO);
+MODULE_PARM_DESC(multithread_probe, "Run each USB device probe in a new thread");
 /* cycle leds on hubs that aren't blinking for attention */
 static int blinkenlights = 0;
 module_param (blinkenlights, bool, S_IRUGO);
@@ -276,6 +327,9 @@ static void kick_khubd(struct usb_hub *hub)
 {
        unsigned long   flags;
+        /* Suppress autosuspend until khubd runs */
+        to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
        spin_lock_irqsave(&hub_event_lock, flags);
        if (list_empty(&hub->event_list)) {
                list_add_tail(&hub->event_list, &hub_event_list);
@@ -457,7 +511,6 @@ static void hub_quiesce(struct usb_hub *hub)
        /* (nonblocking) khubd and related activity won't re-trigger */
        hub->quiescing = 1;
        hub->activating = 0;
-        hub->resume_root_hub = 0;
        /* (blocking) stop khubd and related activity */
        usb_kill_urb(hub->urb);
@@ -473,7 +526,7 @@ static void hub_activate(struct usb_hub *hub)
        hub->quiescing = 0;
        hub->activating = 1;
-        hub->resume_root_hub = 0;
        status = usb_submit_urb(hub->urb, GFP_NOIO);
        if (status < 0)
                dev_err(hub->intfdev, "activate --> %d\n", status);
@@ -759,7 +812,12 @@ static int hub_configure(struct usb_hub *hub,
                dev_dbg(hub_dev, "%sover-current condition exists\n",
                        (hubstatus & HUB_STATUS_OVERCURRENT) ? "" : "no ");
-        /* set up the interrupt endpoint */
+        /* set up the interrupt endpoint
+         * We use the EP's maxpacket size instead of (PORTS+1+7)/8
+         * bytes as USB2.0[11.12.3] says because some hubs are known
+         * to send more data (and thus cause overflow). For root hubs,
+         * maxpktsize is defined in hcd.c's fake endpoint descriptors
+         * to be big enough for at least USB_MAXCHILDREN ports. */
        pipe = usb_rcvintpipe(hdev, endpoint->bEndpointAddress);
        maxp = usb_maxpacket(hdev, pipe, usb_pipeout(pipe));
@@ -883,6 +941,7 @@ descriptor_error:
        INIT_WORK(&hub->leds, led_work, hub);
        usb_set_intfdata (intf, hub);
+        intf->needs_remote_wakeup = 1;
        if (hdev->speed == USB_SPEED_HIGH)
                highspeed_hubs++;
@@ -980,6 +1039,8 @@ static void recursively_mark_NOTATTACHED(struct usb_device *udev)
                if (udev->children[i])
                        recursively_mark_NOTATTACHED(udev->children[i]);
        }
+        if (udev->state == USB_STATE_SUSPENDED)
+                udev->discon_suspended = 1;
        udev->state = USB_STATE_NOTATTACHED;
 }
@@ -1169,6 +1230,14 @@ void usb_disconnect(struct usb_device **pdev)
        *pdev = NULL;
        spin_unlock_irq(&device_state_lock);
+        /* Decrement the parent's count of unsuspended children */
+        if (udev->parent) {
+                usb_pm_lock(udev);
+                if (!udev->discon_suspended)
+                        usb_autosuspend_device(udev->parent);
+                usb_pm_unlock(udev);
+        }
        put_device(&udev->dev);
 }
@@ -1191,29 +1260,17 @@ static inline void show_string(struct usb_device *udev, char *id, char *string)
 static int __usb_port_suspend(struct usb_device *, int port1);
 #endif
-/**
+static int __usb_new_device(void *void_data)
- * usb_new_device - perform initial device setup (usbcore-internal)
- * @udev: newly addressed device (in ADDRESS state)
- *
- * This is called with devices which have been enumerated, but not yet
- * configured.  The device descriptor is available, but not descriptors
- * for any device configuration.  The caller must have locked either
- * the parent hub (if udev is a normal device) or else the
- * usb_bus_list_lock (if udev is a root hub).  The parent's pointer to
- * udev has already been installed, but udev is not yet visible through
- * sysfs or other filesystem code.
- *
- * Returns 0 for success (device is configured and listed, with its
- * interfaces, in sysfs); else a negative errno value.
- *
- * This call is synchronous, and may not be used in an interrupt context.
- *
- * Only the hub driver or root-hub registrar should ever call this.
- */
-int usb_new_device(struct usb_device *udev)
 {
+        struct usb_device *udev = void_data;
        int err;
+        /* Lock ourself into memory in order to keep a probe sequence
+         * sleeping in a new thread from allowing us to be unloaded.
+         */
+        if (!try_module_get(THIS_MODULE))
+                return -EINVAL;
        err = usb_get_configuration(udev);
        if (err < 0) {
                dev_err(&udev->dev, "can't read configurations, error %d\n",
@@ -1309,13 +1366,56 @@ int usb_new_device(struct usb_device *udev)
                goto fail;
        }
-        return 0;
+        /* Increment the parent's count of unsuspended children */
+        if (udev->parent)
+                usb_autoresume_device(udev->parent);
+exit:
+        module_put(THIS_MODULE);
+        return err;
 fail:
        usb_set_device_state(udev, USB_STATE_NOTATTACHED);
-        return err;
+        goto exit;
 }
+/**
+ * usb_new_device - perform initial device setup (usbcore-internal)
+ * @udev: newly addressed device (in ADDRESS state)
+ *
+ * This is called with devices which have been enumerated, but not yet
+ * configured.  The device descriptor is available, but not descriptors
+ * for any device configuration.  The caller must have locked either
+ * the parent hub (if udev is a normal device) or else the
+ * usb_bus_list_lock (if udev is a root hub).  The parent's pointer to
+ * udev has already been installed, but udev is not yet visible through
+ * sysfs or other filesystem code.
+ *
+ * The return value for this function depends on if the
+ * multithread_probe variable is set or not.  If it's set, it will
+ * return a if the probe thread was successfully created or not.  If the
+ * variable is not set, it will return if the device is configured
+ * properly or not.  interfaces, in sysfs); else a negative errno value.
+ *
+ * This call is synchronous, and may not be used in an interrupt context.
+ *
+ * Only the hub driver or root-hub registrar should ever call this.
+ */
+int usb_new_device(struct usb_device *udev)
+{
+        struct task_struct *probe_task;
+        int ret = 0;
+        if (multithread_probe) {
+                probe_task = kthread_run(__usb_new_device, udev,
+                                         "usb-probe-%s", udev->devnum);
+                if (IS_ERR(probe_task))
+                        ret = PTR_ERR(probe_task);
+        } else
+                ret = __usb_new_device(udev);
+        return ret;
+}
 static int hub_port_status(struct usb_hub *hub, int port1,
                               u16 *status, u16 *change)
@@ -1323,10 +1423,12 @@ static int hub_port_status(struct usb_hub *hub, int port1,
        int ret;
        ret = get_port_status(hub->hdev, port1, &hub->status->port);
-        if (ret < 0)
+        if (ret < 4) {
                dev_err (hub->intfdev,
                        "%s failed (err = %d)\n", __FUNCTION__, ret);
-        else {
+                if (ret >= 0)
+                        ret = -EIO;
+        } else {
                *status = le16_to_cpu(hub->status->port.wPortStatus);
                *change = le16_to_cpu(hub->status->port.wPortChange); 
                ret = 0;
@@ -1674,6 +1776,12 @@ static int
 hub_port_resume(struct usb_hub *hub, int port1, struct usb_device *udev)
 {
        int     status;
+        u16     portchange, portstatus;
+        /* Skip the initial Clear-Suspend step for a remote wakeup */
+        status = hub_port_status(hub, port1, &portstatus, &portchange);
+        if (status == 0 && !(portstatus & USB_PORT_STAT_SUSPEND))
+                goto SuspendCleared;
        // dev_dbg(hub->intfdev, "resume port %d\n", port1);
@@ -1687,9 +1795,6 @@ hub_port_resume(struct usb_hub *hub, int port1, struct usb_device *udev)
                        "can't resume port %d, status %d\n",
                        port1, status);
        } else {
-                u16             devstatus;
-                u16             portchange;
                /* drive resume for at least 20 msec */
                if (udev)
                        dev_dbg(&udev->dev, "usb %sresume\n",
@@ -1704,16 +1809,15 @@ hub_port_resume(struct usb_hub *hub, int port1, struct usb_device *udev)
                 * stop resume signaling.  Then finish the resume
                 * sequence.
                 */
-                devstatus = portchange = 0;
+                status = hub_port_status(hub, port1, &portstatus, &portchange);
-                status = hub_port_status(hub, port1,
+SuspendCleared:
-                                &devstatus, &portchange);
                if (status < 0
-                                || (devstatus & LIVE_FLAGS) != LIVE_FLAGS
+                                || (portstatus & LIVE_FLAGS) != LIVE_FLAGS
-                                || (devstatus & USB_PORT_STAT_SUSPEND) != 0
+                                || (portstatus & USB_PORT_STAT_SUSPEND) != 0
                                ) {
                        dev_dbg(hub->intfdev,
                                "port %d status %04x.%04x after resume, %d\n",
-                                port1, portchange, devstatus, status);
+                                port1, portchange, portstatus, status);
                        if (status >= 0)
                                status = -ENODEV;
                } else {
@@ -1774,23 +1878,16 @@ static int remote_wakeup(struct usb_device *udev)
 {
        int     status = 0;
-        /* All this just to avoid sending a port-resume message
-         * to the parent hub! */
        usb_lock_device(udev);
-        usb_pm_lock(udev);
        if (udev->state == USB_STATE_SUSPENDED) {
                dev_dbg(&udev->dev, "usb %sresume\n", "wakeup-");
-                /* TRSMRCY = 10 msec */
+                status = usb_autoresume_device(udev);
-                msleep(10);
-                status = finish_port_resume(udev);
+                /* Give the interface drivers a chance to do something,
+                 * then autosuspend the device again. */
                if (status == 0)
-                        udev->dev.power.power_state.event = PM_EVENT_ON;
+                        usb_autosuspend_device(udev);
        }
-        usb_pm_unlock(udev);
-        if (status == 0)
-                usb_autoresume_device(udev, 0);
        usb_unlock_device(udev);
        return status;
 }
@@ -1854,6 +1951,8 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
                }
        }
+        dev_dbg(&intf->dev, "%s\n", __FUNCTION__);
        /* "global suspend" of the downstream HC-to-USB interface */
        if (!hdev->parent) {
                struct usb_bus  *bus = hdev->bus;
@@ -1876,10 +1975,12 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
 static int hub_resume(struct usb_interface *intf)
 {
-        struct usb_device       *hdev = interface_to_usbdev(intf);
        struct usb_hub          *hub = usb_get_intfdata (intf);
+        struct usb_device       *hdev = hub->hdev;
        int                     status;
+        dev_dbg(&intf->dev, "%s\n", __FUNCTION__);
        /* "global resume" of the downstream HC-to-USB interface */
        if (!hdev->parent) {
                struct usb_bus  *bus = hdev->bus;
@@ -1918,7 +2019,6 @@ void usb_resume_root_hub(struct usb_device *hdev)
 {
        struct usb_hub *hub = hdev_to_hub(hdev);
-        hub->resume_root_hub = 1;
        kick_khubd(hub);
 }
@@ -2555,16 +2655,13 @@ static void hub_events(void)
                intf = to_usb_interface(hub->intfdev);
                hub_dev = &intf->dev;
-                i = hub->resume_root_hub;
+                dev_dbg(hub_dev, "state %d ports %d chg %04x evt %04x\n",
-                dev_dbg(hub_dev, "state %d ports %d chg %04x evt %04x%s\n",
                                hdev->state, hub->descriptor
                                        ? hub->descriptor->bNbrPorts
                                        : 0,
                                /* NOTE: expects max 15 ports... */
                                (u16) hub->change_bits[0],
-                                (u16) hub->event_bits[0],
+                                (u16) hub->event_bits[0]);
-                                i ? ", resume root" : "");
                usb_get_intf(intf);
                spin_unlock_irq(&hub_event_lock);
@@ -2585,16 +2682,16 @@ static void hub_events(void)
                        goto loop;
                }
-                /* Is this is a root hub wanting to reactivate the downstream
+                /* Autoresume */
-                 * ports?  If so, be sure the interface resumes even if its
+                ret = usb_autopm_get_interface(intf);
-                 * stub "device" node was never suspended.
+                if (ret) {
-                 */
+                        dev_dbg(hub_dev, "Can't autoresume: %d\n", ret);
-                if (i)
+                        goto loop;
-                        usb_autoresume_device(hdev, 0);
+                }
-                /* If this is an inactive or suspended hub, do nothing */
+                /* If this is an inactive hub, do nothing */
                if (hub->quiescing)
-                        goto loop;
+                        goto loop_autopm;
                if (hub->error) {
                        dev_dbg (hub_dev, "resetting for error %d\n",
@@ -2604,7 +2701,7 @@ static void hub_events(void)
                        if (ret) {
                                dev_dbg (hub_dev,
                                        "error resetting hub: %d\n", ret);
-                                goto loop;
+                                goto loop_autopm;
                        }
                        hub->nerrors = 0;
@@ -2732,6 +2829,10 @@ static void hub_events(void)
                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))
+                        usb_autopm_enable(intf);
 loop:
                usb_unlock_device(hdev);
                usb_put_intf(intf);
@@ -2773,6 +2874,7 @@ static struct usb_driver hub_driver = {
        .post_reset =   hub_post_reset,
        .ioctl =        hub_ioctl,
        .id_table =     hub_id_table,
+        .supports_autosuspend = 1,
 };
 int usb_hub_init(void)
@@ -2997,7 +3099,7 @@ int usb_reset_composite_device(struct usb_device *udev,
        }
        /* Prevent autosuspend during the reset */
-        usb_autoresume_device(udev, 1);
+        usb_autoresume_device(udev);
        if (iface && iface->condition != USB_INTERFACE_BINDING)
                iface = NULL;
@@ -3040,7 +3142,7 @@ int usb_reset_composite_device(struct usb_device *udev,
                }
        }
-        usb_autosuspend_device(udev, 1);
+        usb_autosuspend_device(udev);
        return ret;
 }
 EXPORT_SYMBOL(usb_reset_composite_device);
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 0f8e82a4d480..cf9559c6c9b6 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -192,45 +192,4 @@ struct usb_tt_clear {
 extern void usb_hub_tt_clear_buffer (struct usb_device *dev, int pipe);
-struct usb_hub {
-        struct device           *intfdev;       /* the "interface" device */
-        struct usb_device       *hdev;
-        struct urb              *urb;           /* for interrupt polling pipe */
-        /* buffer for urb ... with extra space in case of babble */
-        char                    (*buffer)[8];
-        dma_addr_t              buffer_dma;     /* DMA address for buffer */
-        union {
-                struct usb_hub_status   hub;
-                struct usb_port_status  port;
-        }                       *status;        /* buffer for status reports */
-        int                     error;          /* last reported error */
-        int                     nerrors;        /* track consecutive errors */
-        struct list_head        event_list;     /* hubs w/data or errs ready */
-        unsigned long           event_bits[1];  /* status change bitmask */
-        unsigned long           change_bits[1]; /* ports with logical connect
-                                                        status change */
-        unsigned long           busy_bits[1];   /* ports being reset or
-                                                        resumed */
-#if USB_MAXCHILDREN > 31 /* 8*sizeof(unsigned long) - 1 */
-#error event_bits[] is too short!
-#endif
-        struct usb_hub_descriptor *descriptor;  /* class descriptor */
-        struct usb_tt           tt;             /* Transaction Translator */
-        unsigned                mA_per_port;    /* current for each child */
-        unsigned                limited_power:1;
-        unsigned                quiescing:1;
-        unsigned                activating:1;
-        unsigned                resume_root_hub:1;
-        unsigned                has_indicators:1;
-        enum hub_led_mode       indicator[USB_MAXCHILDREN];
-        struct work_struct      leds;
-};
 #endif /* __LINUX_HUB_H */
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 7729c0744886..29b0fa9ff9d0 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -764,7 +764,7 @@ int usb_string(struct usb_device *dev, int index, char *buf, size_t size)
                        err = -EINVAL;
                        goto errout;
                } else {
-                        dev->have_langid = -1;
+                        dev->have_langid = 1;
                        dev->string_langid = tbuf[2] | (tbuf[3]<< 8);
                                /* always use the first langid listed */
                        dev_dbg (&dev->dev, "default language 0x%04x\n",
@@ -1398,7 +1398,7 @@ free_interfaces:
        }
        /* Wake up the device so we can send it the Set-Config request */
-        ret = usb_autoresume_device(dev, 1);
+        ret = usb_autoresume_device(dev);
        if (ret)
                goto free_interfaces;
@@ -1421,7 +1421,7 @@ free_interfaces:
        dev->actconfig = cp;
        if (!cp) {
                usb_set_device_state(dev, USB_STATE_ADDRESS);
-                usb_autosuspend_device(dev, 1);
+                usb_autosuspend_device(dev);
                goto free_interfaces;
        }
        usb_set_device_state(dev, USB_STATE_CONFIGURED);
@@ -1490,7 +1490,7 @@ free_interfaces:
                usb_create_sysfs_intf_files (intf);
        }
-        usb_autosuspend_device(dev, 1);
+        usb_autosuspend_device(dev);
        return 0;
 }
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 467cb02832f3..81cb52564e68 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -200,13 +200,6 @@ static void ksuspend_usb_cleanup(void)
        destroy_workqueue(ksuspend_usb_wq);
 }
-#else
-#define ksuspend_usb_init()     0
-#define ksuspend_usb_cleanup()  do {} while (0)
-#endif
 #ifdef  CONFIG_USB_SUSPEND
 /* usb_autosuspend_work - callback routine to autosuspend a USB device */
@@ -225,7 +218,14 @@ static void usb_autosuspend_work(void *_udev)
 static void usb_autosuspend_work(void *_udev)
 {}
-#endif
+#endif  /* CONFIG_USB_SUSPEND */
+#else
+#define ksuspend_usb_init()     0
+#define ksuspend_usb_cleanup()  do {} while (0)
+#endif  /* CONFIG_PM */
 /**
 * usb_alloc_dev - usb device constructor (usbcore-internal)
@@ -537,138 +537,6 @@ int usb_get_current_frame_number(struct usb_device *dev)
        return usb_hcd_get_frame_number (dev);
 }
-/**
- * usb_endpoint_dir_in - check if the endpoint has IN direction
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type IN, otherwise it returns false.
- */
-int usb_endpoint_dir_in(const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN);
-}
-/**
- * usb_endpoint_dir_out - check if the endpoint has OUT direction
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type OUT, otherwise it returns false.
- */
-int usb_endpoint_dir_out(const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT);
-}
-/**
- * usb_endpoint_xfer_bulk - check if the endpoint has bulk transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type bulk, otherwise it returns false.
- */
-int usb_endpoint_xfer_bulk(const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                USB_ENDPOINT_XFER_BULK);
-}
-/**
- * usb_endpoint_xfer_int - check if the endpoint has interrupt transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type interrupt, otherwise it returns
- * false.
- */
-int usb_endpoint_xfer_int(const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                USB_ENDPOINT_XFER_INT);
-}
-/**
- * usb_endpoint_xfer_isoc - check if the endpoint has isochronous transfer type
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint is of type isochronous, otherwise it returns
- * false.
- */
-int usb_endpoint_xfer_isoc(const struct usb_endpoint_descriptor *epd)
-{
-        return ((epd->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                USB_ENDPOINT_XFER_ISOC);
-}
-/**
- * usb_endpoint_is_bulk_in - check if the endpoint is bulk IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has bulk transfer type and IN direction,
- * otherwise it returns false.
- */
-int usb_endpoint_is_bulk_in(const struct usb_endpoint_descriptor *epd)
-{
-        return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_in(epd));
-}
-/**
- * usb_endpoint_is_bulk_out - check if the endpoint is bulk OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has bulk transfer type and OUT direction,
- * otherwise it returns false.
- */
-int usb_endpoint_is_bulk_out(const struct usb_endpoint_descriptor *epd)
-{
-        return (usb_endpoint_xfer_bulk(epd) && usb_endpoint_dir_out(epd));
-}
-/**
- * usb_endpoint_is_int_in - check if the endpoint is interrupt IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has interrupt transfer type and IN direction,
- * otherwise it returns false.
- */
-int usb_endpoint_is_int_in(const struct usb_endpoint_descriptor *epd)
-{
-        return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_in(epd));
-}
-/**
- * usb_endpoint_is_int_out - check if the endpoint is interrupt OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has interrupt transfer type and OUT direction,
- * otherwise it returns false.
- */
-int usb_endpoint_is_int_out(const struct usb_endpoint_descriptor *epd)
-{
-        return (usb_endpoint_xfer_int(epd) && usb_endpoint_dir_out(epd));
-}
-/**
- * usb_endpoint_is_isoc_in - check if the endpoint is isochronous IN
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has isochronous transfer type and IN direction,
- * otherwise it returns false.
- */
-int usb_endpoint_is_isoc_in(const struct usb_endpoint_descriptor *epd)
-{
-        return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_in(epd));
-}
-/**
- * usb_endpoint_is_isoc_out - check if the endpoint is isochronous OUT
- * @epd: endpoint to be checked
- *
- * Returns true if the endpoint has isochronous transfer type and OUT direction,
- * otherwise it returns false.
- */
-int usb_endpoint_is_isoc_out(const struct usb_endpoint_descriptor *epd)
-{
-        return (usb_endpoint_xfer_isoc(epd) && usb_endpoint_dir_out(epd));
-}
 /*-------------------------------------------------------------------*/
 /*
 * __usb_get_extra_descriptor() finds a descriptor of specific type in the
@@ -1102,18 +970,6 @@ EXPORT_SYMBOL(__usb_get_extra_descriptor);
 EXPORT_SYMBOL(usb_find_device);
 EXPORT_SYMBOL(usb_get_current_frame_number);
-EXPORT_SYMBOL_GPL(usb_endpoint_dir_in);
-EXPORT_SYMBOL_GPL(usb_endpoint_dir_out);
-EXPORT_SYMBOL_GPL(usb_endpoint_xfer_bulk);
-EXPORT_SYMBOL_GPL(usb_endpoint_xfer_int);
-EXPORT_SYMBOL_GPL(usb_endpoint_xfer_isoc);
-EXPORT_SYMBOL_GPL(usb_endpoint_is_bulk_in);
-EXPORT_SYMBOL_GPL(usb_endpoint_is_bulk_out);
-EXPORT_SYMBOL_GPL(usb_endpoint_is_int_in);
-EXPORT_SYMBOL_GPL(usb_endpoint_is_int_out);
-EXPORT_SYMBOL_GPL(usb_endpoint_is_isoc_in);
-EXPORT_SYMBOL_GPL(usb_endpoint_is_isoc_out);
 EXPORT_SYMBOL (usb_buffer_alloc);
 EXPORT_SYMBOL (usb_buffer_free);
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 13322e33f912..17830a81be14 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -64,14 +64,13 @@ static inline void usb_pm_unlock(struct usb_device *udev) {}
 #define USB_AUTOSUSPEND_DELAY   (HZ*2)
-extern void usb_autosuspend_device(struct usb_device *udev, int dec_busy_cnt);
+extern void usb_autosuspend_device(struct usb_device *udev);
-extern int usb_autoresume_device(struct usb_device *udev, int inc_busy_cnt);
+extern int usb_autoresume_device(struct usb_device *udev);
 #else
-#define usb_autosuspend_device(udev, dec_busy_cnt)      do {} while (0)
+#define usb_autosuspend_device(udev)    do {} while (0)
-static inline int usb_autoresume_device(struct usb_device *udev,
+static inline int usb_autoresume_device(struct usb_device *udev)
-                int inc_busy_cnt)
 {
        return 0;
 }
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 1c17d26d03b8..3bd1dfe565c1 100644
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -1894,13 +1894,13 @@ static int eth_start_xmit (struct sk_buff *skb, struct net_device *net)
        if (!eth_is_promisc (dev)) {
                u8              *dest = skb->data;
-                if (dest [0] & 0x01) {
+                if (is_multicast_ether_addr(dest)) {
                        u16     type;
                        /* ignores USB_CDC_PACKET_TYPE_MULTICAST and host
                         * SET_ETHERNET_MULTICAST_FILTERS requests
                         */
-                        if (memcmp (dest, net->broadcast, ETH_ALEN) == 0)
+                        if (is_broadcast_ether_addr(dest))
                                type = USB_CDC_PACKET_TYPE_BROADCAST;
                        else
                                type = USB_CDC_PACKET_TYPE_ALL_MULTICAST;
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 179259664c18..4a991564a03e 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -83,7 +83,6 @@ static int lh7a40x_queue(struct usb_ep *ep, struct usb_request *, gfp_t);
 static int lh7a40x_dequeue(struct usb_ep *ep, struct usb_request *);
 static int lh7a40x_set_halt(struct usb_ep *ep, int);
 static int lh7a40x_fifo_status(struct usb_ep *ep);
-static int lh7a40x_fifo_status(struct usb_ep *ep);
 static void lh7a40x_fifo_flush(struct usb_ep *ep);
 static void lh7a40x_ep0_kick(struct lh7a40x_udc *dev, struct lh7a40x_ep *ep);
 static void lh7a40x_handle_ep0(struct lh7a40x_udc *dev, u32 intr);
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 3acc896a5d4c..0b590831582c 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -1040,6 +1040,7 @@ net2280_queue (struct usb_ep *_ep, struct usb_request *_req, gfp_t gfp_flags)
        } /* else the irq handler advances the queue. */
+        ep->responded = 1;
        if (req)
                list_add_tail (&req->queue, &ep->queue);
 done:
@@ -2188,7 +2189,8 @@ static void handle_ep_small (struct net2280_ep *ep)
                                        ep->stopped = 1;
                                        set_halt (ep);
                                        mode = 2;
-                                } else if (!req && !ep->stopped)
+                                } else if (ep->responded &&
+                                                !req && !ep->stopped)
                                        write_fifo (ep, NULL);
                        }
                } else {
@@ -2203,7 +2205,7 @@ static void handle_ep_small (struct net2280_ep *ep)
                        } else if (((t & (1 << DATA_OUT_PING_TOKEN_INTERRUPT))
                                        && req
                                        && req->req.actual == req->req.length)
-                                        || !req) {
+                                        || (ep->responded && !req)) {
                                ep->dev->protocol_stall = 1;
                                set_halt (ep);
                                ep->stopped = 1;
@@ -2469,6 +2471,7 @@ static void handle_stat0_irqs (struct net2280 *dev, u32 stat)
                /* we made the hardware handle most lowlevel requests;
                 * everything else goes uplevel to the gadget code.
                 */
+                ep->responded = 1;
                switch (u.r.bRequest) {
                case USB_REQ_GET_STATUS: {
                        struct net2280_ep       *e;
@@ -2537,6 +2540,7 @@ delegate:
                                u.r.bRequestType, u.r.bRequest,
                                w_value, w_index, w_length,
                                readl (&ep->regs->ep_cfg));
+                        ep->responded = 0;
                        spin_unlock (&dev->lock);
                        tmp = dev->driver->setup (&dev->gadget, &u.r);
                        spin_lock (&dev->lock);
diff --git a/drivers/usb/gadget/net2280.h b/drivers/usb/gadget/net2280.h
index 957d6df34015..44ca139983d8 100644
--- a/drivers/usb/gadget/net2280.h
+++ b/drivers/usb/gadget/net2280.h
@@ -110,7 +110,8 @@ struct net2280_ep {
                                                out_overflow : 1,
                                                stopped : 1,
                                                is_in : 1,
-                                                is_iso : 1;
+                                                is_iso : 1,
+                                                responded : 1;
 };
 static inline void allow_status (struct net2280_ep *ep)
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 671c24bc6d75..1ed506e95985 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2472,6 +2472,7 @@ static struct pxa2xx_udc memory = {
 #define PXA210_B1               0x00000123
 #define PXA210_B0               0x00000122
 #define IXP425_A0               0x000001c1
+#define IXP425_B0               0x000001f1
 #define IXP465_AD               0x00000200
 /*
@@ -2509,6 +2510,7 @@ static int __init pxa2xx_udc_probe(struct platform_device *pdev)
                break;
 #elif   defined(CONFIG_ARCH_IXP4XX)
        case IXP425_A0:
+        case IXP425_B0:
        case IXP465_AD:
                dev->has_cfr = 1;
                out_dma = 0;
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index cf10cbc98f80..cc60759083bf 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -153,7 +153,7 @@ config USB_U132_HCD
          adapter will *NOT* work with PC cards that do not contain an OHCI
          controller.
-          For those PC cards that contain multiple OHCI controllers only ther
+          For those PC cards that contain multiple OHCI controllers only the
          first one is used.
          The driver consists of two modules, the "ftdi-elan" module is a
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 9030994aba98..025d33313681 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -126,6 +126,11 @@ static unsigned park = 0;
 module_param (park, uint, S_IRUGO);
 MODULE_PARM_DESC (park, "park setting; 1-3 back-to-back async packets");
+/* for flakey hardware, ignore overcurrent indicators */
+static int ignore_oc = 0;
+module_param (ignore_oc, bool, S_IRUGO);
+MODULE_PARM_DESC (ignore_oc, "ignore bogus hardware overcurrent indications");
 #define INTR_MASK (STS_IAA | STS_FATAL | STS_PCD | STS_ERR | STS_INT)
 /*-------------------------------------------------------------------------*/
@@ -541,9 +546,10 @@ static int ehci_run (struct usb_hcd *hcd)
        temp = HC_VERSION(readl (&ehci->caps->hc_capbase));
        ehci_info (ehci,
-                "USB %x.%x started, EHCI %x.%02x, driver %s\n",
+                "USB %x.%x started, EHCI %x.%02x, driver %s%s\n",
                ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f),
-                temp >> 8, temp & 0xff, DRIVER_VERSION);
+                temp >> 8, temp & 0xff, DRIVER_VERSION,
+                ignore_oc ? ", overcurrent ignored" : "");
        writel (INTR_MASK, &ehci->regs->intr_enable); /* Turn On Interrupts */
@@ -613,9 +619,8 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
                unsigned        i = HCS_N_PORTS (ehci->hcs_params);
                /* resume root hub? */
-                status = readl (&ehci->regs->command);
+                if (!(readl(&ehci->regs->command) & CMD_RUN))
-                if (!(status & CMD_RUN))
+                        usb_hcd_resume_root_hub(hcd);
-                        writel (status | CMD_RUN, &ehci->regs->command);
                while (i--) {
                        int pstatus = readl (&ehci->regs->port_status [i]);
@@ -632,7 +637,6 @@ static irqreturn_t ehci_irq (struct usb_hcd *hcd)
                         */
                        ehci->reset_done [i] = jiffies + msecs_to_jiffies (20);
                        ehci_dbg (ehci, "port %d remote wakeup\n", i + 1);
-                        usb_hcd_resume_root_hub(hcd);
                }
        }
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 1b20722c102b..bfe5f307cba6 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -34,6 +34,7 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
 {
        struct ehci_hcd         *ehci = hcd_to_ehci (hcd);
        int                     port;
+        int                     mask;
        if (time_before (jiffies, ehci->next_statechange))
                msleep(5);
@@ -51,14 +52,25 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
                ehci->reclaim_ready = 1;
        ehci_work(ehci);
-        /* suspend any active/unsuspended ports, maybe allow wakeup */
+        /* Unlike other USB host controller types, EHCI doesn't have
+         * any notion of "global" or bus-wide suspend.  The driver has
+         * to manually suspend all the active unsuspended ports, and
+         * then manually resume them in the bus_resume() routine.
+         */
+        ehci->bus_suspended = 0;
        while (port--) {
                u32 __iomem     *reg = &ehci->regs->port_status [port];
                u32             t1 = readl (reg) & ~PORT_RWC_BITS;
                u32             t2 = t1;
-                if ((t1 & PORT_PE) && !(t1 & PORT_OWNER))
+                /* keep track of which ports we suspend */
+                if ((t1 & PORT_PE) && !(t1 & PORT_OWNER) &&
+                                !(t1 & PORT_SUSPEND)) {
                        t2 |= PORT_SUSPEND;
+                        set_bit(port, &ehci->bus_suspended);
+                }
+                /* enable remote wakeup on all ports */
                if (device_may_wakeup(&hcd->self.root_hub->dev))
                        t2 |= PORT_WKOC_E|PORT_WKDISC_E|PORT_WKCONN_E;
                else
@@ -76,6 +88,13 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
        ehci_halt (ehci);
        hcd->state = HC_STATE_SUSPENDED;
+        /* allow remote wakeup */
+        mask = INTR_MASK;
+        if (!device_may_wakeup(&hcd->self.root_hub->dev))
+                mask &= ~STS_PCD;
+        writel(mask, &ehci->regs->intr_enable);
+        readl(&ehci->regs->intr_enable);
        ehci->next_statechange = jiffies + msecs_to_jiffies(10);
        spin_unlock_irq (&ehci->lock);
        return 0;
@@ -88,7 +107,6 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
        struct ehci_hcd         *ehci = hcd_to_ehci (hcd);
        u32                     temp;
        int                     i;
-        int                     intr_enable;
        if (time_before (jiffies, ehci->next_statechange))
                msleep(5);
@@ -100,31 +118,30 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
         * the last user of the controller, not reset/pm hardware keeping
         * state we gave to it.
         */
+        temp = readl(&ehci->regs->intr_enable);
+        ehci_dbg(ehci, "resume root hub%s\n", temp ? "" : " after power loss");
-        /* re-init operational registers in case we lost power */
+        /* at least some APM implementations will try to deliver
-        if (readl (&ehci->regs->intr_enable) == 0) {
+         * IRQs right away, so delay them until we're ready.
-                /* at least some APM implementations will try to deliver
+         */
-                 * IRQs right away, so delay them until we're ready.
+        writel(0, &ehci->regs->intr_enable);
-                 */
-                intr_enable = 1;
+        /* re-init operational registers */
-                writel (0, &ehci->regs->segment);
+        writel(0, &ehci->regs->segment);
-                writel (ehci->periodic_dma, &ehci->regs->frame_list);
+        writel(ehci->periodic_dma, &ehci->regs->frame_list);
-                writel ((u32)ehci->async->qh_dma, &ehci->regs->async_next);
+        writel((u32) ehci->async->qh_dma, &ehci->regs->async_next);
-        } else
-                intr_enable = 0;
-        ehci_dbg(ehci, "resume root hub%s\n",
-                        intr_enable ? " after power loss" : "");
        /* restore CMD_RUN, framelist size, and irq threshold */
        writel (ehci->command, &ehci->regs->command);
-        /* take ports out of suspend */
+        /* manually resume the ports we suspended during bus_suspend() */
        i = HCS_N_PORTS (ehci->hcs_params);
        while (i--) {
                temp = readl (&ehci->regs->port_status [i]);
                temp &= ~(PORT_RWC_BITS
                        | PORT_WKOC_E | PORT_WKDISC_E | PORT_WKCONN_E);
-                if (temp & PORT_SUSPEND) {
+                if (test_bit(i, &ehci->bus_suspended) &&
+                                (temp & PORT_SUSPEND)) {
                        ehci->reset_done [i] = jiffies + msecs_to_jiffies (20);
                        temp |= PORT_RESUME;
                }
@@ -134,11 +151,12 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
        mdelay (20);
        while (i--) {
                temp = readl (&ehci->regs->port_status [i]);
-                if ((temp & PORT_SUSPEND) == 0)
+                if (test_bit(i, &ehci->bus_suspended) &&
-                        continue;
+                                (temp & PORT_SUSPEND)) {
-                temp &= ~(PORT_RWC_BITS | PORT_RESUME);
+                        temp &= ~(PORT_RWC_BITS | PORT_RESUME);
-                writel (temp, &ehci->regs->port_status [i]);
+                        writel (temp, &ehci->regs->port_status [i]);
-                ehci_vdbg (ehci, "resumed port %d\n", i + 1);
+                        ehci_vdbg (ehci, "resumed port %d\n", i + 1);
+                }
        }
        (void) readl (&ehci->regs->command);
@@ -157,8 +175,7 @@ static int ehci_bus_resume (struct usb_hcd *hcd)
        hcd->state = HC_STATE_RUNNING;
        /* Now we can safely re-enable irqs */
-        if (intr_enable)
+        writel(INTR_MASK, &ehci->regs->intr_enable);
-                writel (INTR_MASK, &ehci->regs->intr_enable);
        spin_unlock_irq (&ehci->lock);
        return 0;
@@ -218,6 +235,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
 {
        struct ehci_hcd *ehci = hcd_to_ehci (hcd);
        u32             temp, status = 0;
+        u32             mask;
        int             ports, i, retval = 1;
        unsigned long   flags;
@@ -233,6 +251,18 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
                retval++;
        }
+        /* Some boards (mostly VIA?) report bogus overcurrent indications,
+         * causing massive log spam unless we completely ignore them.  It
+         * may be relevant that VIA VT8235 controlers, where PORT_POWER is
+         * always set, seem to clear PORT_OCC and PORT_CSC when writing to
+         * PORT_POWER; that's surprising, but maybe within-spec.
+         */
+        if (!ignore_oc)
+                mask = PORT_CSC | PORT_PEC | PORT_OCC;
+        else
+                mask = PORT_CSC | PORT_PEC;
+        // PORT_RESUME from hardware ~= PORT_STAT_C_SUSPEND
        /* no hub change reports (bit 0) for now (power, ...) */
        /* port N changes (bit N)? */
@@ -250,8 +280,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
                }
                if (!(temp & PORT_CONNECT))
                        ehci->reset_done [i] = 0;
-                if ((temp & (PORT_CSC | PORT_PEC | PORT_OCC)) != 0
+                if ((temp & mask) != 0
-                                // PORT_STAT_C_SUSPEND?
                                || ((temp & PORT_RESUME) != 0
                                        && time_after (jiffies,
                                                ehci->reset_done [i]))) {
@@ -319,6 +348,7 @@ static int ehci_hub_control (
        u32             temp, status;
        unsigned long   flags;
        int             retval = 0;
+        unsigned        selector;
        /*
         * FIXME:  support SetPortFeatures USB_PORT_FEAT_INDICATOR.
@@ -417,7 +447,7 @@ static int ehci_hub_control (
                        status |= 1 << USB_PORT_FEAT_C_CONNECTION;
                if (temp & PORT_PEC)
                        status |= 1 << USB_PORT_FEAT_C_ENABLE;
-                if (temp & PORT_OCC)
+                if ((temp & PORT_OCC) && !ignore_oc)
                        status |= 1 << USB_PORT_FEAT_C_OVER_CURRENT;
                /* whoever resumes must GetPortStatus to complete it!! */
@@ -506,6 +536,8 @@ static int ehci_hub_control (
                }
                break;
        case SetPortFeature:
+                selector = wIndex >> 8;
+                wIndex &= 0xff;
                if (!wIndex || wIndex > ports)
                        goto error;
                wIndex--;
@@ -559,6 +591,22 @@ static int ehci_hub_control (
                        }
                        writel (temp, &ehci->regs->port_status [wIndex]);
                        break;
+                /* For downstream facing ports (these):  one hub port is put
+                 * into test mode according to USB2 11.24.2.13, then the hub
+                 * must be reset (which for root hub now means rmmod+modprobe,
+                 * or else system reboot).  See EHCI 2.3.9 and 4.14 for info
+                 * about the EHCI-specific stuff.
+                 */
+                case USB_PORT_FEAT_TEST:
+                        if (!selector || selector > 5)
+                                goto error;
+                        ehci_quiesce(ehci);
+                        ehci_halt(ehci);
+                        temp |= selector << 16;
+                        writel (temp, &ehci->regs->port_status [wIndex]);
+                        break;
                default:
                        goto error;
                }
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index e51c1ed81ac4..4bc7970ba3ef 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -257,9 +257,7 @@ static int ehci_pci_suspend(struct usb_hcd *hcd, pm_message_t message)
 static int ehci_pci_resume(struct usb_hcd *hcd)
 {
        struct ehci_hcd         *ehci = hcd_to_ehci(hcd);
-        unsigned                port;
        struct pci_dev          *pdev = to_pci_dev(hcd->self.controller);
-        int                     retval = -EINVAL;
        // maybe restore FLADJ
@@ -269,27 +267,19 @@ static int ehci_pci_resume(struct usb_hcd *hcd)
        /* Mark hardware accessible again as we are out of D3 state by now */
        set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-        /* If CF is clear, we lost PCI Vaux power and need to restart.  */
+        /* If CF is still set, we maintained PCI Vaux power.
-        if (readl(&ehci->regs->configured_flag) != FLAG_CF)
+         * Just undo the effect of ehci_pci_suspend().
-                goto restart;
-        /* If any port is suspended (or owned by the companion),
-         * we know we can/must resume the HC (and mustn't reset it).
-         * We just defer that to the root hub code.
         */
-        for (port = HCS_N_PORTS(ehci->hcs_params); port > 0; ) {
+        if (readl(&ehci->regs->configured_flag) == FLAG_CF) {
-                u32     status;
+                int     mask = INTR_MASK;
-                port--;
-                status = readl(&ehci->regs->port_status [port]);
+                if (!device_may_wakeup(&hcd->self.root_hub->dev))
-                if (!(status & PORT_POWER))
+                        mask &= ~STS_PCD;
-                        continue;
+                writel(mask, &ehci->regs->intr_enable);
-                if (status & (PORT_SUSPEND | PORT_RESUME | PORT_OWNER)) {
+                readl(&ehci->regs->intr_enable);
-                        usb_hcd_resume_root_hub(hcd);
+                return 0;
-                        return 0;
-                }
        }
-restart:
        ehci_dbg(ehci, "lost power, restarting\n");
        usb_root_hub_lost_power(hcd->self.root_hub);
@@ -307,13 +297,15 @@ restart:
        ehci_work(ehci);
        spin_unlock_irq(&ehci->lock);
-        /* restart; khubd will disconnect devices */
-        retval = ehci_run(hcd);
        /* here we "know" root ports should always stay powered */
        ehci_port_power(ehci, 1);
-        return retval;
+        writel(ehci->command, &ehci->regs->command);
+        writel(FLAG_CF, &ehci->regs->configured_flag);
+        readl(&ehci->regs->command);    /* unblock posted writes */
+        hcd->state = HC_STATE_SUSPENDED;
+        return 0;
 }
 #endif
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index bbc3082a73d7..74dbc6c8228f 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -74,6 +74,7 @@ struct ehci_hcd {			/* one per controller */
        /* per root hub port */
        unsigned long           reset_done [EHCI_MAX_ROOT_PORTS];
+        unsigned long           bus_suspended;
        /* per-HC memory pools (could be per-bus, but ...) */
        struct dma_pool         *qh_pool;       /* qh per active urb */
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index ea4714e557e4..a95275a401b1 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -729,6 +729,16 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
                ohci->next_statechange = jiffies + STATECHANGE_DELAY;
                ohci_writel(ohci, OHCI_INTR_RD | OHCI_INTR_RHSC,
                                &regs->intrstatus);
+                /* NOTE: Vendors didn't always make the same implementation
+                 * choices for RHSC.  Many followed the spec; RHSC triggers
+                 * on an edge, like setting and maybe clearing a port status
+                 * change bit.  With others it's level-triggered, active
+                 * until khubd clears all the port status change bits.  We'll
+                 * always disable it here and rely on polling until khubd
+                 * re-enables it.
+                 */
+                ohci_writel(ohci, OHCI_INTR_RHSC, &regs->intrdisable);
                usb_hcd_poll_rh_status(hcd);
        }
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 6995ea36f2e8..2441642cb7b4 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -41,7 +41,11 @@ static void ohci_rhsc_enable (struct usb_hcd *hcd)
 {
        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
-        ohci_writel (ohci, OHCI_INTR_RHSC, &ohci->regs->intrenable);
+        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 \
@@ -50,6 +54,9 @@ static void ohci_rhsc_enable (struct usb_hcd *hcd)
 static void dl_done_list (struct ohci_hcd *);
 static void finish_unlinks (struct ohci_hcd *, u16);
+#ifdef  CONFIG_PM
+static int ohci_restart(struct ohci_hcd *ohci);
 static int ohci_rh_suspend (struct ohci_hcd *ohci, int autostop)
 __releases(ohci->lock)
 __acquires(ohci->lock)
@@ -132,8 +139,6 @@ static inline struct ed *find_head (struct ed *ed)
        return ed;
 }
-static int ohci_restart (struct ohci_hcd *ohci);
 /* caller has locked the root hub */
 static int ohci_rh_resume (struct ohci_hcd *ohci)
 __releases(ohci->lock)
@@ -169,7 +174,7 @@ __acquires(ohci->lock)
                break;
        case OHCI_USB_RESUME:
                /* HCFS changes sometime after INTR_RD */
-                ohci_info(ohci, "%swakeup\n",
+                ohci_dbg(ohci, "%swakeup root hub\n",
                                autostopped ? "auto-" : "");
                break;
        case OHCI_USB_OPER:
@@ -181,7 +186,6 @@ __acquires(ohci->lock)
                ohci_dbg (ohci, "lost power\n");
                status = -EBUSY;
        }
-#ifdef  CONFIG_PM
        if (status == -EBUSY) {
                if (!autostopped) {
                        spin_unlock_irq (&ohci->lock);
@@ -191,25 +195,12 @@ __acquires(ohci->lock)
                }
                return status;
        }
-#endif
        if (status != -EINPROGRESS)
                return status;
        if (autostopped)
                goto skip_resume;
        spin_unlock_irq (&ohci->lock);
-        temp = ohci->num_ports;
-        while (temp--) {
-                u32 stat = ohci_readl (ohci,
-                                       &ohci->regs->roothub.portstatus [temp]);
-                /* force global, not selective, resume */
-                if (!(stat & RH_PS_PSS))
-                        continue;
-                ohci_writel (ohci, RH_PS_POCI,
-                                &ohci->regs->roothub.portstatus [temp]);
-        }
        /* Some controllers (lucent erratum) need extra-long delays */
        msleep (20 /* usb 11.5.1.10 */ + 12 /* 32 msec counter */ + 1);
@@ -217,6 +208,7 @@ __acquires(ohci->lock)
        temp &= OHCI_CTRL_HCFS;
        if (temp != OHCI_USB_RESUME) {
                ohci_err (ohci, "controller won't resume\n");
+                spin_lock_irq(&ohci->lock);
                return -EBUSY;
        }
@@ -296,8 +288,6 @@ skip_resume:
        return 0;
 }
-#ifdef  CONFIG_PM
 static int ohci_bus_suspend (struct usb_hcd *hcd)
 {
        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
@@ -335,6 +325,83 @@ static int ohci_bus_resume (struct usb_hcd *hcd)
        return rc;
 }
+/* Carry out polling-, autostop-, and autoresume-related state changes */
+static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
+                int any_connected)
+{
+        int     poll_rh = 1;
+        switch (ohci->hc_control & OHCI_CTRL_HCFS) {
+        case OHCI_USB_OPER:
+                /* keep on polling until we know a device is connected
+                 * and RHSC is enabled */
+                if (!ohci->autostop) {
+                        if (any_connected ||
+                                        !device_may_wakeup(&ohci_to_hcd(ohci)
+                                                ->self.root_hub->dev)) {
+                                if (ohci_readl(ohci, &ohci->regs->intrenable) &
+                                                OHCI_INTR_RHSC)
+                                        poll_rh = 0;
+                        } else {
+                                ohci->autostop = 1;
+                                ohci->next_statechange = jiffies + HZ;
+                        }
+                /* if no devices have been attached for one second, autostop */
+                } else {
+                        if (changed || any_connected) {
+                                ohci->autostop = 0;
+                                ohci->next_statechange = jiffies +
+                                                STATECHANGE_DELAY;
+                        } else if (time_after_eq(jiffies,
+                                                ohci->next_statechange)
+                                        && !ohci->ed_rm_list
+                                        && !(ohci->hc_control &
+                                                OHCI_SCHED_ENABLES)) {
+                                ohci_rh_suspend(ohci, 1);
+                        }
+                }
+                break;
+        /* if there is a port change, autostart or ask to be resumed */
+        case OHCI_USB_SUSPEND:
+        case OHCI_USB_RESUME:
+                if (changed) {
+                        if (ohci->autostop)
+                                ohci_rh_resume(ohci);
+                        else
+                                usb_hcd_resume_root_hub(ohci_to_hcd(ohci));
+                } else {
+                        /* everything is idle, no need for polling */
+                        poll_rh = 0;
+                }
+                break;
+        }
+        return poll_rh;
+}
+#else   /* CONFIG_PM */
+static inline int ohci_rh_resume(struct ohci_hcd *ohci)
+{
+        return 0;
+}
+/* Carry out polling-related state changes.
+ * autostop isn't used when CONFIG_PM is turned off.
+ */
+static int ohci_root_hub_state_changes(struct ohci_hcd *ohci, int changed,
+                int any_connected)
+{
+        int     poll_rh = 1;
+        /* keep on polling until RHSC is enabled */
+        if (ohci_readl(ohci, &ohci->regs->intrenable) & OHCI_INTR_RHSC)
+                poll_rh = 0;
+        return poll_rh;
+}
 #endif  /* CONFIG_PM */
 /*-------------------------------------------------------------------------*/
@@ -346,7 +413,7 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf)
 {
        struct ohci_hcd *ohci = hcd_to_ohci (hcd);
        int             i, changed = 0, length = 1;
-        int             any_connected = 0, rhsc_enabled = 1;
+        int             any_connected = 0;
        unsigned long   flags;
        spin_lock_irqsave (&ohci->lock, flags);
@@ -387,67 +454,8 @@ ohci_hub_status_data (struct usb_hcd *hcd, char *buf)
                }
        }
-        /* NOTE:  vendors didn't always make the same implementation
+        hcd->poll_rh = ohci_root_hub_state_changes(ohci, changed,
-         * choices for RHSC.  Sometimes it triggers on an edge (like
+                        any_connected);
-         * setting and maybe clearing a port status change bit); and
-         * it's level-triggered on other silicon, active until khubd
-         * clears all active port status change bits.  If it's still
-         * set (level-triggered) we must disable it and rely on
-         * polling until khubd re-enables it.
-         */
-        if (ohci_readl (ohci, &ohci->regs->intrstatus) & OHCI_INTR_RHSC) {
-                ohci_writel (ohci, OHCI_INTR_RHSC, &ohci->regs->intrdisable);
-                (void) ohci_readl (ohci, &ohci->regs->intrdisable);
-                rhsc_enabled = 0;
-        }
-        hcd->poll_rh = 1;
-        /* carry out appropriate state changes */
-        switch (ohci->hc_control & OHCI_CTRL_HCFS) {
-        case OHCI_USB_OPER:
-                /* keep on polling until we know a device is connected
-                 * and RHSC is enabled */
-                if (!ohci->autostop) {
-                        if (any_connected) {
-                                if (rhsc_enabled)
-                                        hcd->poll_rh = 0;
-                        } else {
-                                ohci->autostop = 1;
-                                ohci->next_statechange = jiffies + HZ;
-                        }
-                /* if no devices have been attached for one second, autostop */
-                } else {
-                        if (changed || any_connected) {
-                                ohci->autostop = 0;
-                                ohci->next_statechange = jiffies +
-                                                STATECHANGE_DELAY;
-                        } else if (device_may_wakeup(&hcd->self.root_hub->dev)
-                                        && time_after_eq(jiffies,
-                                                ohci->next_statechange)
-                                        && !ohci->ed_rm_list
-                                        && !(ohci->hc_control &
-                                                OHCI_SCHED_ENABLES)) {
-                                ohci_rh_suspend (ohci, 1);
-                        }
-                }
-                break;
-        /* if there is a port change, autostart or ask to be resumed */
-        case OHCI_USB_SUSPEND:
-        case OHCI_USB_RESUME:
-                if (changed) {
-                        if (ohci->autostop)
-                                ohci_rh_resume (ohci);
-                        else
-                                usb_hcd_resume_root_hub (hcd);
-                } else {
-                        /* everything is idle, no need for polling */
-                        hcd->poll_rh = 0;
-                }
-                break;
-        }
 done:
        spin_unlock_irqrestore (&ohci->lock, flags);
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 32c635ecbf31..ef54e310bfc4 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -71,7 +71,7 @@ static int distrust_firmware = 1;
 module_param(distrust_firmware, bool, 0);
 MODULE_PARM_DESC(distrust_firmware, "true to distrust firmware power/overcurren"
        "t setup");
-DECLARE_WAIT_QUEUE_HEAD(u132_hcd_wait);
+static DECLARE_WAIT_QUEUE_HEAD(u132_hcd_wait);
 /*
 * u132_module_lock exists to protect access to global variables
 *
@@ -205,13 +205,9 @@ struct u132 {
        struct u132_port port[MAX_U132_PORTS];
        struct u132_endp *endp[MAX_U132_ENDPS];
 };
-int usb_ftdi_elan_read_reg(struct platform_device *pdev, u32 *data);
-int usb_ftdi_elan_read_pcimem(struct platform_device *pdev, u8 addressofs,
-        u8 width, u32 *data);
-int usb_ftdi_elan_write_pcimem(struct platform_device *pdev, u8 addressofs,
-        u8 width, u32 data);
 /*
-* these can not be inlines because we need the structure offset!!
+* these cannot be inlines because we need the structure offset!!
 * Does anyone have a better way?????
 */
 #define u132_read_pcimem(u132, member, data) \
@@ -3045,7 +3041,7 @@ static struct hc_driver u132_hc_driver = {
 * This function may be called by the USB core whilst the "usb_all_devices_rwsem"
 * is held for writing, thus this module must not call usb_remove_hcd()
 * synchronously - but instead should immediately stop activity to the
-* device and ansynchronously call usb_remove_hcd()
+* device and asynchronously call usb_remove_hcd()
 */
 static int __devexit u132_remove(struct platform_device *pdev)
 {
@@ -3241,7 +3237,7 @@ static int u132_resume(struct platform_device *pdev)
 #define u132_resume NULL
 #endif
 /*
-* this driver is loaded explicitely by ftdi_u132
+* this driver is loaded explicitly by ftdi_u132
 *
 * the platform_driver struct is static because it is per type of module
 */
diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 3038ed0700d3..8ccddf74534a 100644
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -796,7 +796,7 @@ static int mts_usb_probe(struct usb_interface *intf,
        new_desc->context.scsi_status = kmalloc(1, GFP_KERNEL);
        if (!new_desc->context.scsi_status)
-                goto out_kfree2;
+                goto out_free_urb;
        new_desc->usb_dev = dev;
        new_desc->usb_intf = intf;
@@ -822,18 +822,20 @@ static int mts_usb_probe(struct usb_interface *intf,
        new_desc->host = scsi_host_alloc(&mts_scsi_host_template,
                        sizeof(new_desc));
        if (!new_desc->host)
-                goto out_free_urb;
+                goto out_kfree2;
        new_desc->host->hostdata[0] = (unsigned long)new_desc;
        if (scsi_add_host(new_desc->host, NULL)) {
                err_retval = -EIO;
-                goto out_free_urb;
+                goto out_host_put;
        }
        scsi_scan_host(new_desc->host);
        usb_set_intfdata(intf, new_desc);
        return 0;
+ out_host_put:
+        scsi_host_put(new_desc->host);
 out_kfree2:
        kfree(new_desc->context.scsi_status);
 out_free_urb:
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 20db36448ab3..661af7aa6236 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -221,6 +221,7 @@ config USB_TOUCHSCREEN
          - ITM
          - some other eTurboTouch
          - Gunze AHL61
+          - DMC TSC-10/25
          Have a look at <http://linux.chapter7.ch/touchkit/> for
          a usage description and the required user-space stuff.
@@ -258,6 +259,11 @@ config USB_TOUCHSCREEN_GUNZE
        bool "Gunze AHL61 device support" if EMBEDDED
        depends on USB_TOUCHSCREEN
+config USB_TOUCHSCREEN_DMC_TSC10
+        default y
+        bool "DMC TSC-10/25 device support" if EMBEDDED
+        depends on USB_TOUCHSCREEN
 config USB_YEALINK
        tristate "Yealink usb-p1k voip phone"
        depends on USB && INPUT && EXPERIMENTAL
diff --git a/drivers/usb/input/ati_remote.c b/drivers/usb/input/ati_remote.c
index 787b847d38cc..ff23318dc301 100644
--- a/drivers/usb/input/ati_remote.c
+++ b/drivers/usb/input/ati_remote.c
@@ -630,11 +630,8 @@ static int ati_remote_alloc_buffers(struct usb_device *udev,
 */
 static void ati_remote_free_buffers(struct ati_remote *ati_remote)
 {
-        if (ati_remote->irq_urb)
+        usb_free_urb(ati_remote->irq_urb);
-                usb_free_urb(ati_remote->irq_urb);
+        usb_free_urb(ati_remote->out_urb);
-        if (ati_remote->out_urb)
-                usb_free_urb(ati_remote->out_urb);
        usb_buffer_free(ati_remote->udev, DATA_BUFSIZE,
                ati_remote->inbuf, ati_remote->inbuf_dma);
diff --git a/drivers/usb/input/ati_remote2.c b/drivers/usb/input/ati_remote2.c
index f982a2b4a7f9..83f1f79db7c7 100644
--- a/drivers/usb/input/ati_remote2.c
+++ b/drivers/usb/input/ati_remote2.c
@@ -372,8 +372,7 @@ static void ati_remote2_urb_cleanup(struct ati_remote2 *ar2)
        int i;
        for (i = 0; i < 2; i++) {
-                if (ar2->urb[i])
+                usb_free_urb(ar2->urb[i]);
-                        usb_free_urb(ar2->urb[i]);
                if (ar2->buf[i])
                        usb_buffer_free(ar2->udev, 4, ar2->buf[i], ar2->buf_dma[i]);
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 6d08a3bcc952..a49644b7c58e 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -968,20 +968,29 @@ static void hid_retry_timeout(unsigned long _hid)
                hid_io_error(hid);
 }
-/* Workqueue routine to reset the device */
+/* Workqueue routine to reset the device or clear a halt */
 static void hid_reset(void *_hid)
 {
        struct hid_device *hid = (struct hid_device *) _hid;
-        int rc_lock, rc;
+        int rc_lock, rc = 0;
-        dev_dbg(&hid->intf->dev, "resetting device\n");
+        if (test_bit(HID_CLEAR_HALT, &hid->iofl)) {
-        rc = rc_lock = usb_lock_device_for_reset(hid->dev, hid->intf);
+                dev_dbg(&hid->intf->dev, "clear halt\n");
-        if (rc_lock >= 0) {
+                rc = usb_clear_halt(hid->dev, hid->urbin->pipe);
-                rc = usb_reset_composite_device(hid->dev, hid->intf);
+                clear_bit(HID_CLEAR_HALT, &hid->iofl);
-                if (rc_lock)
+                hid_start_in(hid);
-                        usb_unlock_device(hid->dev);
+        }
+        else if (test_bit(HID_RESET_PENDING, &hid->iofl)) {
+                dev_dbg(&hid->intf->dev, "resetting device\n");
+                rc = rc_lock = usb_lock_device_for_reset(hid->dev, hid->intf);
+                if (rc_lock >= 0) {
+                        rc = usb_reset_composite_device(hid->dev, hid->intf);
+                        if (rc_lock)
+                                usb_unlock_device(hid->dev);
+                }
+                clear_bit(HID_RESET_PENDING, &hid->iofl);
        }
-        clear_bit(HID_RESET_PENDING, &hid->iofl);
        switch (rc) {
        case 0:
@@ -1023,9 +1032,8 @@ static void hid_io_error(struct hid_device *hid)
                /* Retries failed, so do a port reset */
                if (!test_and_set_bit(HID_RESET_PENDING, &hid->iofl)) {
-                        if (schedule_work(&hid->reset_work))
+                        schedule_work(&hid->reset_work);
-                                goto done;
+                        goto done;
-                        clear_bit(HID_RESET_PENDING, &hid->iofl);
                }
        }
@@ -1049,6 +1057,11 @@ static void hid_irq_in(struct urb *urb)
                        hid->retry_delay = 0;
                        hid_input_report(HID_INPUT_REPORT, urb, 1);
                        break;
+                case -EPIPE:            /* stall */
+                        clear_bit(HID_IN_RUNNING, &hid->iofl);
+                        set_bit(HID_CLEAR_HALT, &hid->iofl);
+                        schedule_work(&hid->reset_work);
+                        return;
                case -ECONNRESET:       /* unlink */
                case -ENOENT:
                case -ESHUTDOWN:        /* unplug */
@@ -1627,6 +1640,19 @@ void hid_init_reports(struct hid_device *hid)
 #define USB_VENDOR_ID_APPLE             0x05ac
 #define USB_DEVICE_ID_APPLE_MIGHTYMOUSE 0x0304
+#define USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI       0x020e
+#define USB_DEVICE_ID_APPLE_FOUNTAIN_ISO        0x020f
+#define USB_DEVICE_ID_APPLE_GEYSER_ANSI 0x0214
+#define USB_DEVICE_ID_APPLE_GEYSER_ISO  0x0215
+#define USB_DEVICE_ID_APPLE_GEYSER_JIS  0x0216
+#define USB_DEVICE_ID_APPLE_GEYSER3_ANSI        0x0217
+#define USB_DEVICE_ID_APPLE_GEYSER3_ISO 0x0218
+#define USB_DEVICE_ID_APPLE_GEYSER3_JIS 0x0219
+#define USB_DEVICE_ID_APPLE_GEYSER4_ANSI        0x021a
+#define USB_DEVICE_ID_APPLE_GEYSER4_ISO 0x021b
+#define USB_DEVICE_ID_APPLE_GEYSER4_JIS 0x021c
+#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY    0x030a
+#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY     0x030b
 #define USB_VENDOR_ID_CHERRY            0x046a
 #define USB_DEVICE_ID_CHERRY_CYMOTION   0x0023
@@ -1794,17 +1820,19 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_CHERRY, USB_DEVICE_ID_CHERRY_CYMOTION, HID_QUIRK_CYMOTION },
-        { USB_VENDOR_ID_APPLE, 0x020E, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, 0x020F, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ISO, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, 0x0214, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, 0x0215, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
-        { USB_VENDOR_ID_APPLE, 0x0216, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER_JIS, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, 0x0217, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, 0x0218, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
-        { USB_VENDOR_ID_APPLE, 0x0219, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, 0x021B, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, 0x030A, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, 0x030B, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },
        { USB_VENDOR_ID_PANJIT, 0x0001, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_PANJIT, 0x0002, HID_QUIRK_IGNORE },
@@ -1985,7 +2013,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
                if (hid->collection->usage == HID_GD_MOUSE && hid_mousepoll_interval > 0)
                        interval = hid_mousepoll_interval;
-                if (endpoint->bEndpointAddress & USB_DIR_IN) {
+                if (usb_endpoint_dir_in(endpoint)) {
                        if (hid->urbin)
                                continue;
                        if (!(hid->urbin = usb_alloc_urb(0, GFP_KERNEL)))
@@ -2067,13 +2095,9 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
        return hid;
 fail:
+        usb_free_urb(hid->urbin);
-        if (hid->urbin)
+        usb_free_urb(hid->urbout);
-                usb_free_urb(hid->urbin);
+        usb_free_urb(hid->urbctrl);
-        if (hid->urbout)
-                usb_free_urb(hid->urbout);
-        if (hid->urbctrl)
-                usb_free_urb(hid->urbctrl);
        hid_free_buffers(dev, hid);
        hid_free_device(hid);
@@ -2104,8 +2128,7 @@ static void hid_disconnect(struct usb_interface *intf)
        usb_free_urb(hid->urbin);
        usb_free_urb(hid->urbctrl);
-        if (hid->urbout)
+        usb_free_urb(hid->urbout);
-                usb_free_urb(hid->urbout);
        hid_free_buffers(hid->dev, hid);
        hid_free_device(hid);
diff --git a/drivers/usb/input/hid.h b/drivers/usb/input/hid.h
index 0e76e6dcac37..2a9bf07944c0 100644
--- a/drivers/usb/input/hid.h
+++ b/drivers/usb/input/hid.h
@@ -385,6 +385,7 @@ struct hid_control_fifo {
 #define HID_IN_RUNNING          3
 #define HID_RESET_PENDING       4
 #define HID_SUSPENDED           5
+#define HID_CLEAR_HALT          6
 struct hid_input {
        struct list_head list;
diff --git a/drivers/usb/input/usbkbd.c b/drivers/usb/input/usbkbd.c
index c73285cf8558..dac88640eab6 100644
--- a/drivers/usb/input/usbkbd.c
+++ b/drivers/usb/input/usbkbd.c
@@ -208,10 +208,8 @@ static int usb_kbd_alloc_mem(struct usb_device *dev, struct usb_kbd *kbd)
 static void usb_kbd_free_mem(struct usb_device *dev, struct usb_kbd *kbd)
 {
-        if (kbd->irq)
+        usb_free_urb(kbd->irq);
-                usb_free_urb(kbd->irq);
+        usb_free_urb(kbd->led);
-        if (kbd->led)
-                usb_free_urb(kbd->led);
        if (kbd->new)
                usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);
        if (kbd->cr)
@@ -236,9 +234,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
                return -ENODEV;
        endpoint = &interface->endpoint[0].desc;
-        if (!(endpoint->bEndpointAddress & USB_DIR_IN))
+        if (!usb_endpoint_is_int_in(endpoint))
-                return -ENODEV;
-        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT)
                return -ENODEV;
        pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
diff --git a/drivers/usb/input/usbmouse.c b/drivers/usb/input/usbmouse.c
index cbbbea332ed7..68a55642c082 100644
--- a/drivers/usb/input/usbmouse.c
+++ b/drivers/usb/input/usbmouse.c
@@ -126,9 +126,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
                return -ENODEV;
        endpoint = &interface->endpoint[0].desc;
-        if (!(endpoint->bEndpointAddress & USB_DIR_IN))
+        if (!usb_endpoint_is_int_in(endpoint))
-                return -ENODEV;
-        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT)
                return -ENODEV;
        pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index 933ceddf3dee..49704d4ed0e2 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -8,6 +8,7 @@
 *  - PanJit TouchSet
 *  - eTurboTouch
 *  - Gunze AHL61
+ *  - DMC TSC-10/25
 *
 * Copyright (C) 2004-2006 by Daniel Ritz <daniel.ritz@gmx.ch>
 * Copyright (C) by Todd E. Johnson (mtouchusb.c)
@@ -30,6 +31,8 @@
 * - ITM parts are from itmtouch.c
 * - 3M parts are from mtouchusb.c
 * - PanJit parts are from an unmerged driver by Lanslott Gish
+ * - DMC TSC 10/25 are from Holger Schurig, with ideas from an unmerged
+ *   driver from Marius Vollmer
 *
 *****************************************************************************/
@@ -44,7 +47,7 @@
 #include <linux/usb/input.h>
-#define DRIVER_VERSION          "v0.4"
+#define DRIVER_VERSION          "v0.5"
 #define DRIVER_AUTHOR           "Daniel Ritz <daniel.ritz@gmx.ch>"
 #define DRIVER_DESC             "USB Touchscreen Driver"
@@ -103,6 +106,7 @@ enum {
        DEVTYPE_ITM,
        DEVTYPE_ETURBO,
        DEVTYPE_GUNZE,
+        DEVTYPE_DMC_TSC10,
 };
 static struct usb_device_id usbtouch_devices[] = {
@@ -139,6 +143,10 @@ static struct usb_device_id usbtouch_devices[] = {
        {USB_DEVICE(0x0637, 0x0001), .driver_info = DEVTYPE_GUNZE},
 #endif
+#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10
+        {USB_DEVICE(0x0afa, 0x03e8), .driver_info = DEVTYPE_DMC_TSC10},
+#endif
        {}
 };
@@ -313,6 +321,80 @@ static int gunze_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *
 #endif
 /*****************************************************************************
+ * DMC TSC-10/25 Part
+ *
+ * Documentation about the controller and it's protocol can be found at
+ *   http://www.dmccoltd.com/files/controler/tsc10usb_pi_e.pdf
+ *   http://www.dmccoltd.com/files/controler/tsc25_usb_e.pdf
+ */
+#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10
+/* supported data rates. currently using 130 */
+#define TSC10_RATE_POINT        0x50
+#define TSC10_RATE_30           0x40
+#define TSC10_RATE_50           0x41
+#define TSC10_RATE_80           0x42
+#define TSC10_RATE_100          0x43
+#define TSC10_RATE_130          0x44
+#define TSC10_RATE_150          0x45
+/* commands */
+#define TSC10_CMD_RESET         0x55
+#define TSC10_CMD_RATE          0x05
+#define TSC10_CMD_DATA1         0x01
+static int dmc_tsc10_init(struct usbtouch_usb *usbtouch)
+{
+        struct usb_device *dev = usbtouch->udev;
+        int ret;
+        unsigned char buf[2];
+        /* reset */
+        buf[0] = buf[1] = 0xFF;
+        ret = usb_control_msg(dev, usb_rcvctrlpipe (dev, 0),
+                              TSC10_CMD_RESET,
+                              USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              0, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
+        if (ret < 0)
+                return ret;
+        if (buf[0] != 0x06 || buf[1] != 0x00)
+                return -ENODEV;
+        /* set coordinate output rate */
+        buf[0] = buf[1] = 0xFF;
+        ret = usb_control_msg(dev, usb_rcvctrlpipe (dev, 0),
+                              TSC10_CMD_RATE,
+                              USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              TSC10_RATE_150, 0, buf, 2, USB_CTRL_SET_TIMEOUT);
+        if (ret < 0)
+                return ret;
+        if (buf[0] != 0x06 || buf[1] != 0x00)
+                return -ENODEV;
+        /* start sending data */
+        ret = usb_control_msg(dev, usb_rcvctrlpipe (dev, 0),
+                              TSC10_CMD_DATA1,
+                              USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
+                              0, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
+        if (ret < 0)
+                return ret;
+        return 0;
+}
+static int dmc_tsc10_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
+{
+        *x = ((pkt[2] & 0x03) << 8) | pkt[1];
+        *y = ((pkt[4] & 0x03) << 8) | pkt[3];
+        *touch = pkt[0] & 0x01;
+        return 1;
+}
+#endif
+/*****************************************************************************
 * the different device descriptors
 */
 static struct usbtouch_device_info usbtouch_dev_info[] = {
@@ -389,6 +471,18 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
                .read_data      = gunze_read_data,
        },
 #endif
+#ifdef CONFIG_USB_TOUCHSCREEN_DMC_TSC10
+        [DEVTYPE_DMC_TSC10] = {
+                .min_xc         = 0x0,
+                .max_xc         = 0x03ff,
+                .min_yc         = 0x0,
+                .max_yc         = 0x03ff,
+                .rept_size      = 5,
+                .init           = dmc_tsc10_init,
+                .read_data      = dmc_tsc10_read_data,
+        },
+#endif
 };
diff --git a/drivers/usb/input/wacom.h b/drivers/usb/input/wacom.h
index 1cf08f02c50e..d85abfc5ab58 100644
--- a/drivers/usb/input/wacom.h
+++ b/drivers/usb/input/wacom.h
@@ -110,7 +110,6 @@ struct wacom_combo {
 };
 extern int wacom_wac_irq(struct wacom_wac * wacom_wac, void * wcombo);
-extern void wacom_sys_irq(struct urb *urb);
 extern void wacom_report_abs(void *wcombo, unsigned int abs_type, int abs_data);
 extern void wacom_report_rel(void *wcombo, unsigned int rel_type, int rel_data);
 extern void wacom_report_key(void *wcombo, unsigned int key_type, int key_data);
diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c
index 3498b893b53b..e7cc20ab8155 100644
--- a/drivers/usb/input/wacom_sys.c
+++ b/drivers/usb/input/wacom_sys.c
@@ -42,7 +42,7 @@ static struct input_dev * get_input_dev(struct wacom_combo *wcombo)
        return wcombo->wacom->dev;
 }
-void wacom_sys_irq(struct urb *urb)
+static void wacom_sys_irq(struct urb *urb)
 {
        struct wacom *wacom = urb->context;
        struct wacom_combo wcombo;
diff --git a/drivers/usb/input/yealink.c b/drivers/usb/input/yealink.c
index 905bf6398257..2268ca311ade 100644
--- a/drivers/usb/input/yealink.c
+++ b/drivers/usb/input/yealink.c
@@ -859,10 +859,8 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
        interface = intf->cur_altsetting;
        endpoint = &interface->endpoint[0].desc;
-        if (!(endpoint->bEndpointAddress & USB_DIR_IN))
+        if (!usb_endpoint_is_int_in(endpoint))
-                return -EIO;
+                return -ENODEV;
-        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_INT)
-                return -EIO;
        yld = kzalloc(sizeof(struct yealink_dev), GFP_KERNEL);
        if (!yld)
diff --git a/drivers/usb/misc/Makefile b/drivers/usb/misc/Makefile
index 11dc59540cda..2cba07d31971 100644
--- a/drivers/usb/misc/Makefile
+++ b/drivers/usb/misc/Makefile
@@ -4,6 +4,7 @@
 #
 obj-$(CONFIG_USB_ADUTUX)        += adutux.o
+obj-$(CONFIG_USB_APPLEDISPLAY)  += appledisplay.o
 obj-$(CONFIG_USB_AUERSWALD)     += auerswald.o
 obj-$(CONFIG_USB_CYPRESS_CY7C63)+= cypress_cy7c63.o
 obj-$(CONFIG_USB_CYTHERM)       += cytherm.o
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
index 6b23a1def9fe..ba30ca6a14aa 100644
--- a/drivers/usb/misc/appledisplay.c
+++ b/drivers/usb/misc/appledisplay.c
@@ -216,10 +216,7 @@ static int appledisplay_probe(struct usb_interface *iface,
        iface_desc = iface->cur_altsetting;
        for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
                endpoint = &iface_desc->endpoint[i].desc;
-                if (!int_in_endpointAddr &&
+                if (!int_in_endpointAddr && usb_endpoint_is_int_in(endpoint)) {
-                    (endpoint->bEndpointAddress & USB_DIR_IN) &&
-                    ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                     USB_ENDPOINT_XFER_INT)) {
                        /* we found an interrupt in endpoint */
                        int_in_endpointAddr = endpoint->bEndpointAddress;
                        break;
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index e4971d6aaafb..c703f73e1655 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -704,9 +704,7 @@ static void auerbuf_free (pauerbuf_t bp)
 {
        kfree(bp->bufp);
        kfree(bp->dr);
-        if (bp->urbp) {
+        usb_free_urb(bp->urbp);
-                usb_free_urb(bp->urbp);
-        }
        kfree(bp);
 }
@@ -1155,8 +1153,7 @@ static void auerswald_int_release (pauerswald_t cp)
        dbg ("auerswald_int_release");
        /* stop the int endpoint */
-        if (cp->inturbp)
+        usb_kill_urb (cp->inturbp);
-                usb_kill_urb (cp->inturbp);
        /* deallocate memory */
        auerswald_int_free (cp);
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index 1fd9cb85f4ca..5c0a26cbd128 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -53,13 +53,12 @@ static void __exit emi26_exit (void);
 static int emi26_writememory (struct usb_device *dev, int address, unsigned char *data, int length, __u8 request)
 {
        int result;
-        unsigned char *buffer =  kmalloc (length, GFP_KERNEL);
+        unsigned char *buffer =  kmemdup(data, length, GFP_KERNEL);
        if (!buffer) {
                err("emi26: kmalloc(%d) failed.", length);
                return -ENOMEM;
        }
-        memcpy (buffer, data, length);
        /* Note: usb_control_msg returns negative value on error or length of the
         *               data that was written! */
        result = usb_control_msg (dev, usb_sndctrlpipe(dev, 0), request, 0x40, address, 0, buffer, length, 300);
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index fe351371f274..23153eac0dfa 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -61,13 +61,12 @@ static void __exit emi62_exit (void);
 static int emi62_writememory (struct usb_device *dev, int address, unsigned char *data, int length, __u8 request)
 {
        int result;
-        unsigned char *buffer =  kmalloc (length, GFP_KERNEL);
+        unsigned char *buffer =  kmemdup(data, length, GFP_KERNEL);
        if (!buffer) {
                err("emi62: kmalloc(%d) failed.", length);
                return -ENOMEM;
        }
-        memcpy (buffer, data, length);
        /* Note: usb_control_msg returns negative value on error or length of the
         *               data that was written! */
        result = usb_control_msg (dev, usb_sndctrlpipe(dev, 0), request, 0x40, address, 0, buffer, length, 300);
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 9b591b8b9369..cb0ba3107d7f 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -303,7 +303,7 @@ void ftdi_elan_gone_away(struct platform_device *pdev)
 EXPORT_SYMBOL_GPL(ftdi_elan_gone_away);
-void ftdi_release_platform_dev(struct device *dev)
+static void ftdi_release_platform_dev(struct device *dev)
 {
        dev->parent = NULL;
 }
@@ -1426,14 +1426,6 @@ static int ftdi_elan_read_reg(struct usb_ftdi *ftdi, u32 *data)
        }
 }
-int usb_ftdi_elan_read_reg(struct platform_device *pdev, u32 *data)
-{
-        struct usb_ftdi *ftdi = platform_device_to_usb_ftdi(pdev);
-        return ftdi_elan_read_reg(ftdi, data);
-}
-EXPORT_SYMBOL_GPL(usb_ftdi_elan_read_reg);
 static int ftdi_elan_read_config(struct usb_ftdi *ftdi, int config_offset,
        u8 width, u32 *data)
 {
@@ -2633,10 +2625,7 @@ static int ftdi_elan_probe(struct usb_interface *interface,
        for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
                endpoint = &iface_desc->endpoint[i].desc;
                if (!ftdi->bulk_in_endpointAddr &&
-                        ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
+                    usb_endpoint_is_bulk_in(endpoint)) {
-                        == USB_DIR_IN) && ((endpoint->bmAttributes &
-                        USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK))
-                        {
                        buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
                        ftdi->bulk_in_size = buffer_size;
                        ftdi->bulk_in_endpointAddr = endpoint->bEndpointAddress;
@@ -2649,10 +2638,7 @@ static int ftdi_elan_probe(struct usb_interface *interface,
                        }
                }
                if (!ftdi->bulk_out_endpointAddr &&
-                        ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK)
+                    usb_endpoint_is_bulk_out(endpoint)) {
-                        == USB_DIR_OUT) && ((endpoint->bmAttributes &
-                        USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_BULK))
-                        {
                        ftdi->bulk_out_endpointAddr =
                                endpoint->bEndpointAddress;
                }
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c
index 8e6e195a22ba..c9418535bef8 100644
--- a/drivers/usb/misc/idmouse.c
+++ b/drivers/usb/misc/idmouse.c
@@ -125,12 +125,12 @@ static DEFINE_MUTEX(disconnect_mutex);
 static int idmouse_create_image(struct usb_idmouse *dev)
 {
-        int bytes_read = 0;
+        int bytes_read;
-        int bulk_read = 0;
+        int bulk_read;
-        int result = 0;
+        int result;
        memcpy(dev->bulk_in_buffer, HEADER, sizeof(HEADER)-1);
-        bytes_read += sizeof(HEADER)-1;
+        bytes_read = sizeof(HEADER)-1;
        /* reset the device and set a fast blink rate */
        result = ftip_command(dev, FTIP_RELEASE, 0, 0);
@@ -208,9 +208,9 @@ static inline void idmouse_delete(struct usb_idmouse *dev)
 static int idmouse_open(struct inode *inode, struct file *file)
 {
-        struct usb_idmouse *dev = NULL;
+        struct usb_idmouse *dev;
        struct usb_interface *interface;
-        int result = 0;
+        int result;
        /* prevent disconnects */
        mutex_lock(&disconnect_mutex);
@@ -305,7 +305,7 @@ static ssize_t idmouse_read(struct file *file, char __user *buffer, size_t count
                                loff_t * ppos)
 {
        struct usb_idmouse *dev;
-        int result = 0;
+        int result;
        dev = (struct usb_idmouse *) file->private_data;
@@ -329,7 +329,7 @@ static int idmouse_probe(struct usb_interface *interface,
                                const struct usb_device_id *id)
 {
        struct usb_device *udev = interface_to_usbdev(interface);
-        struct usb_idmouse *dev = NULL;
+        struct usb_idmouse *dev;
        struct usb_host_interface *iface_desc;
        struct usb_endpoint_descriptor *endpoint;
        int result;
@@ -350,11 +350,7 @@ static int idmouse_probe(struct usb_interface *interface,
        /* set up the endpoint information - use only the first bulk-in endpoint */
        endpoint = &iface_desc->endpoint[0].desc;
-        if (!dev->bulk_in_endpointAddr
+        if (!dev->bulk_in_endpointAddr && usb_endpoint_is_bulk_in(endpoint)) {
-                && (endpoint->bEndpointAddress & USB_DIR_IN)
-                && ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) ==
-                USB_ENDPOINT_XFER_BULK)) {
                /* we found a bulk in endpoint */
                dev->orig_bi_size = le16_to_cpu(endpoint->wMaxPacketSize);
                dev->bulk_in_size = 0x200; /* works _much_ faster */
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 27089497e717..5dce797bddb7 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -317,12 +317,8 @@ static inline void tower_delete (struct lego_usb_tower *dev)
        tower_abort_transfers (dev);
        /* free data structures */
-        if (dev->interrupt_in_urb != NULL) {
+        usb_free_urb(dev->interrupt_in_urb);
-                usb_free_urb (dev->interrupt_in_urb);
+        usb_free_urb(dev->interrupt_out_urb);
-        }
-        if (dev->interrupt_out_urb != NULL) {
-                usb_free_urb (dev->interrupt_out_urb);
-        }
        kfree (dev->read_buffer);
        kfree (dev->interrupt_in_buffer);
        kfree (dev->interrupt_out_buffer);
@@ -502,15 +498,11 @@ static void tower_abort_transfers (struct lego_usb_tower *dev)
        if (dev->interrupt_in_running) {
                dev->interrupt_in_running = 0;
                mb();
-                if (dev->interrupt_in_urb != NULL && dev->udev) {
+                if (dev->udev)
                        usb_kill_urb (dev->interrupt_in_urb);
-                }
-        }
-        if (dev->interrupt_out_busy) {
-                if (dev->interrupt_out_urb != NULL && dev->udev) {
-                        usb_kill_urb (dev->interrupt_out_urb);
-                }
        }
+        if (dev->interrupt_out_busy && dev->udev)
+                usb_kill_urb(dev->interrupt_out_urb);
 exit:
        dbg(2, "%s: leave", __FUNCTION__);
@@ -898,14 +890,11 @@ static int tower_probe (struct usb_interface *interface, const struct usb_device
        for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
                endpoint = &iface_desc->endpoint[i].desc;
-                if (((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) &&
+                if (usb_endpoint_xfer_int(endpoint)) {
-                    ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) {
+                        if (usb_endpoint_dir_in(endpoint))
-                        dev->interrupt_in_endpoint = endpoint;
+                                dev->interrupt_in_endpoint = endpoint;
-                }
+                        else
+                                dev->interrupt_out_endpoint = endpoint;
-                if (((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) &&
-                    ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) {
-                        dev->interrupt_out_endpoint = endpoint;
                }
        }
        if(dev->interrupt_in_endpoint == NULL) {
diff --git a/drivers/usb/misc/phidgetkit.c b/drivers/usb/misc/phidgetkit.c
index abb4dcd811ac..9110793f81d3 100644
--- a/drivers/usb/misc/phidgetkit.c
+++ b/drivers/usb/misc/phidgetkit.c
@@ -551,7 +551,7 @@ static int interfacekit_probe(struct usb_interface *intf, const struct usb_devic
                return -ENODEV;
        endpoint = &interface->endpoint[0].desc;
-        if (!(endpoint->bEndpointAddress & 0x80)) 
+        if (!usb_endpoint_dir_in(endpoint))
                return -ENODEV;
        /*
         * bmAttributes
@@ -650,8 +650,7 @@ out2:
                device_remove_file(kit->dev, &dev_output_attrs[i]);
 out:
        if (kit) {
-                if (kit->irq)
+                usb_free_urb(kit->irq);
-                        usb_free_urb(kit->irq);
                if (kit->data)
                        usb_buffer_free(dev, URB_INT_SIZE, kit->data, kit->data_dma);
                if (kit->dev)
diff --git a/drivers/usb/misc/phidgetmotorcontrol.c b/drivers/usb/misc/phidgetmotorcontrol.c
index 5c780cab92e0..c3469b0a67c2 100644
--- a/drivers/usb/misc/phidgetmotorcontrol.c
+++ b/drivers/usb/misc/phidgetmotorcontrol.c
@@ -323,7 +323,7 @@ static int motorcontrol_probe(struct usb_interface *intf, const struct usb_devic
                return -ENODEV;
        endpoint = &interface->endpoint[0].desc;
-        if (!(endpoint->bEndpointAddress & 0x80))
+        if (!usb_endpoint_dir_in(endpoint))
                return -ENODEV;
        /*
@@ -392,8 +392,7 @@ out2:
                device_remove_file(mc->dev, &dev_attrs[i]);
 out:
        if (mc) {
-                if (mc->irq)
+                usb_free_urb(mc->irq);
-                        usb_free_urb(mc->irq);
                if (mc->data)
                        usb_buffer_free(dev, URB_INT_SIZE, mc->data, mc->data_dma);
                if (mc->dev)
diff --git a/drivers/usb/misc/usb_u132.h b/drivers/usb/misc/usb_u132.h
index 551ba8906d62..dc2e5a31caec 100644
--- a/drivers/usb/misc/usb_u132.h
+++ b/drivers/usb/misc/usb_u132.h
@@ -52,7 +52,7 @@
 * the kernel to load the "u132-hcd" module.
 *
 * The "ftdi-u132" module provides the interface to the inserted
-* PC card and the "u132-hcd" module uses the API to send and recieve
+* PC card and the "u132-hcd" module uses the API to send and receive
 * data. The API features call-backs, so that part of the "u132-hcd"
 * module code will run in the context of one of the kernel threads
 * of the "ftdi-u132" module.
@@ -95,3 +95,7 @@ int usb_ftdi_elan_edset_setup(struct platform_device *pdev, u8 ed_number,
         int halted, int skipped, int actual, int non_null));
 int usb_ftdi_elan_edset_flush(struct platform_device *pdev, u8 ed_number,
        void *endp);
+int usb_ftdi_elan_read_pcimem(struct platform_device *pdev, int mem_offset,
+                              u8 width, u32 *data);
+int usb_ftdi_elan_write_pcimem(struct platform_device *pdev, int mem_offset,
+                               u8 width, u32 data);
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index 7c2cbdf81d20..194065dbb51f 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -138,7 +138,7 @@ get_endpoints (struct usbtest_dev *dev, struct usb_interface *intf)
                        default:
                                continue;
                        }
-                        if (e->desc.bEndpointAddress & USB_DIR_IN) {
+                        if (usb_endpoint_dir_in(&e->desc)) {
                                if (!in)
                                        in = e;
                        } else {
@@ -147,7 +147,7 @@ get_endpoints (struct usbtest_dev *dev, struct usb_interface *intf)
                        }
                        continue;
 try_iso:
-                        if (e->desc.bEndpointAddress & USB_DIR_IN) {
+                        if (usb_endpoint_dir_in(&e->desc)) {
                                if (!iso_in)
                                        iso_in = e;
                        } else {
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c
index 881841e600de..95e682e2c9d6 100644
--- a/drivers/usb/net/asix.c
+++ b/drivers/usb/net/asix.c
@@ -249,9 +249,9 @@ asix_write_cmd_async(struct usbnet *dev, u8 cmd, u16 value, u16 index,
        req->bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE;
        req->bRequest = cmd;
-        req->wValue = value;
+        req->wValue = cpu_to_le16(value);
-        req->wIndex = index;
+        req->wIndex = cpu_to_le16(index);
-        req->wLength = size;
+        req->wLength = cpu_to_le16(size);
        usb_fill_control_urb(urb, dev->udev,
                             usb_sndctrlpipe(dev->udev, 0),
diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c
index f740325abac4..907b820a5faf 100644
--- a/drivers/usb/net/catc.c
+++ b/drivers/usb/net/catc.c
@@ -786,14 +786,10 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
        if ((!catc->ctrl_urb) || (!catc->tx_urb) || 
            (!catc->rx_urb) || (!catc->irq_urb)) {
                err("No free urbs available.");
-                if (catc->ctrl_urb)
+                usb_free_urb(catc->ctrl_urb);
-                        usb_free_urb(catc->ctrl_urb);
+                usb_free_urb(catc->tx_urb);
-                if (catc->tx_urb)
+                usb_free_urb(catc->rx_urb);
-                        usb_free_urb(catc->tx_urb);
+                usb_free_urb(catc->irq_urb);
-                if (catc->rx_urb)
-                        usb_free_urb(catc->rx_urb);
-                if (catc->irq_urb)
-                        usb_free_urb(catc->irq_urb);
                free_netdev(netdev);
                return -ENOMEM;
        }
diff --git a/drivers/usb/net/cdc_ether.c b/drivers/usb/net/cdc_ether.c
index f6971b88349d..44a91547146e 100644
--- a/drivers/usb/net/cdc_ether.c
+++ b/drivers/usb/net/cdc_ether.c
@@ -200,8 +200,7 @@ next_desc:
                dev->status = &info->control->cur_altsetting->endpoint [0];
                desc = &dev->status->desc;
-                if (desc->bmAttributes != USB_ENDPOINT_XFER_INT
+                if (!usb_endpoint_is_int_in(desc)
-                                || !(desc->bEndpointAddress & USB_DIR_IN)
                                || (le16_to_cpu(desc->wMaxPacketSize)
                                        < sizeof(struct usb_cdc_notification))
                                || !desc->bInterval) {
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c
index ce00de8f13a1..a77410562e12 100644
--- a/drivers/usb/net/net1080.c
+++ b/drivers/usb/net/net1080.c
@@ -237,12 +237,12 @@ static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
 #define STATUS_CONN_OTHER       (1 << 14)
 #define STATUS_SUSPEND_OTHER    (1 << 13)
 #define STATUS_MAILBOX_OTHER    (1 << 12)
-#define STATUS_PACKETS_OTHER(n) (((n) >> 8) && 0x03)
+#define STATUS_PACKETS_OTHER(n) (((n) >> 8) & 0x03)
 #define STATUS_CONN_THIS        (1 << 6)
 #define STATUS_SUSPEND_THIS     (1 << 5)
 #define STATUS_MAILBOX_THIS     (1 << 4)
-#define STATUS_PACKETS_THIS(n)  (((n) >> 0) && 0x03)
+#define STATUS_PACKETS_THIS(n)  (((n) >> 0) & 0x03)
 #define STATUS_UNSPEC_MASK      0x0c8c
 #define STATUS_NOISE_MASK       ((u16)~(0x0303|STATUS_UNSPEC_MASK))
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c
index 33abbd2176b6..69eb0db399df 100644
--- a/drivers/usb/net/pegasus.c
+++ b/drivers/usb/net/pegasus.c
@@ -163,6 +163,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
        /* using ATOMIC, we'd never wake up if we slept */
        if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {
+                set_current_state(TASK_RUNNING);
                if (ret == -ENODEV)
                        netif_device_detach(pegasus->net);
                if (netif_msg_drv(pegasus))
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index 760b5327b81b..7672e11c94c4 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -116,7 +116,7 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
                        e = alt->endpoint + ep;
                        switch (e->desc.bmAttributes) {
                        case USB_ENDPOINT_XFER_INT:
-                                if (!(e->desc.bEndpointAddress & USB_DIR_IN))
+                                if (!usb_endpoint_dir_in(&e->desc))
                                        continue;
                                intr = 1;
                                /* FALLTHROUGH */
@@ -125,7 +125,7 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
                        default:
                                continue;
                        }
-                        if (e->desc.bEndpointAddress & USB_DIR_IN) {
+                        if (usb_endpoint_dir_in(&e->desc)) {
                                if (!intr && !in)
                                        in = e;
                                else if (intr && !status)
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 2a8dd4cc943d..2f4d303ee36f 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -554,6 +554,17 @@ config USB_SERIAL_OMNINET
          To compile this driver as a module, choose M here: the
          module will be called omninet.
+config USB_SERIAL_DEBUG
+        tristate "USB Debugging Device"
+        depends on USB_SERIAL
+        help
+          Say Y here if you have a USB debugging device used to recieve
+          debugging data from another machine.  The most common of these
+          devices is the NetChip TurboCONNECT device.
+          To compile this driver as a module, choose M here: the
+          module will be called usb-debug.
 config USB_EZUSB
        bool
        depends on USB_SERIAL_KEYSPAN_PDA || USB_SERIAL_XIRCOM || USB_SERIAL_KEYSPAN || USB_SERIAL_WHITEHEAT
diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index a5047dc599bb..61166ad450e6 100644
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -18,6 +18,7 @@ obj-$(CONFIG_USB_SERIAL_BELKIN)			+= belkin_sa.o
 obj-$(CONFIG_USB_SERIAL_CP2101)                 += cp2101.o
 obj-$(CONFIG_USB_SERIAL_CYBERJACK)              += cyberjack.o
 obj-$(CONFIG_USB_SERIAL_CYPRESS_M8)             += cypress_m8.o
+obj-$(CONFIG_USB_SERIAL_DEBUG)                  += usb_debug.o
 obj-$(CONFIG_USB_SERIAL_DIGI_ACCELEPORT)        += digi_acceleport.o
 obj-$(CONFIG_USB_SERIAL_EDGEPORT)               += io_edgeport.o
 obj-$(CONFIG_USB_SERIAL_EDGEPORT_TI)            += io_ti.o
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c
index 812275509137..b1b5707bc99a 100644
--- a/drivers/usb/serial/aircable.c
+++ b/drivers/usb/serial/aircable.c
@@ -270,8 +270,11 @@ static void aircable_read(void *params)
         */
        tty = port->tty;
-        if (!tty)
+        if (!tty) {
                schedule_work(&priv->rx_work);
+                err("%s - No tty available", __FUNCTION__);
+                return ;
+        }
        count = min(64, serial_buf_data_avail(priv->rx_buf));
@@ -305,9 +308,7 @@ static int aircable_probe(struct usb_serial *serial,
        for (i = 0; i < iface_desc->desc.bNumEndpoints; i++) {
                endpoint = &iface_desc->endpoint[i].desc;
-                if (((endpoint->bEndpointAddress & 0x80) == 0x00) &&
+                if (usb_endpoint_is_bulk_out(endpoint)) {
-                        ((endpoint->bmAttributes & 3) == 0x02)) {
-                        /* we found our bulk out endpoint */
                        dbg("found bulk out on endpoint %d", i);
                        ++num_bulk_out;
                }
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index 7f5d546da39a..96c73726d74a 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -19,6 +19,7 @@
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */
        { USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
+        { USB_DEVICE(0x1410, 0x1430) }, /* Novatel Merlin XU870 HSDPA/3G */
        { USB_DEVICE(0x1410, 0x1100) }, /* ExpressCard34 Qualcomm 3G CDMA */
        { },
 };
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index ca52f12f0e24..863966c1c5ac 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -85,10 +85,9 @@ static int ark3116_attach(struct usb_serial *serial)
        int i;
        for (i = 0; i < serial->num_ports; ++i) {
-                priv = kmalloc(sizeof (struct ark3116_private), GFP_KERNEL);
+                priv = kzalloc(sizeof(struct ark3116_private), GFP_KERNEL);
                if (!priv)
                        goto cleanup;
-                memset(priv, 0x00, sizeof (struct ark3116_private));
                spin_lock_init(&priv->lock);
                usb_set_serial_port_data(serial->port[i], priv);
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 3a9073dbfe6a..7167728d764c 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -166,19 +166,17 @@ static int usb_console_setup(struct console *co, char *options)
        if (serial->type->set_termios) {
                /* build up a fake tty structure so that the open call has something
                 * to look at to get the cflag value */
-                tty = kmalloc (sizeof (*tty), GFP_KERNEL);
+                tty = kzalloc(sizeof(*tty), GFP_KERNEL);
                if (!tty) {
                        err ("no more memory");
                        return -ENOMEM;
                }
-                termios = kmalloc (sizeof (*termios), GFP_KERNEL);
+                termios = kzalloc(sizeof(*termios), GFP_KERNEL);
                if (!termios) {
                        err ("no more memory");
                        kfree (tty);
                        return -ENOMEM;
                }
-                memset (tty, 0x00, sizeof(*tty));
-                memset (termios, 0x00, sizeof(*termios));
                termios->c_cflag = cflag;
                tty->termios = termios;
                port->tty = tty;
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index f2e89a083659..093f303b3189 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -1684,15 +1684,14 @@ static int __init cypress_init(void)
        info(DRIVER_DESC " " DRIVER_VERSION);
        return 0;
 failed_usb_register:
-        usb_deregister(&cypress_driver);
-failed_ca42v2_register:
        usb_serial_deregister(&cypress_ca42v2_device);
-failed_hidcom_register:
+failed_ca42v2_register:
        usb_serial_deregister(&cypress_hidcom_device);
-failed_em_register:
+failed_hidcom_register:
        usb_serial_deregister(&cypress_earthmate_device);
+failed_em_register:
        return retval;
 }
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index bdb58100fc1d..5e3ac281a2f8 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -157,7 +157,7 @@
 *       to TASK_RUNNING will be lost and write_chan's subsequent call to
 *       schedule() will never return (unless it catches a signal).
 *       This race condition occurs because write_bulk_callback() (and thus
-*       the wakeup) are called asynchonously from an interrupt, rather than
+*       the wakeup) are called asynchronously from an interrupt, rather than
 *       from the scheduler.  We can avoid the race by calling the wakeup
 *       from the scheduler queue and that's our fix:  Now, at the end of
 *       write_bulk_callback() we queue up a wakeup call on the scheduler
diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c
index 5169c2d154ab..97ee718b1da2 100644
--- a/drivers/usb/serial/ezusb.c
+++ b/drivers/usb/serial/ezusb.c
@@ -31,12 +31,11 @@ int ezusb_writememory (struct usb_serial *serial, int address, unsigned char *da
                return -ENODEV;
        }
-        transfer_buffer =  kmalloc (length, GFP_KERNEL);
+        transfer_buffer = kmemdup(data, length, GFP_KERNEL);
        if (!transfer_buffer) {
                dev_err(&serial->dev->dev, "%s - kmalloc(%d) failed.\n", __FUNCTION__, length);
                return -ENOMEM;
        }
-        memcpy (transfer_buffer, data, length);
        result = usb_control_msg (serial->dev, usb_sndctrlpipe(serial->dev, 0), bRequest, 0x40, address, 0, transfer_buffer, length, 3000);
        kfree (transfer_buffer);
        return result;
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index c186b4e73c72..89ce2775be15 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1388,8 +1388,7 @@ static void ftdi_close (struct usb_serial_port *port, struct file *filp)
        flush_scheduled_work();
        /* shutdown our bulk read */
-        if (port->read_urb)
+        usb_kill_urb(port->read_urb);
-                usb_kill_urb(port->read_urb);
 } /* ftdi_close */
diff --git a/drivers/usb/serial/garmin_gps.c b/drivers/usb/serial/garmin_gps.c
index 4543152a9966..6530d391ebed 100644
--- a/drivers/usb/serial/garmin_gps.c
+++ b/drivers/usb/serial/garmin_gps.c
@@ -1523,12 +1523,11 @@ static int garmin_attach (struct usb_serial *serial)
        dbg("%s", __FUNCTION__);
-        garmin_data_p = kmalloc (sizeof(struct garmin_data), GFP_KERNEL);
+        garmin_data_p = kzalloc(sizeof(struct garmin_data), GFP_KERNEL);
        if (garmin_data_p == NULL) {
                dev_err(&port->dev, "%s - Out of memory\n", __FUNCTION__);
                return -ENOMEM;
        }
-        memset (garmin_data_p, 0, sizeof(struct garmin_data));
        init_timer(&garmin_data_p->timer);
        spin_lock_init(&garmin_data_p->lock);
        INIT_LIST_HEAD(&garmin_data_p->pktlist);
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 91bd3014ef1e..d06547a13f28 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -1038,9 +1038,7 @@ static void edge_close (struct usb_serial_port *port, struct file * filp)
        edge_port->open = FALSE;
        edge_port->openPending = FALSE;
-        if (edge_port->write_urb) {
+        usb_kill_urb(edge_port->write_urb);
-                usb_kill_urb(edge_port->write_urb);
-        }
        if (edge_port->write_urb) {
                /* if this urb had a transfer buffer already (old transfer) free it */
diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index 2a4bb66691ad..d3b9a351cef8 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -206,10 +206,9 @@ static int ipw_open(struct usb_serial_port *port, struct file *filp)
        dbg("%s", __FUNCTION__);
-        buf_flow_init = kmalloc(16, GFP_KERNEL);
+        buf_flow_init = kmemdup(buf_flow_static, 16, GFP_KERNEL);
        if (!buf_flow_init)
                return -ENOMEM;
-        memcpy(buf_flow_init, buf_flow_static, 16);
        if (port->tty)
                port->tty->low_latency = 1;
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c
index 53be824eb1bf..7639652cec42 100644
--- a/drivers/usb/serial/keyspan.c
+++ b/drivers/usb/serial/keyspan.c
@@ -2306,22 +2306,16 @@ static void keyspan_shutdown (struct usb_serial *serial)
        }
        /* Now free them */
-        if (s_priv->instat_urb)
+        usb_free_urb(s_priv->instat_urb);
-                usb_free_urb(s_priv->instat_urb);
+        usb_free_urb(s_priv->glocont_urb);
-        if (s_priv->glocont_urb)
-                usb_free_urb(s_priv->glocont_urb);
        for (i = 0; i < serial->num_ports; ++i) {
                port = serial->port[i];
                p_priv = usb_get_serial_port_data(port);
-                if (p_priv->inack_urb)
+                usb_free_urb(p_priv->inack_urb);
-                        usb_free_urb(p_priv->inack_urb);
+                usb_free_urb(p_priv->outcont_urb);
-                if (p_priv->outcont_urb)
-                        usb_free_urb(p_priv->outcont_urb);
                for (j = 0; j < 2; j++) {
-                        if (p_priv->in_urbs[j])
+                        usb_free_urb(p_priv->in_urbs[j]);
-                                usb_free_urb(p_priv->in_urbs[j]);
+                        usb_free_urb(p_priv->out_urbs[j]);
-                        if (p_priv->out_urbs[j])
-                                usb_free_urb(p_priv->out_urbs[j]);
                }
        }
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index ff03331e0bcf..237289920f03 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -185,13 +185,11 @@ static int kobil_startup (struct usb_serial *serial)
  
        for (i = 0; i < altsetting->desc.bNumEndpoints; i++) {
                endpoint = &altsetting->endpoint[i];
-                if (((endpoint->desc.bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_OUT) && 
+                if (usb_endpoint_is_int_out(&endpoint->desc)) {
-                    ((endpoint->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) {
                        dbg("%s Found interrupt out endpoint. Address: %d", __FUNCTION__, endpoint->desc.bEndpointAddress);
                        priv->write_int_endpoint_address = endpoint->desc.bEndpointAddress;
                }
-                if (((endpoint->desc.bEndpointAddress & USB_ENDPOINT_DIR_MASK) == USB_DIR_IN) && 
+                if (usb_endpoint_is_int_in(&endpoint->desc)) {
-                    ((endpoint->desc.bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) == USB_ENDPOINT_XFER_INT)) {
                        dbg("%s Found interrupt in  endpoint. Address: %d", __FUNCTION__, endpoint->desc.bEndpointAddress);
                        priv->read_int_endpoint_address = endpoint->desc.bEndpointAddress;
                }
@@ -355,8 +353,7 @@ static void kobil_close (struct usb_serial_port *port, struct file *filp)
                usb_free_urb( port->write_urb );
                port->write_urb = NULL;
        }
-        if (port->interrupt_in_urb)
+        usb_kill_urb(port->interrupt_in_urb);
-                usb_kill_urb(port->interrupt_in_urb);
 }
diff --git a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
index b7582cc496dc..a906e500a02b 100644
--- a/drivers/usb/serial/mct_u232.c
+++ b/drivers/usb/serial/mct_u232.c
@@ -358,10 +358,8 @@ static int mct_u232_startup (struct usb_serial *serial)
        /* Puh, that's dirty */
        port = serial->port[0];
        rport = serial->port[1];
-        if (port->read_urb) {
+        /* No unlinking, it wasn't submitted yet. */
-                /* No unlinking, it wasn't submitted yet. */
+        usb_free_urb(port->read_urb);
-                usb_free_urb(port->read_urb);
-        }
        port->read_urb = rport->interrupt_in_urb;
        rport->interrupt_in_urb = NULL;
        port->read_urb->context = port;
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 5b71962d0351..02c89e10b2cf 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2596,12 +2596,11 @@ static int mos7840_startup(struct usb_serial *serial)
        /* set up port private structures */
        for (i = 0; i < serial->num_ports; ++i) {
-                mos7840_port = kmalloc(sizeof(struct moschip_port), GFP_KERNEL);
+                mos7840_port = kzalloc(sizeof(struct moschip_port), GFP_KERNEL);
                if (mos7840_port == NULL) {
                        err("%s - Out of memory", __FUNCTION__);
                        return -ENOMEM;
                }
-                memset(mos7840_port, 0, sizeof(struct moschip_port));
                /* Initialize all port interrupt end point to port 0 int endpoint *
                 * Our device has only one interrupt end point comman to all port */
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c
index 0610409a6568..054abee81652 100644
--- a/drivers/usb/serial/navman.c
+++ b/drivers/usb/serial/navman.c
@@ -95,8 +95,7 @@ static void navman_close(struct usb_serial_port *port, struct file *filp)
 {
        dbg("%s - port %d", __FUNCTION__, port->number);
-        if (port->interrupt_in_urb)
+        usb_kill_urb(port->interrupt_in_urb);
-                usb_kill_urb(port->interrupt_in_urb);
 }
 static int navman_write(struct usb_serial_port *port,
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 07400c0c8a8c..ae98d8cbdbb8 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -228,6 +228,7 @@ static int product_5052_count;
 /* null entry */
 static struct usb_device_id ti_id_table_3410[1+TI_EXTRA_VID_PID_COUNT+1] = {
        { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
+        { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
 };
 static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = {
@@ -239,6 +240,7 @@ static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = {
 static struct usb_device_id ti_id_table_combined[] = {
        { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) },
+        { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) },
        { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) },
        { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) },
        { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },
@@ -459,13 +461,12 @@ static int ti_startup(struct usb_serial *serial)
        /* set up port structures */
        for (i = 0; i < serial->num_ports; ++i) {
-                tport = kmalloc(sizeof(struct ti_port), GFP_KERNEL);
+                tport = kzalloc(sizeof(struct ti_port), GFP_KERNEL);
                if (tport == NULL) {
                        dev_err(&dev->dev, "%s - out of memory\n", __FUNCTION__);
                        status = -ENOMEM;
                        goto free_tports;
                }
-                memset(tport, 0, sizeof(struct ti_port));
                spin_lock_init(&tport->tp_lock);
                tport->tp_uart_base_addr = (i == 0 ? TI_UART1_BASE_ADDR : TI_UART2_BASE_ADDR);
                tport->tp_flags = low_latency ? ASYNC_LOW_LATENCY : 0;
diff --git a/drivers/usb/serial/ti_usb_3410_5052.h b/drivers/usb/serial/ti_usb_3410_5052.h
index 02c1aeb9e1b8..b5541bf991ba 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.h
+++ b/drivers/usb/serial/ti_usb_3410_5052.h
@@ -28,6 +28,7 @@
 /* Vendor and product ids */
 #define TI_VENDOR_ID                    0x0451
 #define TI_3410_PRODUCT_ID              0x3410
+#define TI_3410_EZ430_ID                0xF430  /* TI ez430 development tool */
 #define TI_5052_BOOT_PRODUCT_ID         0x5052  /* no EEPROM, no firmware */
 #define TI_5152_BOOT_PRODUCT_ID         0x5152  /* no EEPROM, no firmware */
 #define TI_5052_EEPROM_PRODUCT_ID       0x505A  /* EEPROM, no firmware */
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8006e51c34bb..c1257d5292f5 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -952,32 +952,28 @@ probe_error:
                port = serial->port[i];
                if (!port)
                        continue;
-                if (port->read_urb)
+                usb_free_urb(port->read_urb);
-                        usb_free_urb (port->read_urb);
                kfree(port->bulk_in_buffer);
        }
        for (i = 0; i < num_bulk_out; ++i) {
                port = serial->port[i];
                if (!port)
                        continue;
-                if (port->write_urb)
+                usb_free_urb(port->write_urb);
-                        usb_free_urb (port->write_urb);
                kfree(port->bulk_out_buffer);
        }
        for (i = 0; i < num_interrupt_in; ++i) {
                port = serial->port[i];
                if (!port)
                        continue;
-                if (port->interrupt_in_urb)
+                usb_free_urb(port->interrupt_in_urb);
-                        usb_free_urb (port->interrupt_in_urb);
                kfree(port->interrupt_in_buffer);
        }
        for (i = 0; i < num_interrupt_out; ++i) {
                port = serial->port[i];
                if (!port)
                        continue;
-                if (port->interrupt_out_urb)
+                usb_free_urb(port->interrupt_out_urb);
-                        usb_free_urb (port->interrupt_out_urb);
                kfree(port->interrupt_out_buffer);
        }
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c
new file mode 100644
index 000000000000..257a5e436873
--- /dev/null
+++ b/drivers/usb/serial/usb_debug.c
@@ -0,0 +1,65 @@
+/*
+ * USB Debug cable driver
+ *
+ * Copyright (C) 2006 Greg Kroah-Hartman <greg@kroah.com>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License version
+ *      2 as published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/tty.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include <linux/usb/serial.h>
+static struct usb_device_id id_table [] = {
+        { USB_DEVICE(0x0525, 0x127a) },
+        { },
+};
+MODULE_DEVICE_TABLE(usb, id_table);
+static struct usb_driver debug_driver = {
+        .name =         "debug",
+        .probe =        usb_serial_probe,
+        .disconnect =   usb_serial_disconnect,
+        .id_table =     id_table,
+        .no_dynamic_id =        1,
+};
+static struct usb_serial_driver debug_device = {
+        .driver = {
+                .owner =        THIS_MODULE,
+                .name =         "debug",
+        },
+        .id_table =             id_table,
+        .num_interrupt_in =     NUM_DONT_CARE,
+        .num_bulk_in =          NUM_DONT_CARE,
+        .num_bulk_out =         NUM_DONT_CARE,
+        .num_ports =            1,
+};
+static int __init debug_init(void)
+{
+        int retval;
+        retval = usb_serial_register(&debug_device);
+        if (retval)
+                return retval;
+        retval = usb_register(&debug_driver);
+        if (retval)
+                usb_serial_deregister(&debug_device);
+        return retval;
+}
+static void __exit debug_exit(void)
+{
+        usb_deregister(&debug_driver);
+        usb_serial_deregister(&debug_device);
+}
+module_init(debug_init);
+module_exit(debug_exit);
+MODULE_LICENSE("GPL");
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index befe2e11a041..eef5eaa5fa0b 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -348,8 +348,7 @@ static void visor_close (struct usb_serial_port *port, struct file * filp)
                         
        /* shutdown our urbs */
        usb_kill_urb(port->read_urb);
-        if (port->interrupt_in_urb)
+        usb_kill_urb(port->interrupt_in_urb);
-                usb_kill_urb(port->interrupt_in_urb);
        /* Try to send shutdown message, if the device is gone, this will just fail. */
        transfer_buffer =  kmalloc (0x12, GFP_KERNEL);
diff --git a/drivers/usb/storage/onetouch.c b/drivers/usb/storage/onetouch.c
index 3baf448e300d..3a158d58441f 100644
--- a/drivers/usb/storage/onetouch.c
+++ b/drivers/usb/storage/onetouch.c
@@ -142,10 +142,7 @@ int onetouch_connect_input(struct us_data *ss)
                return -ENODEV;
        endpoint = &interface->endpoint[2].desc;
-        if (!(endpoint->bEndpointAddress & USB_DIR_IN))
+        if (!usb_endpoint_is_int_in(endpoint))
-                return -ENODEV;
-        if ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
-                        != USB_ENDPOINT_XFER_INT)
                return -ENODEV;
        pipe = usb_rcvintpipe(udev, endpoint->bEndpointAddress);
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index efb047f431e8..db8b26012c75 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1318,6 +1318,16 @@ UNUSUAL_DEV(  0x1019, 0x0c55, 0x0000, 0x0110,
                US_SC_DEVICE, US_PR_DEVICE, usb_stor_ucr61s2b_init,
                0 ),
+/* Reported by Jaco Kroon <jaco@kroon.co.za>
+ * The usb-storage module found on the Digitech GNX4 (and supposedly other
+ * devices) misbehaves and causes a bunch of invalid I/O errors.
+ */
+UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x0100,
+                "Digitech HMG",
+                "DigiTech Mass Storage",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE ),
 /* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
 UNUSUAL_DEV(  0x132b, 0x000b, 0x0001, 0x0001,
                "Minolta",
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index b8d6031b0975..b401084b3d22 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -740,18 +740,16 @@ static int get_pipes(struct us_data *us)
                ep = &altsetting->endpoint[i].desc;
                /* Is it a BULK endpoint? */
-                if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
+                if (usb_endpoint_xfer_bulk(ep)) {
-                                == USB_ENDPOINT_XFER_BULK) {
                        /* BULK in or out? */
-                        if (ep->bEndpointAddress & USB_DIR_IN)
+                        if (usb_endpoint_dir_in(ep))
                                ep_in = ep;
                        else
                                ep_out = ep;
                }
                /* Is it an interrupt endpoint? */
-                else if ((ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)
+                else if (usb_endpoint_xfer_int(ep)) {
-                                == USB_ENDPOINT_XFER_INT) {
                        ep_int = ep;
                }
        }
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 93ffcdd95f50..e973a87fbb01 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1296,14 +1296,14 @@ register_framebuffer(struct fb_info *fb_info)
                        break;
        fb_info->node = i;
-        fb_info->class_device = class_device_create(fb_class, NULL, MKDEV(FB_MAJOR, i),
+        fb_info->dev = device_create(fb_class, fb_info->device,
-                                    fb_info->device, "fb%d", i);
+                                     MKDEV(FB_MAJOR, i), "fb%d", i);
-        if (IS_ERR(fb_info->class_device)) {
+        if (IS_ERR(fb_info->dev)) {
                /* Not fatal */
-                printk(KERN_WARNING "Unable to create class_device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->class_device));
+                printk(KERN_WARNING "Unable to create device for framebuffer %d; errno = %ld\n", i, PTR_ERR(fb_info->dev));
-                fb_info->class_device = NULL;
+                fb_info->dev = NULL;
        } else
-                fb_init_class_device(fb_info);
+                fb_init_device(fb_info);
        if (fb_info->pixmap.addr == NULL) {
                fb_info->pixmap.addr = kmalloc(FBPIXMAPSIZE, GFP_KERNEL);
@@ -1356,8 +1356,8 @@ unregister_framebuffer(struct fb_info *fb_info)
        fb_destroy_modelist(&fb_info->modelist);
        registered_fb[i]=NULL;
        num_registered_fb--;
-        fb_cleanup_class_device(fb_info);
+        fb_cleanup_device(fb_info);
-        class_device_destroy(fb_class, MKDEV(FB_MAJOR, i));
+        device_destroy(fb_class, MKDEV(FB_MAJOR, i));
        event.info = fb_info;
        fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
        return 0;
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index d3a50417ed9a..323bdf6fc7d5 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -73,7 +73,7 @@ EXPORT_SYMBOL(framebuffer_alloc);
 *
 * @info: frame buffer info structure
 *
- * Drop the reference count of the class_device embedded in the
+ * Drop the reference count of the device embedded in the
 * framebuffer info structure.
 *
 */
@@ -120,10 +120,10 @@ static int mode_string(char *buf, unsigned int offset,
                        m, mode->xres, mode->yres, v, mode->refresh);
 }
-static ssize_t store_mode(struct class_device *class_device, const char * buf,
+static ssize_t store_mode(struct device *device, struct device_attribute *attr,
-                          size_t count)
+                          const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        char mstr[100];
        struct fb_var_screeninfo var;
        struct fb_modelist *modelist;
@@ -151,9 +151,10 @@ static ssize_t store_mode(struct class_device *class_device, const char * buf,
        return -EINVAL;
 }
-static ssize_t show_mode(struct class_device *class_device, char *buf)
+static ssize_t show_mode(struct device *device, struct device_attribute *attr,
+                         char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        if (!fb_info->mode)
                return 0;
@@ -161,10 +162,11 @@ static ssize_t show_mode(struct class_device *class_device, char *buf)
        return mode_string(buf, 0, fb_info->mode);
 }
-static ssize_t store_modes(struct class_device *class_device, const char * buf,
+static ssize_t store_modes(struct device *device,
-                           size_t count)
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        LIST_HEAD(old_list);
        int i = count / sizeof(struct fb_videomode);
@@ -186,9 +188,10 @@ static ssize_t store_modes(struct class_device *class_device, const char * buf,
        return 0;
 }
-static ssize_t show_modes(struct class_device *class_device, char *buf)
+static ssize_t show_modes(struct device *device, struct device_attribute *attr,
+                          char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        unsigned int i;
        struct list_head *pos;
        struct fb_modelist *modelist;
@@ -203,10 +206,10 @@ static ssize_t show_modes(struct class_device *class_device, char *buf)
        return i;
 }
-static ssize_t store_bpp(struct class_device *class_device, const char * buf,
+static ssize_t store_bpp(struct device *device, struct device_attribute *attr,
-                         size_t count)
+                         const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        struct fb_var_screeninfo var;
        char ** last = NULL;
        int err;
@@ -218,16 +221,18 @@ static ssize_t store_bpp(struct class_device *class_device, const char * buf,
        return count;
 }
-static ssize_t show_bpp(struct class_device *class_device, char *buf)
+static ssize_t show_bpp(struct device *device, struct device_attribute *attr,
+                        char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.bits_per_pixel);
 }
-static ssize_t store_rotate(struct class_device *class_device, const char *buf,
+static ssize_t store_rotate(struct device *device,
-                            size_t count)
+                            struct device_attribute *attr,
+                            const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        struct fb_var_screeninfo var;
        char **last = NULL;
        int err;
@@ -242,17 +247,19 @@ static ssize_t store_rotate(struct class_device *class_device, const char *buf,
 }
-static ssize_t show_rotate(struct class_device *class_device, char *buf)
+static ssize_t show_rotate(struct device *device,
+                           struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->var.rotate);
 }
-static ssize_t store_virtual(struct class_device *class_device,
+static ssize_t store_virtual(struct device *device,
-                             const char * buf, size_t count)
+                             struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        struct fb_var_screeninfo var;
        char *last = NULL;
        int err;
@@ -269,23 +276,26 @@ static ssize_t store_virtual(struct class_device *class_device,
        return count;
 }
-static ssize_t show_virtual(struct class_device *class_device, char *buf)
+static ssize_t show_virtual(struct device *device,
+                            struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xres_virtual,
                        fb_info->var.yres_virtual);
 }
-static ssize_t show_stride(struct class_device *class_device, char *buf)
+static ssize_t show_stride(struct device *device,
+                           struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length);
 }
-static ssize_t store_blank(struct class_device *class_device, const char * buf,
+static ssize_t store_blank(struct device *device,
-                           size_t count)
+                           struct device_attribute *attr,
+                           const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        char *last = NULL;
        int err;
@@ -299,42 +309,48 @@ static ssize_t store_blank(struct class_device *class_device, const char * buf,
        return count;
 }
-static ssize_t show_blank(struct class_device *class_device, char *buf)
+static ssize_t show_blank(struct device *device,
+                          struct device_attribute *attr, char *buf)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
        return 0;
 }
-static ssize_t store_console(struct class_device *class_device,
+static ssize_t store_console(struct device *device,
-                             const char * buf, size_t count)
+                             struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
        return 0;
 }
-static ssize_t show_console(struct class_device *class_device, char *buf)
+static ssize_t show_console(struct device *device,
+                            struct device_attribute *attr, char *buf)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
        return 0;
 }
-static ssize_t store_cursor(struct class_device *class_device,
+static ssize_t store_cursor(struct device *device,
-                            const char * buf, size_t count)
+                            struct device_attribute *attr,
+                            const char *buf, size_t count)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
        return 0;
 }
-static ssize_t show_cursor(struct class_device *class_device, char *buf)
+static ssize_t show_cursor(struct device *device,
+                           struct device_attribute *attr, char *buf)
 {
-//      struct fb_info *fb_info = class_get_devdata(class_device);
+//      struct fb_info *fb_info = dev_get_drvdata(device);
        return 0;
 }
-static ssize_t store_pan(struct class_device *class_device, const char * buf,
+static ssize_t store_pan(struct device *device,
-                         size_t count)
+                         struct device_attribute *attr,
+                         const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        struct fb_var_screeninfo var;
        char *last = NULL;
        int err;
@@ -355,24 +371,27 @@ static ssize_t store_pan(struct class_device *class_device, const char * buf,
        return count;
 }
-static ssize_t show_pan(struct class_device *class_device, char *buf)
+static ssize_t show_pan(struct device *device,
+                        struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        return snprintf(buf, PAGE_SIZE, "%d,%d\n", fb_info->var.xoffset,
                        fb_info->var.xoffset);
 }
-static ssize_t show_name(struct class_device *class_device, char *buf)
+static ssize_t show_name(struct device *device,
+                         struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        return snprintf(buf, PAGE_SIZE, "%s\n", fb_info->fix.id);
 }
-static ssize_t store_fbstate(struct class_device *class_device,
+static ssize_t store_fbstate(struct device *device,
-                        const char *buf, size_t count)
+                             struct device_attribute *attr,
+                             const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        u32 state;
        char *last = NULL;
@@ -385,17 +404,19 @@ static ssize_t store_fbstate(struct class_device *class_device,
        return count;
 }
-static ssize_t show_fbstate(struct class_device *class_device, char *buf)
+static ssize_t show_fbstate(struct device *device,
+                            struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state);
 }
 #ifdef CONFIG_FB_BACKLIGHT
-static ssize_t store_bl_curve(struct class_device *class_device,
+static ssize_t store_bl_curve(struct device *device,
-                const char *buf, size_t count)
+                              struct device_attribute *attr,
+                              const char *buf, size_t count)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        u8 tmp_curve[FB_BACKLIGHT_LEVELS];
        unsigned int i;
@@ -432,9 +453,10 @@ static ssize_t store_bl_curve(struct class_device *class_device,
        return count;
 }
-static ssize_t show_bl_curve(struct class_device *class_device, char *buf)
+static ssize_t show_bl_curve(struct device *device,
+                             struct device_attribute *attr, char *buf)
 {
-        struct fb_info *fb_info = class_get_devdata(class_device);
+        struct fb_info *fb_info = dev_get_drvdata(device);
        ssize_t len = 0;
        unsigned int i;
@@ -465,7 +487,7 @@ static ssize_t show_bl_curve(struct class_device *class_device, char *buf)
 /* When cmap is added back in it should be a binary attribute
 * not a text one. Consideration should also be given to converting
 * fbdev to use configfs instead of sysfs */
-static struct class_device_attribute class_device_attrs[] = {
+static struct device_attribute device_attrs[] = {
        __ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp),
        __ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank),
        __ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console),
@@ -483,17 +505,16 @@ static struct class_device_attribute class_device_attrs[] = {
 #endif
 };
-int fb_init_class_device(struct fb_info *fb_info)
+int fb_init_device(struct fb_info *fb_info)
 {
        int i, error = 0;
-        class_set_devdata(fb_info->class_device, fb_info);
+        dev_set_drvdata(fb_info->dev, fb_info);
        fb_info->class_flag |= FB_SYSFS_FLAG_ATTR;
-        for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++) {
+        for (i = 0; i < ARRAY_SIZE(device_attrs); i++) {
-                error = class_device_create_file(fb_info->class_device,
+                error = device_create_file(fb_info->dev, &device_attrs[i]);
-                                                 &class_device_attrs[i]);
                if (error)
                        break;
@@ -501,22 +522,20 @@ int fb_init_class_device(struct fb_info *fb_info)
        if (error) {
                while (--i >= 0)
-                        class_device_remove_file(fb_info->class_device,
+                        device_remove_file(fb_info->dev, &device_attrs[i]);
-                                                 &class_device_attrs[i]);
                fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
        }
        return 0;
 }
-void fb_cleanup_class_device(struct fb_info *fb_info)
+void fb_cleanup_device(struct fb_info *fb_info)
 {
        unsigned int i;
        if (fb_info->class_flag & FB_SYSFS_FLAG_ATTR) {
-                for (i = 0; i < ARRAY_SIZE(class_device_attrs); i++)
+                for (i = 0; i < ARRAY_SIZE(device_attrs); i++)
-                        class_device_remove_file(fb_info->class_device,
+                        device_remove_file(fb_info->dev, &device_attrs[i]);
-                                                 &class_device_attrs[i]);
                fb_info->class_flag &= ~FB_SYSFS_FLAG_ATTR;
        }