104 files changed, 2177 insertions, 1870 deletions
diff --git a/drivers/acpi/ibm_acpi.c b/drivers/acpi/ibm_acpi.c
index 003a9876c968..5a8445959f67 100644
--- a/drivers/acpi/ibm_acpi.c
+++ b/drivers/acpi/ibm_acpi.c
@@ -352,7 +352,7 @@ static char *next_cmd(char **cmds)
        return start;
 }
-static int driver_init(void)
+static int ibm_acpi_driver_init(void)
 {
        printk(IBM_INFO "%s v%s\n", IBM_DESC, IBM_VERSION);
        printk(IBM_INFO "%s\n", IBM_URL);
@@ -1605,7 +1605,7 @@ static int fan_write(char *buf)
 static struct ibm_struct ibms[] = {
        {
         .name = "driver",
-         .init = driver_init,
+         .init = ibm_acpi_driver_init,
         .read = driver_read,
         },
        {
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index dbae6d971041..b517d2493551 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -402,6 +402,14 @@ static const struct pci_device_id ahci_pci_tbl[] = {
        { PCI_VDEVICE(NVIDIA, 0x044d), board_ahci },            /* MCP65 */
        { PCI_VDEVICE(NVIDIA, 0x044e), board_ahci },            /* MCP65 */
        { PCI_VDEVICE(NVIDIA, 0x044f), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045c), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045d), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045e), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x045f), board_ahci },            /* MCP65 */
+        { PCI_VDEVICE(NVIDIA, 0x0550), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0551), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0552), board_ahci },            /* MCP67 */
+        { PCI_VDEVICE(NVIDIA, 0x0553), board_ahci },            /* MCP67 */
        { PCI_VDEVICE(NVIDIA, 0x0554), board_ahci },            /* MCP67 */
        { PCI_VDEVICE(NVIDIA, 0x0555), board_ahci },            /* MCP67 */
        { PCI_VDEVICE(NVIDIA, 0x0556), board_ahci },            /* MCP67 */
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index a4790be41d1c..836947da5b14 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -51,7 +51,7 @@
 #define SECTOR_SIZE     512
-typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc, const u8 *scsicmd);
+typedef unsigned int (*ata_xlat_func_t)(struct ata_queued_cmd *qc);
 static struct ata_device * __ata_scsi_find_dev(struct ata_port *ap,
                                        const struct scsi_device *scsidev);
@@ -935,7 +935,6 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
 /**
 *      ata_scsi_start_stop_xlat - Translate SCSI START STOP UNIT command
 *      @qc: Storage for translated ATA taskfile
- *      @scsicmd: SCSI command to translate
 *
 *      Sets up an ATA taskfile to issue STANDBY (to stop) or READ VERIFY
 *      (to start). Perhaps these commands should be preceded by
@@ -948,22 +947,25 @@ int ata_scsi_change_queue_depth(struct scsi_device *sdev, int queue_depth)
 *      RETURNS:
 *      Zero on success, non-zero on error.
 */
+static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)
-static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc,
-                                             const u8 *scsicmd)
 {
+        struct scsi_cmnd *scmd = qc->scsicmd;
        struct ata_taskfile *tf = &qc->tf;
+        const u8 *cdb = scmd->cmnd;
+        if (scmd->cmd_len < 5)
+                goto invalid_fld;
        tf->flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
        tf->protocol = ATA_PROT_NODATA;
-        if (scsicmd[1] & 0x1) {
+        if (cdb[1] & 0x1) {
                ;       /* ignore IMMED bit, violates sat-r05 */
        }
-        if (scsicmd[4] & 0x2)
+        if (cdb[4] & 0x2)
                goto invalid_fld;       /* LOEJ bit set not supported */
-        if (((scsicmd[4] >> 4) & 0xf) != 0)
+        if (((cdb[4] >> 4) & 0xf) != 0)
                goto invalid_fld;       /* power conditions not supported */
-        if (scsicmd[4] & 0x1) {
+        if (cdb[4] & 0x1) {
                tf->nsect = 1;  /* 1 sector, lba=0 */
                if (qc->dev->flags & ATA_DFLAG_LBA) {
@@ -996,7 +998,7 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc,
        return 0;
 invalid_fld:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x24, 0x0);
        /* "Invalid field in cbd" */
        return 1;
 }
@@ -1005,7 +1007,6 @@ invalid_fld:
 /**
 *      ata_scsi_flush_xlat - Translate SCSI SYNCHRONIZE CACHE command
 *      @qc: Storage for translated ATA taskfile
- *      @scsicmd: SCSI command to translate (ignored)
 *
 *      Sets up an ATA taskfile to issue FLUSH CACHE or
 *      FLUSH CACHE EXT.
@@ -1016,8 +1017,7 @@ invalid_fld:
 *      RETURNS:
 *      Zero on success, non-zero on error.
 */
+static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc)
-static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
 {
        struct ata_taskfile *tf = &qc->tf;
@@ -1034,7 +1034,7 @@ static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc, const u8 *scs
 /**
 *      scsi_6_lba_len - Get LBA and transfer length
- *      @scsicmd: SCSI command to translate
+ *      @cdb: SCSI command to translate
 *
 *      Calculate LBA and transfer length for 6-byte commands.
 *
@@ -1042,18 +1042,17 @@ static unsigned int ata_scsi_flush_xlat(struct ata_queued_cmd *qc, const u8 *scs
 *      @plba: the LBA
 *      @plen: the transfer length
 */
+static void scsi_6_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
-static void scsi_6_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 {
        u64 lba = 0;
        u32 len = 0;
        VPRINTK("six-byte command\n");
-        lba |= ((u64)scsicmd[2]) << 8;
+        lba |= ((u64)cdb[2]) << 8;
-        lba |= ((u64)scsicmd[3]);
+        lba |= ((u64)cdb[3]);
-        len |= ((u32)scsicmd[4]);
+        len |= ((u32)cdb[4]);
        *plba = lba;
        *plen = len;
@@ -1061,7 +1060,7 @@ static void scsi_6_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 /**
 *      scsi_10_lba_len - Get LBA and transfer length
- *      @scsicmd: SCSI command to translate
+ *      @cdb: SCSI command to translate
 *
 *      Calculate LBA and transfer length for 10-byte commands.
 *
@@ -1069,21 +1068,20 @@ static void scsi_6_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 *      @plba: the LBA
 *      @plen: the transfer length
 */
+static void scsi_10_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
-static void scsi_10_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 {
        u64 lba = 0;
        u32 len = 0;
        VPRINTK("ten-byte command\n");
-        lba |= ((u64)scsicmd[2]) << 24;
+        lba |= ((u64)cdb[2]) << 24;
-        lba |= ((u64)scsicmd[3]) << 16;
+        lba |= ((u64)cdb[3]) << 16;
-        lba |= ((u64)scsicmd[4]) << 8;
+        lba |= ((u64)cdb[4]) << 8;
-        lba |= ((u64)scsicmd[5]);
+        lba |= ((u64)cdb[5]);
-        len |= ((u32)scsicmd[7]) << 8;
+        len |= ((u32)cdb[7]) << 8;
-        len |= ((u32)scsicmd[8]);
+        len |= ((u32)cdb[8]);
        *plba = lba;
        *plen = len;
@@ -1091,7 +1089,7 @@ static void scsi_10_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 /**
 *      scsi_16_lba_len - Get LBA and transfer length
- *      @scsicmd: SCSI command to translate
+ *      @cdb: SCSI command to translate
 *
 *      Calculate LBA and transfer length for 16-byte commands.
 *
@@ -1099,27 +1097,26 @@ static void scsi_10_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 *      @plba: the LBA
 *      @plen: the transfer length
 */
+static void scsi_16_lba_len(const u8 *cdb, u64 *plba, u32 *plen)
-static void scsi_16_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 {
        u64 lba = 0;
        u32 len = 0;
        VPRINTK("sixteen-byte command\n");
-        lba |= ((u64)scsicmd[2]) << 56;
+        lba |= ((u64)cdb[2]) << 56;
-        lba |= ((u64)scsicmd[3]) << 48;
+        lba |= ((u64)cdb[3]) << 48;
-        lba |= ((u64)scsicmd[4]) << 40;
+        lba |= ((u64)cdb[4]) << 40;
-        lba |= ((u64)scsicmd[5]) << 32;
+        lba |= ((u64)cdb[5]) << 32;
-        lba |= ((u64)scsicmd[6]) << 24;
+        lba |= ((u64)cdb[6]) << 24;
-        lba |= ((u64)scsicmd[7]) << 16;
+        lba |= ((u64)cdb[7]) << 16;
-        lba |= ((u64)scsicmd[8]) << 8;
+        lba |= ((u64)cdb[8]) << 8;
-        lba |= ((u64)scsicmd[9]);
+        lba |= ((u64)cdb[9]);
-        len |= ((u32)scsicmd[10]) << 24;
+        len |= ((u32)cdb[10]) << 24;
-        len |= ((u32)scsicmd[11]) << 16;
+        len |= ((u32)cdb[11]) << 16;
-        len |= ((u32)scsicmd[12]) << 8;
+        len |= ((u32)cdb[12]) << 8;
-        len |= ((u32)scsicmd[13]);
+        len |= ((u32)cdb[13]);
        *plba = lba;
        *plen = len;
@@ -1128,7 +1125,6 @@ static void scsi_16_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 /**
 *      ata_scsi_verify_xlat - Translate SCSI VERIFY command into an ATA one
 *      @qc: Storage for translated ATA taskfile
- *      @scsicmd: SCSI command to translate
 *
 *      Converts SCSI VERIFY command to an ATA READ VERIFY command.
 *
@@ -1138,23 +1134,28 @@ static void scsi_16_lba_len(const u8 *scsicmd, u64 *plba, u32 *plen)
 *      RETURNS:
 *      Zero on success, non-zero on error.
 */
+static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc)
-static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
 {
+        struct scsi_cmnd *scmd = qc->scsicmd;
        struct ata_taskfile *tf = &qc->tf;
        struct ata_device *dev = qc->dev;
        u64 dev_sectors = qc->dev->n_sectors;
+        const u8 *cdb = scmd->cmnd;
        u64 block;
        u32 n_block;
        tf->flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
        tf->protocol = ATA_PROT_NODATA;
-        if (scsicmd[0] == VERIFY)
+        if (cdb[0] == VERIFY) {
-                scsi_10_lba_len(scsicmd, &block, &n_block);
+                if (scmd->cmd_len < 10)
-        else if (scsicmd[0] == VERIFY_16)
+                        goto invalid_fld;
-                scsi_16_lba_len(scsicmd, &block, &n_block);
+                scsi_10_lba_len(cdb, &block, &n_block);
-        else
+        } else if (cdb[0] == VERIFY_16) {
+                if (scmd->cmd_len < 16)
+                        goto invalid_fld;
+                scsi_16_lba_len(cdb, &block, &n_block);
+        } else
                goto invalid_fld;
        if (!n_block)
@@ -1229,24 +1230,23 @@ static unsigned int ata_scsi_verify_xlat(struct ata_queued_cmd *qc, const u8 *sc
        return 0;
 invalid_fld:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x24, 0x0);
        /* "Invalid field in cbd" */
        return 1;
 out_of_range:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x21, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x21, 0x0);
        /* "Logical Block Address out of range" */
        return 1;
 nothing_to_do:
-        qc->scsicmd->result = SAM_STAT_GOOD;
+        scmd->result = SAM_STAT_GOOD;
        return 1;
 }
 /**
 *      ata_scsi_rw_xlat - Translate SCSI r/w command into an ATA one
 *      @qc: Storage for translated ATA taskfile
- *      @scsicmd: SCSI command to translate
 *
 *      Converts any of six SCSI read/write commands into the
 *      ATA counterpart, including starting sector (LBA),
@@ -1262,29 +1262,33 @@ nothing_to_do:
 *      RETURNS:
 *      Zero on success, non-zero on error.
 */
+static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc)
-static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
 {
+        struct scsi_cmnd *scmd = qc->scsicmd;
+        const u8 *cdb = scmd->cmnd;
        unsigned int tf_flags = 0;
        u64 block;
        u32 n_block;
        int rc;
-        if (scsicmd[0] == WRITE_10 || scsicmd[0] == WRITE_6 ||
+        if (cdb[0] == WRITE_10 || cdb[0] == WRITE_6 || cdb[0] == WRITE_16)
-            scsicmd[0] == WRITE_16)
                tf_flags |= ATA_TFLAG_WRITE;
        /* Calculate the SCSI LBA, transfer length and FUA. */
-        switch (scsicmd[0]) {
+        switch (cdb[0]) {
        case READ_10:
        case WRITE_10:
-                scsi_10_lba_len(scsicmd, &block, &n_block);
+                if (unlikely(scmd->cmd_len < 10))
-                if (unlikely(scsicmd[1] & (1 << 3)))
+                        goto invalid_fld;
+                scsi_10_lba_len(cdb, &block, &n_block);
+                if (unlikely(cdb[1] & (1 << 3)))
                        tf_flags |= ATA_TFLAG_FUA;
                break;
        case READ_6:
        case WRITE_6:
-                scsi_6_lba_len(scsicmd, &block, &n_block);
+                if (unlikely(scmd->cmd_len < 6))
+                        goto invalid_fld;
+                scsi_6_lba_len(cdb, &block, &n_block);
                /* for 6-byte r/w commands, transfer length 0
                 * means 256 blocks of data, not 0 block.
@@ -1294,8 +1298,10 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
                break;
        case READ_16:
        case WRITE_16:
-                scsi_16_lba_len(scsicmd, &block, &n_block);
+                if (unlikely(scmd->cmd_len < 16))
-                if (unlikely(scsicmd[1] & (1 << 3)))
+                        goto invalid_fld;
+                scsi_16_lba_len(cdb, &block, &n_block);
+                if (unlikely(cdb[1] & (1 << 3)))
                        tf_flags |= ATA_TFLAG_FUA;
                break;
        default:
@@ -1326,17 +1332,17 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, const u8 *scsicm
                goto out_of_range;
        /* treat all other errors as -EINVAL, fall through */
 invalid_fld:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x24, 0x0);
        /* "Invalid field in cbd" */
        return 1;
 out_of_range:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x21, 0x0);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x21, 0x0);
        /* "Logical Block Address out of range" */
        return 1;
 nothing_to_do:
-        qc->scsicmd->result = SAM_STAT_GOOD;
+        scmd->result = SAM_STAT_GOOD;
        return 1;
 }
@@ -1456,7 +1462,6 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
                              ata_xlat_func_t xlat_func)
 {
        struct ata_queued_cmd *qc;
-        u8 *scsicmd = cmd->cmnd;
        int is_io = xlat_func == ata_scsi_rw_xlat;
        VPRINTK("ENTER\n");
@@ -1488,7 +1493,7 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,
        qc->complete_fn = ata_scsi_qc_complete;
-        if (xlat_func(qc, scsicmd))
+        if (xlat_func(qc))
                goto early_finish;
        /* select device, send command to hardware */
@@ -2344,7 +2349,6 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)
 /**
 *      atapi_xlat - Initialize PACKET taskfile
 *      @qc: command structure to be initialized
- *      @scsicmd: SCSI CDB associated with this PACKET command
 *
 *      LOCKING:
 *      spin_lock_irqsave(host lock)
@@ -2352,25 +2356,25 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc)
 *      RETURNS:
 *      Zero on success, non-zero on failure.
 */
+static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
-static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
 {
-        struct scsi_cmnd *cmd = qc->scsicmd;
+        struct scsi_cmnd *scmd = qc->scsicmd;
        struct ata_device *dev = qc->dev;
        int using_pio = (dev->flags & ATA_DFLAG_PIO);
-        int nodata = (cmd->sc_data_direction == DMA_NONE);
+        int nodata = (scmd->sc_data_direction == DMA_NONE);
        if (!using_pio)
                /* Check whether ATAPI DMA is safe */
                if (ata_check_atapi_dma(qc))
                        using_pio = 1;
-        memcpy(&qc->cdb, scsicmd, dev->cdb_len);
+        memset(qc->cdb, 0, dev->cdb_len);
+        memcpy(qc->cdb, scmd->cmnd, scmd->cmd_len);
        qc->complete_fn = atapi_qc_complete;
        qc->tf.flags |= ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE;
-        if (cmd->sc_data_direction == DMA_TO_DEVICE) {
+        if (scmd->sc_data_direction == DMA_TO_DEVICE) {
                qc->tf.flags |= ATA_TFLAG_WRITE;
                DPRINTK("direction: write\n");
        }
@@ -2392,12 +2396,12 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc, const u8 *scsicmd)
                qc->tf.protocol = ATA_PROT_ATAPI_DMA;
                qc->tf.feature |= ATAPI_PKT_DMA;
-                if (atapi_dmadir && (cmd->sc_data_direction != DMA_TO_DEVICE))
+                if (atapi_dmadir && (scmd->sc_data_direction != DMA_TO_DEVICE))
                        /* some SATA bridges need us to indicate data xfer direction */
                        qc->tf.feature |= ATAPI_DMADIR;
        }
-        qc->nbytes = cmd->request_bufflen;
+        qc->nbytes = scmd->request_bufflen;
        return 0;
 }
@@ -2517,28 +2521,27 @@ ata_scsi_map_proto(u8 byte1)
 /**
 *      ata_scsi_pass_thru - convert ATA pass-thru CDB to taskfile
 *      @qc: command structure to be initialized
- *      @scsicmd: SCSI command to convert
 *
 *      Handles either 12 or 16-byte versions of the CDB.
 *
 *      RETURNS:
 *      Zero on success, non-zero on failure.
 */
-static unsigned int
+static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
-ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
 {
        struct ata_taskfile *tf = &(qc->tf);
-        struct scsi_cmnd *cmd = qc->scsicmd;
+        struct scsi_cmnd *scmd = qc->scsicmd;
        struct ata_device *dev = qc->dev;
+        const u8 *cdb = scmd->cmnd;
-        if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN)
+        if ((tf->protocol = ata_scsi_map_proto(cdb[1])) == ATA_PROT_UNKNOWN)
                goto invalid_fld;
        /* We may not issue DMA commands if no DMA mode is set */
        if (tf->protocol == ATA_PROT_DMA && dev->dma_mode == 0)
                goto invalid_fld;
-        if (scsicmd[1] & 0xe0)
+        if (cdb[1] & 0xe0)
                /* PIO multi not supported yet */
                goto invalid_fld;
@@ -2546,18 +2549,18 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
         * 12 and 16 byte CDBs use different offsets to
         * provide the various register values.
         */
-        if (scsicmd[0] == ATA_16) {
+        if (cdb[0] == ATA_16) {
                /*
                 * 16-byte CDB - may contain extended commands.
                 *
                 * If that is the case, copy the upper byte register values.
                 */
-                if (scsicmd[1] & 0x01) {
+                if (cdb[1] & 0x01) {
-                        tf->hob_feature = scsicmd[3];
+                        tf->hob_feature = cdb[3];
-                        tf->hob_nsect = scsicmd[5];
+                        tf->hob_nsect = cdb[5];
-                        tf->hob_lbal = scsicmd[7];
+                        tf->hob_lbal = cdb[7];
-                        tf->hob_lbam = scsicmd[9];
+                        tf->hob_lbam = cdb[9];
-                        tf->hob_lbah = scsicmd[11];
+                        tf->hob_lbah = cdb[11];
                        tf->flags |= ATA_TFLAG_LBA48;
                } else
                        tf->flags &= ~ATA_TFLAG_LBA48;
@@ -2565,26 +2568,26 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
                /*
                 * Always copy low byte, device and command registers.
                 */
-                tf->feature = scsicmd[4];
+                tf->feature = cdb[4];
-                tf->nsect = scsicmd[6];
+                tf->nsect = cdb[6];
-                tf->lbal = scsicmd[8];
+                tf->lbal = cdb[8];
-                tf->lbam = scsicmd[10];
+                tf->lbam = cdb[10];
-                tf->lbah = scsicmd[12];
+                tf->lbah = cdb[12];
-                tf->device = scsicmd[13];
+                tf->device = cdb[13];
-                tf->command = scsicmd[14];
+                tf->command = cdb[14];
        } else {
                /*
                 * 12-byte CDB - incapable of extended commands.
                 */
                tf->flags &= ~ATA_TFLAG_LBA48;
-                tf->feature = scsicmd[3];
+                tf->feature = cdb[3];
-                tf->nsect = scsicmd[4];
+                tf->nsect = cdb[4];
-                tf->lbal = scsicmd[5];
+                tf->lbal = cdb[5];
-                tf->lbam = scsicmd[6];
+                tf->lbam = cdb[6];
-                tf->lbah = scsicmd[7];
+                tf->lbah = cdb[7];
-                tf->device = scsicmd[8];
+                tf->device = cdb[8];
-                tf->command = scsicmd[9];
+                tf->command = cdb[9];
        }
        /*
         * If slave is possible, enforce correct master/slave bit
@@ -2611,7 +2614,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
         */
        tf->flags |= (ATA_TFLAG_ISADDR | ATA_TFLAG_DEVICE);
-        if (cmd->sc_data_direction == DMA_TO_DEVICE)
+        if (scmd->sc_data_direction == DMA_TO_DEVICE)
                tf->flags |= ATA_TFLAG_WRITE;
        /*
@@ -2620,7 +2623,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
         * TODO: find out if we need to do more here to
         *       cover scatter/gather case.
         */
-        qc->nsect = cmd->request_bufflen / ATA_SECT_SIZE;
+        qc->nsect = scmd->request_bufflen / ATA_SECT_SIZE;
        /* request result TF */
        qc->flags |= ATA_QCFLAG_RESULT_TF;
@@ -2628,7 +2631,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd)
        return 0;
 invalid_fld:
-        ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x00);
+        ata_scsi_set_sense(scmd, ILLEGAL_REQUEST, 0x24, 0x00);
        /* "Invalid field in cdb" */
        return 1;
 }
@@ -2701,22 +2704,29 @@ static inline void ata_scsi_dump_cdb(struct ata_port *ap,
 #endif
 }
-static inline int __ata_scsi_queuecmd(struct scsi_cmnd *cmd,
+static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
                                      void (*done)(struct scsi_cmnd *),
                                      struct ata_device *dev)
 {
        int rc = 0;
+        if (unlikely(!scmd->cmd_len)) {
+                ata_dev_printk(dev, KERN_WARNING, "WARNING: zero len CDB\n");
+                scmd->result = DID_ERROR << 16;
+                done(scmd);
+                return 0;
+        }
        if (dev->class == ATA_DEV_ATA) {
                ata_xlat_func_t xlat_func = ata_get_xlat_func(dev,
-                                                              cmd->cmnd[0]);
+                                                              scmd->cmnd[0]);
                if (xlat_func)
-                        rc = ata_scsi_translate(dev, cmd, done, xlat_func);
+                        rc = ata_scsi_translate(dev, scmd, done, xlat_func);
                else
-                        ata_scsi_simulate(dev, cmd, done);
+                        ata_scsi_simulate(dev, scmd, done);
        } else
-                rc = ata_scsi_translate(dev, cmd, done, atapi_xlat);
+                rc = ata_scsi_translate(dev, scmd, done, atapi_xlat);
        return rc;
 }
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 1c628014dae6..b1ca207e3545 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -372,7 +372,8 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
 static int cs5530_reinit_one(struct pci_dev *pdev)
 {
        /* If we fail on resume we are doomed */
-        BUG_ON(cs5530_init_chip());
+        if (cs5530_init_chip())
+                BUG();
        return ata_pci_device_resume(pdev);
 }
        
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index ff93e8f71cf8..f0d4f7e9ed31 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -395,7 +395,7 @@ static void via_config_fifo(struct pci_dev *pdev, unsigned int flags)
        enable &= 3;
        
        if (flags & VIA_SET_FIFO) {
-                u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20};
+                static const u8 fifo_setting[4] = {0x00, 0x60, 0x00, 0x20};
                u8 fifo;
                pci_read_config_byte(pdev, 0x43, &fifo);
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 0d316eb3c214..f6d498e1cf80 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -270,14 +270,6 @@ static const struct pci_device_id nv_pci_tbl[] = {
        { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA), GENERIC },
        { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA2), GENERIC },
        { PCI_VDEVICE(NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_SATA3), GENERIC },
-        { PCI_VDEVICE(NVIDIA, 0x045c), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045d), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045e), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x045f), GENERIC }, /* MCP65 */
-        { PCI_VDEVICE(NVIDIA, 0x0550), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0551), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0552), GENERIC }, /* MCP67 */
-        { PCI_VDEVICE(NVIDIA, 0x0553), GENERIC }, /* MCP67 */
        { PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID,
                PCI_ANY_ID, PCI_ANY_ID,
                PCI_CLASS_STORAGE_IDE<<8, 0xffff00, GENERIC },
diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index d89c9590b845..46d8a94669b4 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -135,26 +135,31 @@ static void k2_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
        unsigned int is_addr = tf->flags & ATA_TFLAG_ISADDR;
        if (tf->ctl != ap->last_ctl) {
-                writeb(tf->ctl, ioaddr->ctl_addr);
+                writeb(tf->ctl, (void __iomem *) ioaddr->ctl_addr);
                ap->last_ctl = tf->ctl;
                ata_wait_idle(ap);
        }
        if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
-                writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr);
+                writew(tf->feature | (((u16)tf->hob_feature) << 8),
-                writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr);
+                       (void __iomem *) ioaddr->feature_addr);
-                writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr);
+                writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
-                writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr);
+                       (void __iomem *) ioaddr->nsect_addr);
-                writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr);
+                writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
+                       (void __iomem *) ioaddr->lbal_addr);
+                writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
+                       (void __iomem *) ioaddr->lbam_addr);
+                writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
+                       (void __iomem *) ioaddr->lbah_addr);
        } else if (is_addr) {
-                writew(tf->feature, ioaddr->feature_addr);
+                writew(tf->feature, (void __iomem *) ioaddr->feature_addr);
-                writew(tf->nsect, ioaddr->nsect_addr);
+                writew(tf->nsect, (void __iomem *) ioaddr->nsect_addr);
-                writew(tf->lbal, ioaddr->lbal_addr);
+                writew(tf->lbal, (void __iomem *) ioaddr->lbal_addr);
-                writew(tf->lbam, ioaddr->lbam_addr);
+                writew(tf->lbam, (void __iomem *) ioaddr->lbam_addr);
-                writew(tf->lbah, ioaddr->lbah_addr);
+                writew(tf->lbah, (void __iomem *) ioaddr->lbah_addr);
        }
        if (tf->flags & ATA_TFLAG_DEVICE)
-                writeb(tf->device, ioaddr->device_addr);
+                writeb(tf->device, (void __iomem *) ioaddr->device_addr);
        ata_wait_idle(ap);
 }
@@ -166,12 +171,12 @@ static void k2_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
        u16 nsect, lbal, lbam, lbah, feature;
        tf->command = k2_stat_check_status(ap);
-        tf->device = readw(ioaddr->device_addr);
+        tf->device = readw((void __iomem *)ioaddr->device_addr);
-        feature = readw(ioaddr->error_addr);
+        feature = readw((void __iomem *)ioaddr->error_addr);
-        nsect = readw(ioaddr->nsect_addr);
+        nsect = readw((void __iomem *)ioaddr->nsect_addr);
-        lbal = readw(ioaddr->lbal_addr);
+        lbal = readw((void __iomem *)ioaddr->lbal_addr);
-        lbam = readw(ioaddr->lbam_addr);
+        lbam = readw((void __iomem *)ioaddr->lbam_addr);
-        lbah = readw(ioaddr->lbah_addr);
+        lbah = readw((void __iomem *)ioaddr->lbah_addr);
        tf->feature = feature;
        tf->nsect = nsect;
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index e654b990b905..0fa1b89f76d5 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -149,21 +149,26 @@ static void vsc_sata_tf_load(struct ata_port *ap, const struct ata_taskfile *tf)
                vsc_intr_mask_update(ap, tf->ctl & ATA_NIEN);
        }
        if (is_addr && (tf->flags & ATA_TFLAG_LBA48)) {
-                writew(tf->feature | (((u16)tf->hob_feature) << 8), ioaddr->feature_addr);
+                writew(tf->feature | (((u16)tf->hob_feature) << 8),
-                writew(tf->nsect | (((u16)tf->hob_nsect) << 8), ioaddr->nsect_addr);
+                       (void __iomem *) ioaddr->feature_addr);
-                writew(tf->lbal | (((u16)tf->hob_lbal) << 8), ioaddr->lbal_addr);
+                writew(tf->nsect | (((u16)tf->hob_nsect) << 8),
-                writew(tf->lbam | (((u16)tf->hob_lbam) << 8), ioaddr->lbam_addr);
+                       (void __iomem *) ioaddr->nsect_addr);
-                writew(tf->lbah | (((u16)tf->hob_lbah) << 8), ioaddr->lbah_addr);
+                writew(tf->lbal | (((u16)tf->hob_lbal) << 8),
+                       (void __iomem *) ioaddr->lbal_addr);
+                writew(tf->lbam | (((u16)tf->hob_lbam) << 8),
+                       (void __iomem *) ioaddr->lbam_addr);
+                writew(tf->lbah | (((u16)tf->hob_lbah) << 8),
+                       (void __iomem *) ioaddr->lbah_addr);
        } else if (is_addr) {
-                writew(tf->feature, ioaddr->feature_addr);
+                writew(tf->feature, (void __iomem *) ioaddr->feature_addr);
-                writew(tf->nsect, ioaddr->nsect_addr);
+                writew(tf->nsect, (void __iomem *) ioaddr->nsect_addr);
-                writew(tf->lbal, ioaddr->lbal_addr);
+                writew(tf->lbal, (void __iomem *) ioaddr->lbal_addr);
-                writew(tf->lbam, ioaddr->lbam_addr);
+                writew(tf->lbam, (void __iomem *) ioaddr->lbam_addr);
-                writew(tf->lbah, ioaddr->lbah_addr);
+                writew(tf->lbah, (void __iomem *) ioaddr->lbah_addr);
        }
        if (tf->flags & ATA_TFLAG_DEVICE)
-                writeb(tf->device, ioaddr->device_addr);
+                writeb(tf->device, (void __iomem *) ioaddr->device_addr);
        ata_wait_idle(ap);
 }
@@ -175,12 +180,12 @@ static void vsc_sata_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
        u16 nsect, lbal, lbam, lbah, feature;
        tf->command = ata_check_status(ap);
-        tf->device = readw(ioaddr->device_addr);
+        tf->device = readw((void __iomem *) ioaddr->device_addr);
-        feature = readw(ioaddr->error_addr);
+        feature = readw((void __iomem *) ioaddr->error_addr);
-        nsect = readw(ioaddr->nsect_addr);
+        nsect = readw((void __iomem *) ioaddr->nsect_addr);
-        lbal = readw(ioaddr->lbal_addr);
+        lbal = readw((void __iomem *) ioaddr->lbal_addr);
-        lbam = readw(ioaddr->lbam_addr);
+        lbam = readw((void __iomem *) ioaddr->lbam_addr);
-        lbah = readw(ioaddr->lbah_addr);
+        lbah = readw((void __iomem *) ioaddr->lbah_addr);
        tf->feature = feature;
        tf->nsect = nsect;
@@ -327,8 +332,8 @@ static void __devinit vsc_sata_setup_port(struct ata_ioports *port, unsigned lon
        port->ctl_addr          = base + VSC_SATA_TF_CTL_OFFSET;
        port->bmdma_addr        = base + VSC_SATA_DMA_CMD_OFFSET;
        port->scr_addr          = base + VSC_SATA_SCR_STATUS_OFFSET;
-        writel(0, base + VSC_SATA_UP_DESCRIPTOR_OFFSET);
+        writel(0, (void __iomem *) base + VSC_SATA_UP_DESCRIPTOR_OFFSET);
-        writel(0, base + VSC_SATA_UP_DATA_BUFFER_OFFSET);
+        writel(0, (void __iomem *) base + VSC_SATA_UP_DATA_BUFFER_OFFSET);
 }
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index e19ba4ebcd4e..68592c336011 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -49,6 +49,7 @@
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/vio.h>
+#include <asm/firmware.h>
 MODULE_DESCRIPTION("iSeries Virtual DASD");
 MODULE_AUTHOR("Dave Boutcher");
@@ -769,6 +770,11 @@ static int __init viodasd_init(void)
 {
        int rc;
+        if (!firmware_has_feature(FW_FEATURE_ISERIES)) {
+                rc = -ENODEV;
+                goto early_fail;
+        }
        /* Try to open to our host lp */
        if (viopath_hostLp == HvLpIndexInvalid)
                vio_set_hostlp();
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c
index fdea58ae16b2..aeefec97fdee 100644
--- a/drivers/bluetooth/hci_usb.c
+++ b/drivers/bluetooth/hci_usb.c
@@ -126,6 +126,7 @@ static struct usb_device_id blacklist_ids[] = {
        /* Kensington Bluetooth USB adapter */
        { USB_DEVICE(0x047d, 0x105d), .driver_info = HCI_RESET },
+        { USB_DEVICE(0x047d, 0x105e), .driver_info = HCI_WRONG_SCO_MTU },
        /* ISSC Bluetooth Adapter v3.1 */
        { USB_DEVICE(0x1131, 0x1001), .driver_info = HCI_RESET },
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 54ca931e19ea..93fbf84dcc4a 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -47,6 +47,7 @@
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/vio.h>
+#include <asm/firmware.h>
 #define VIOCD_DEVICE                    "iseries/vcd"
@@ -748,6 +749,9 @@ static int __init viocd_init(void)
        struct proc_dir_entry *e;
        int ret = 0;
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
        if (viopath_hostLp == HvLpIndexInvalid) {
                vio_set_hostlp();
                /* If we don't have a host, bail out */
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index 0bbb04f2390f..6dcdceb81203 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -561,8 +561,7 @@ struct drm_driver {
        int (*context_dtor) (struct drm_device * dev, int context);
        int (*kernel_context_switch) (struct drm_device * dev, int old,
                                      int new);
-        void (*kernel_context_switch_unlock) (struct drm_device * dev,
+        void (*kernel_context_switch_unlock) (struct drm_device * dev);
-                                              drm_lock_t *lock);
        int (*vblank_wait) (struct drm_device * dev, unsigned int *sequence);
        int (*vblank_wait2) (struct drm_device * dev, unsigned int *sequence);
        int (*dri_library_name) (struct drm_device *dev, char *buf);
@@ -1143,9 +1142,5 @@ extern void *drm_calloc(size_t nmemb, size_t size, int area);
 extern unsigned long drm_core_get_map_ofs(drm_map_t * map);
 extern unsigned long drm_core_get_reg_ofs(struct drm_device *dev);
-#ifndef pci_pretty_name
-#define pci_pretty_name(dev) ""
-#endif
 #endif                          /* __KERNEL__ */
 #endif
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index 116ed0f2ac09..e9993ba461a2 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -182,7 +182,7 @@ int drm_unlock(struct inode *inode, struct file *filp,
         * modules but is required by the Sparc driver.
         */
        if (dev->driver->kernel_context_switch_unlock)
-                dev->driver->kernel_context_switch_unlock(dev, &lock);
+                dev->driver->kernel_context_switch_unlock(dev);
        else {
                drm_lock_transfer(dev, &dev->lock.hw_lock->lock,
                                  DRM_KERNEL_CONTEXT);
diff --git a/drivers/char/drm/drm_stub.c b/drivers/char/drm/drm_stub.c
index 5fd6dc0870cf..120d10256feb 100644
--- a/drivers/char/drm/drm_stub.c
+++ b/drivers/char/drm/drm_stub.c
@@ -211,14 +211,16 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
        if (!dev)
                return -ENOMEM;
-        pci_enable_device(pdev);
+        ret = pci_enable_device(pdev);
+        if (ret)
+                goto err_g1;
        if ((ret = drm_fill_in_dev(dev, pdev, ent, driver))) {
                printk(KERN_ERR "DRM: Fill_in_dev failed.\n");
-                goto err_g1;
+                goto err_g2;
        }
        if ((ret = drm_get_head(dev, &dev->primary)))
-                goto err_g1;
+                goto err_g2;
        
        DRM_INFO("Initialized %s %d.%d.%d %s on minor %d\n",
                 driver->name, driver->major, driver->minor, driver->patchlevel,
@@ -226,7 +228,9 @@ int drm_get_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
        return 0;
-      err_g1:
+err_g2:
+        pci_disable_device(pdev);
+err_g1:
        drm_free(dev, sizeof(*dev), DRM_MEM_STUB);
        return ret;
 }
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
index ba4b8de83cf0..cc8e2ebe128c 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -45,8 +45,8 @@ struct class *drm_sysfs_create(struct module *owner, char *name)
        int err;
        class = class_create(owner, name);
-        if (!class) {
+        if (IS_ERR(class)) {
-                err = -ENOMEM;
+                err = PTR_ERR(class);
                goto err_out;
        }
@@ -113,8 +113,8 @@ struct class_device *drm_sysfs_device_add(struct class *cs, drm_head_t *head)
                                        MKDEV(DRM_MAJOR, head->minor),
                                        &(head->dev->pdev)->dev,
                                        "card%d", head->minor);
-        if (!class_dev) {
+        if (IS_ERR(class_dev)) {
-                err = -ENOMEM;
+                err = PTR_ERR(class_dev);
                goto err_out;
        }
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index e5463b111fc0..e2c4b3a41b1e 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -46,88 +46,167 @@ static void i915_vblank_tasklet(drm_device_t *dev)
 {
        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
        unsigned long irqflags;
-        struct list_head *list, *tmp;
+        struct list_head *list, *tmp, hits, *hit;
+        int nhits, nrects, slice[2], upper[2], lower[2], i;
+        unsigned counter[2] = { atomic_read(&dev->vbl_received),
+                                atomic_read(&dev->vbl_received2) };
+        drm_drawable_info_t *drw;
+        drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
+        u32 cpp = dev_priv->cpp;
+        u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
+                                XY_SRC_COPY_BLT_WRITE_ALPHA |
+                                XY_SRC_COPY_BLT_WRITE_RGB)
+                             : XY_SRC_COPY_BLT_CMD;
+        u32 pitchropcpp = (sarea_priv->pitch * cpp) | (0xcc << 16) |
+                          (cpp << 23) | (1 << 24);
+        RING_LOCALS;
        DRM_DEBUG("\n");
+        INIT_LIST_HEAD(&hits);
+        nhits = nrects = 0;
        spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
+        /* Find buffer swaps scheduled for this vertical blank */
        list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
                drm_i915_vbl_swap_t *vbl_swap =
                        list_entry(list, drm_i915_vbl_swap_t, head);
-                atomic_t *counter = vbl_swap->pipe ? &dev->vbl_received2 :
-                        &dev->vbl_received;
-                if ((atomic_read(counter) - vbl_swap->sequence) <= (1<<23)) {
-                        drm_drawable_info_t *drw;
-                        spin_unlock(&dev_priv->swaps_lock);
-                        spin_lock(&dev->drw_lock);
-                        drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
-                                
-                        if (drw) {
-                                int i, num_rects = drw->num_rects;
-                                drm_clip_rect_t *rect = drw->rects;
-                                drm_i915_sarea_t *sarea_priv =
-                                    dev_priv->sarea_priv;
-                                u32 cpp = dev_priv->cpp;
-                                u32 cmd = (cpp == 4) ? (XY_SRC_COPY_BLT_CMD |
-                                                        XY_SRC_COPY_BLT_WRITE_ALPHA |
-                                                        XY_SRC_COPY_BLT_WRITE_RGB)
-                                                     : XY_SRC_COPY_BLT_CMD;
-                                u32 pitchropcpp = (sarea_priv->pitch * cpp) |
-                                                  (0xcc << 16) | (cpp << 23) |
-                                                  (1 << 24);
-                                RING_LOCALS;
-                                i915_kernel_lost_context(dev);
-                                BEGIN_LP_RING(6);
-                                OUT_RING(GFX_OP_DRAWRECT_INFO);
-                                OUT_RING(0);
-                                OUT_RING(0);
-                                OUT_RING(sarea_priv->width |
-                                         sarea_priv->height << 16);
-                                OUT_RING(sarea_priv->width |
-                                         sarea_priv->height << 16);
-                                OUT_RING(0);
-                                ADVANCE_LP_RING();
+                if ((counter[vbl_swap->pipe] - vbl_swap->sequence) > (1<<23))
+                        continue;
+                list_del(list);
+                dev_priv->swaps_pending--;
-                                sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
+                spin_unlock(&dev_priv->swaps_lock);
+                spin_lock(&dev->drw_lock);
-                                for (i = 0; i < num_rects; i++, rect++) {
+                drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
-                                        BEGIN_LP_RING(8);
+                if (!drw) {
+                        spin_unlock(&dev->drw_lock);
+                        drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
+                        spin_lock(&dev_priv->swaps_lock);
+                        continue;
+                }
-                                        OUT_RING(cmd);
+                list_for_each(hit, &hits) {
-                                        OUT_RING(pitchropcpp);
+                        drm_i915_vbl_swap_t *swap_cmp =
-                                        OUT_RING((rect->y1 << 16) | rect->x1);
+                                list_entry(hit, drm_i915_vbl_swap_t, head);
-                                        OUT_RING((rect->y2 << 16) | rect->x2);
+                        drm_drawable_info_t *drw_cmp =
-                                        OUT_RING(sarea_priv->front_offset);
+                                drm_get_drawable_info(dev, swap_cmp->drw_id);
-                                        OUT_RING((rect->y1 << 16) | rect->x1);
-                                        OUT_RING(pitchropcpp & 0xffff);
-                                        OUT_RING(sarea_priv->back_offset);
-                                        ADVANCE_LP_RING();
+                        if (drw_cmp &&
-                                }
+                            drw_cmp->rects[0].y1 > drw->rects[0].y1) {
+                                list_add_tail(list, hit);
+                                break;
                        }
+                }
-                        spin_unlock(&dev->drw_lock);
+                spin_unlock(&dev->drw_lock);
-                        spin_lock(&dev_priv->swaps_lock);
+                /* List of hits was empty, or we reached the end of it */
+                if (hit == &hits)
+                        list_add_tail(list, hits.prev);
-                        list_del(list);
+                nhits++;
-                        drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
+                spin_lock(&dev_priv->swaps_lock);
+        }
+        if (nhits == 0) {
+                spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+                return;
+        }
+        spin_unlock(&dev_priv->swaps_lock);
-                        dev_priv->swaps_pending--;
+        i915_kernel_lost_context(dev);
+        BEGIN_LP_RING(6);
+        OUT_RING(GFX_OP_DRAWRECT_INFO);
+        OUT_RING(0);
+        OUT_RING(0);
+        OUT_RING(sarea_priv->width | sarea_priv->height << 16);
+        OUT_RING(sarea_priv->width | sarea_priv->height << 16);
+        OUT_RING(0);
+        ADVANCE_LP_RING();
+        sarea_priv->ctxOwner = DRM_KERNEL_CONTEXT;
+        upper[0] = upper[1] = 0;
+        slice[0] = max(sarea_priv->pipeA_h / nhits, 1);
+        slice[1] = max(sarea_priv->pipeB_h / nhits, 1);
+        lower[0] = sarea_priv->pipeA_y + slice[0];
+        lower[1] = sarea_priv->pipeB_y + slice[0];
+        spin_lock(&dev->drw_lock);
+        /* Emit blits for buffer swaps, partitioning both outputs into as many
+         * slices as there are buffer swaps scheduled in order to avoid tearing
+         * (based on the assumption that a single buffer swap would always
+         * complete before scanout starts).
+         */
+        for (i = 0; i++ < nhits;
+             upper[0] = lower[0], lower[0] += slice[0],
+             upper[1] = lower[1], lower[1] += slice[1]) {
+                if (i == nhits)
+                        lower[0] = lower[1] = sarea_priv->height;
+                list_for_each(hit, &hits) {
+                        drm_i915_vbl_swap_t *swap_hit =
+                                list_entry(hit, drm_i915_vbl_swap_t, head);
+                        drm_clip_rect_t *rect;
+                        int num_rects, pipe;
+                        unsigned short top, bottom;
+                        drw = drm_get_drawable_info(dev, swap_hit->drw_id);
+                        if (!drw)
+                                continue;
+                        rect = drw->rects;
+                        pipe = swap_hit->pipe;
+                        top = upper[pipe];
+                        bottom = lower[pipe];
+                        for (num_rects = drw->num_rects; num_rects--; rect++) {
+                                int y1 = max(rect->y1, top);
+                                int y2 = min(rect->y2, bottom);
+                                if (y1 >= y2)
+                                        continue;
+                                BEGIN_LP_RING(8);
+                                OUT_RING(cmd);
+                                OUT_RING(pitchropcpp);
+                                OUT_RING((y1 << 16) | rect->x1);
+                                OUT_RING((y2 << 16) | rect->x2);
+                                OUT_RING(sarea_priv->front_offset);
+                                OUT_RING((y1 << 16) | rect->x1);
+                                OUT_RING(pitchropcpp & 0xffff);
+                                OUT_RING(sarea_priv->back_offset);
+                                ADVANCE_LP_RING();
+                        }
                }
        }
-        spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+        spin_unlock_irqrestore(&dev->drw_lock, irqflags);
+        list_for_each_safe(hit, tmp, &hits) {
+                drm_i915_vbl_swap_t *swap_hit =
+                        list_entry(hit, drm_i915_vbl_swap_t, head);
+                list_del(hit);
+                drm_free(swap_hit, sizeof(*swap_hit), DRM_MEM_DRIVER);
+        }
 }
 irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
diff --git a/drivers/char/drm/r128_drm.h b/drivers/char/drm/r128_drm.h
index 5d835b006f55..6e8af313f2b4 100644
--- a/drivers/char/drm/r128_drm.h
+++ b/drivers/char/drm/r128_drm.h
@@ -1,7 +1,8 @@
 /* r128_drm.h -- Public header for the r128 driver -*- linux-c -*-
 * Created: Wed Apr  5 19:24:19 2000 by kevin@precisioninsight.com
 */
-/* Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
+/*
+ * Copyright 2000 Precision Insight, Inc., Cedar Park, Texas.
 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
 * All rights reserved.
 *
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index 94abffb2cca5..f1efb49de8df 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -1,7 +1,8 @@
 /* r128_drv.h -- Private header for r128 driver -*- linux-c -*-
 * Created: Mon Dec 13 09:51:11 1999 by faith@precisioninsight.com
 */
-/* Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+/*
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
 * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
 * All rights reserved.
 *
diff --git a/drivers/char/drm/r128_state.c b/drivers/char/drm/r128_state.c
index a080cdd6081e..17b11e7d8f32 100644
--- a/drivers/char/drm/r128_state.c
+++ b/drivers/char/drm/r128_state.c
@@ -1,7 +1,8 @@
 /* r128_state.c -- State support for r128 -*- linux-c -*-
 * Created: Thu Jan 27 02:53:43 2000 by gareth@valinux.com
 */
-/* Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
+/*
+ * Copyright 2000 VA Linux Systems, Inc., Sunnyvale, California.
 * All Rights Reserved.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index d14477ba3679..032a022ec6a8 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -242,26 +242,6 @@ static __inline__ int r300_check_range(unsigned reg, int count)
        return 0;
 }
-/*
- * we expect offsets passed to the framebuffer to be either within video 
- * memory or within AGP space 
- */
-static __inline__ int r300_check_offset(drm_radeon_private_t *dev_priv,
-                                        u32 offset)
-{
-        /* we realy want to check against end of video aperture
-           but this value is not being kept.
-           This code is correct for now (does the same thing as the
-           code that sets MC_FB_LOCATION) in radeon_cp.c */
-        if (offset >= dev_priv->fb_location &&
-            offset < (dev_priv->fb_location + dev_priv->fb_size))
-                return 0;
-        if (offset >= dev_priv->gart_vm_start &&
-            offset < (dev_priv->gart_vm_start + dev_priv->gart_size))
-                return 0;
-        return 1;
-}
 static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t *
                                                          dev_priv,
                                                          drm_radeon_kcmd_buffer_t
@@ -290,7 +270,7 @@ static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t *
                case MARK_SAFE:
                        break;
                case MARK_CHECK_OFFSET:
-                        if (r300_check_offset(dev_priv, (u32) values[i])) {
+                        if (!radeon_check_offset(dev_priv, (u32) values[i])) {
                                DRM_ERROR
                                    ("Offset failed range check (reg=%04x sz=%d)\n",
                                     reg, sz);
@@ -452,7 +432,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
        i = 1;
        while ((k < narrays) && (i < (count + 1))) {
                i++;            /* skip attribute field */
-                if (r300_check_offset(dev_priv, payload[i])) {
+                if (!radeon_check_offset(dev_priv, payload[i])) {
                        DRM_ERROR
                            ("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n",
                             k, i);
@@ -463,7 +443,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
                if (k == narrays)
                        break;
                /* have one more to process, they come in pairs */
-                if (r300_check_offset(dev_priv, payload[i])) {
+                if (!radeon_check_offset(dev_priv, payload[i])) {
                        DRM_ERROR
                            ("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n",
                             k, i);
@@ -508,7 +488,7 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
                if (cmd[1] & (RADEON_GMC_SRC_PITCH_OFFSET_CNTL 
                              | RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
                        offset = cmd[2] << 10;
-                        ret = r300_check_offset(dev_priv, offset);
+                        ret = !radeon_check_offset(dev_priv, offset);
                        if (ret) {
                                DRM_ERROR("Invalid bitblt first offset is %08X\n", offset);
                                return DRM_ERR(EINVAL);
@@ -518,7 +498,7 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
                if ((cmd[1] & RADEON_GMC_SRC_PITCH_OFFSET_CNTL) &&
                    (cmd[1] & RADEON_GMC_DST_PITCH_OFFSET_CNTL)) {
                        offset = cmd[3] << 10;
-                        ret = r300_check_offset(dev_priv, offset);
+                        ret = !radeon_check_offset(dev_priv, offset);
                        if (ret) {
                                DRM_ERROR("Invalid bitblt second offset is %08X\n", offset);
                                return DRM_ERR(EINVAL);
@@ -551,7 +531,7 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
                DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
                return DRM_ERR(EINVAL);
        }
-        ret = r300_check_offset(dev_priv, cmd[2]);
+        ret = !radeon_check_offset(dev_priv, cmd[2]);
        if (ret) {
                DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
                return DRM_ERR(EINVAL);
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index f45cd7f147a5..8b105f1460a7 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/drivers/char/drm/radeon_drv.h
@@ -303,6 +303,21 @@ extern int radeon_no_wb;
 extern drm_ioctl_desc_t radeon_ioctls[];
 extern int radeon_max_ioctl;
+/* Check whether the given hardware address is inside the framebuffer or the
+ * GART area.
+ */
+static __inline__ int radeon_check_offset(drm_radeon_private_t *dev_priv,
+                                          u64 off)
+{
+        u32 fb_start = dev_priv->fb_location;
+        u32 fb_end = fb_start + dev_priv->fb_size - 1;
+        u32 gart_start = dev_priv->gart_vm_start;
+        u32 gart_end = gart_start + dev_priv->gart_size - 1;
+        return ((off >= fb_start && off <= fb_end) ||
+                (off >= gart_start && off <= gart_end));
+}
                                /* radeon_cp.c */
 extern int radeon_cp_init(DRM_IOCTL_ARGS);
 extern int radeon_cp_start(DRM_IOCTL_ARGS);
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index d60519de887b..3ff0baa2fbfa 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -1,5 +1,5 @@
-/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*-
+/* radeon_irq.c -- IRQ handling for radeon -*- linux-c -*- */
- *
+/*
 * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
 *
 * The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c
index 030a6fad0d86..517cad8b6e3a 100644
--- a/drivers/char/drm/radeon_mem.c
+++ b/drivers/char/drm/radeon_mem.c
@@ -1,5 +1,5 @@
-/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*-
+/* radeon_mem.c -- Simple GART/fb memory manager for radeon -*- linux-c -*- */
- *
+/*
 * Copyright (C) The Weather Channel, Inc.  2002.  All Rights Reserved.
 *
 * The Weather Channel (TM) funded Tungsten Graphics to develop the
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 6e04fdd732ac..938eccb78cc0 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -43,10 +43,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
                                                    u32 *offset)
 {
        u64 off = *offset;
-        u32 fb_start = dev_priv->fb_location;
+        u32 fb_end = dev_priv->fb_location + dev_priv->fb_size - 1;
-        u32 fb_end = fb_start + dev_priv->fb_size - 1;
-        u32 gart_start = dev_priv->gart_vm_start;
-        u32 gart_end = gart_start + dev_priv->gart_size - 1;
        struct drm_radeon_driver_file_fields *radeon_priv;
        /* Hrm ... the story of the offset ... So this function converts
@@ -66,8 +63,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
        /* First, the best case, the offset already lands in either the
         * framebuffer or the GART mapped space
         */
-        if ((off >= fb_start && off <= fb_end) ||
+        if (radeon_check_offset(dev_priv, off))
-            (off >= gart_start && off <= gart_end))
                return 0;
        /* Ok, that didn't happen... now check if we have a zero based
@@ -81,11 +77,10 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
        /* Finally, assume we aimed at a GART offset if beyond the fb */
        if (off > fb_end)
-                off = off - fb_end - 1 + gart_start;
+                off = off - fb_end - 1 + dev_priv->gart_vm_start;
        /* Now recheck and fail if out of bounds */
-        if ((off >= fb_start && off <= fb_end) ||
+        if (radeon_check_offset(dev_priv, off)) {
-            (off >= gart_start && off <= gart_end)) {
                DRM_DEBUG("offset fixed up to 0x%x\n", (unsigned int)off);
                *offset = off;
                return 0;
diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c
index a9a84f88df5e..b94fab556809 100644
--- a/drivers/char/drm/savage_bci.c
+++ b/drivers/char/drm/savage_bci.c
@@ -963,8 +963,8 @@ static int savage_bci_event_emit(DRM_IOCTL_ARGS)
        event.count = savage_bci_emit_event(dev_priv, event.flags);
        event.count |= dev_priv->event_wrap << 16;
-        DRM_COPY_TO_USER_IOCTL(&((drm_savage_event_emit_t __user *) data)->
+        DRM_COPY_TO_USER_IOCTL((drm_savage_event_emit_t __user *) data,
-                               count, event.count, sizeof(event.count));
+                               event, sizeof(event));
        return 0;
 }
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c
index 0e0da443cbd5..8de6b95aeb84 100644
--- a/drivers/char/viocons.c
+++ b/drivers/char/viocons.c
@@ -42,6 +42,7 @@
 #include <linux/tty_flip.h>
 #include <linux/sysrq.h>
+#include <asm/firmware.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
 #include <asm/iseries/hv_call_event.h>
@@ -1060,6 +1061,9 @@ static int __init viocons_init2(void)
        atomic_t wait_flag;
        int rc;
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
        /* +2 for fudge */
        rc = viopath_open(HvLpConfig_getPrimaryLpIndex(),
                        viomajorsubtype_chario, VIOCHAR_WINDOW + 2);
@@ -1145,6 +1149,9 @@ static int __init viocons_init(void)
 {
        int i;
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
        printk(VIOCONS_KERN_INFO "registering console\n");
        for (i = 0; i < VTTY_PORTS; i++) {
                port_info[i].lp = HvLpIndexInvalid;
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 94d79cb8ce8d..9438512b17f1 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -49,7 +49,7 @@
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
+#include <asm/firmware.h>
 #include <asm/vio.h>
 #include <asm/iseries/vio.h>
 #include <asm/iseries/hv_lp_event.h>
@@ -997,6 +997,9 @@ int __init viotap_init(void)
        int ret;
        struct proc_dir_entry *e;
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
        op_struct_list = NULL;
        if ((ret = add_op_structs(VIOTAPE_MAXREQ)) < 0) {
                printk(VIOTAPE_KERN_WARN "couldn't allocate op structs\n");
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index b418b16e910e..296f51002b55 100644
--- a/drivers/connector/cn_queue.c
+++ b/drivers/connector/cn_queue.c
@@ -34,7 +34,7 @@
 void cn_queue_wrapper(struct work_struct *work)
 {
        struct cn_callback_entry *cbq =
-                container_of(work, struct cn_callback_entry, work.work);
+                container_of(work, struct cn_callback_entry, work);
        struct cn_callback_data *d = &cbq->data;
        d->callback(d->callback_priv);
@@ -59,13 +59,12 @@ static struct cn_callback_entry *cn_queue_alloc_callback_entry(char *name, struc
        memcpy(&cbq->id.id, id, sizeof(struct cb_id));
        cbq->data.callback = callback;
        
-        INIT_DELAYED_WORK(&cbq->work, &cn_queue_wrapper);
+        INIT_WORK(&cbq->work, &cn_queue_wrapper);
        return cbq;
 }
 static void cn_queue_free_callback(struct cn_callback_entry *cbq)
 {
-        cancel_delayed_work(&cbq->work);
        flush_workqueue(cbq->pdev->cn_queue);
        kfree(cbq);
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 5e7cd45d10ee..a44db75bc25b 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -135,17 +135,15 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
        spin_lock_bh(&dev->cbdev->queue_lock);
        list_for_each_entry(__cbq, &dev->cbdev->queue_list, callback_entry) {
                if (cn_cb_equal(&__cbq->id.id, &msg->id)) {
-                        if (likely(!test_bit(WORK_STRUCT_PENDING,
+                        if (likely(!work_pending(&__cbq->work) &&
-                                             &__cbq->work.work.management) &&
                                        __cbq->data.ddata == NULL)) {
                                __cbq->data.callback_priv = msg;
                                __cbq->data.ddata = data;
                                __cbq->data.destruct_data = destruct_data;
-                                if (queue_delayed_work(
+                                if (queue_work(dev->cbdev->cn_queue,
-                                            dev->cbdev->cn_queue,
+                                                        &__cbq->work))
-                                            &__cbq->work, 0))
                                        err = 0;
                        } else {
                                struct cn_callback_data *d;
@@ -159,12 +157,11 @@ static int cn_call_callback(struct cn_msg *msg, void (*destruct_data)(void *), v
                                        d->destruct_data = destruct_data;
                                        d->free = __cbq;
-                                        INIT_DELAYED_WORK(&__cbq->work,
+                                        INIT_WORK(&__cbq->work,
-                                                          &cn_queue_wrapper);
+                                                        &cn_queue_wrapper);
                                        
-                                        if (queue_delayed_work(
+                                        if (queue_work(dev->cbdev->cn_queue,
-                                                    dev->cbdev->cn_queue,
+                                                    &__cbq->work))
-                                                    &__cbq->work, 0))
                                                err = 0;
                                        else {
                                                kfree(__cbq);
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 14cdf09316ce..998638020ea0 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -415,12 +415,31 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                case 0x000: goto ignore;
                                case 0x034: map_key_clear(KEY_SLEEP);           break;
                                case 0x036: map_key_clear(BTN_MISC);            break;
+                                case 0x040: map_key_clear(KEY_MENU);            break;
                                case 0x045: map_key_clear(KEY_RADIO);           break;
+                                case 0x088: map_key_clear(KEY_PC);              break;
+                                case 0x089: map_key_clear(KEY_TV);              break;
                                case 0x08a: map_key_clear(KEY_WWW);             break;
+                                case 0x08b: map_key_clear(KEY_DVD);             break;
+                                case 0x08c: map_key_clear(KEY_PHONE);           break;
                                case 0x08d: map_key_clear(KEY_PROGRAM);         break;
+                                case 0x08e: map_key_clear(KEY_VIDEOPHONE);      break;
+                                case 0x08f: map_key_clear(KEY_GAMES);           break;
+                                case 0x090: map_key_clear(KEY_MEMO);            break;
+                                case 0x091: map_key_clear(KEY_CD);              break;
+                                case 0x092: map_key_clear(KEY_VCR);             break;
+                                case 0x093: map_key_clear(KEY_TUNER);           break;
+                                case 0x094: map_key_clear(KEY_EXIT);            break;
                                case 0x095: map_key_clear(KEY_HELP);            break;
+                                case 0x096: map_key_clear(KEY_TAPE);            break;
+                                case 0x097: map_key_clear(KEY_TV2);             break;
+                                case 0x098: map_key_clear(KEY_SAT);             break;
                                case 0x09c: map_key_clear(KEY_CHANNELUP);       break;
                                case 0x09d: map_key_clear(KEY_CHANNELDOWN);     break;
+                                case 0x0a0: map_key_clear(KEY_VCR2);            break;
                                case 0x0b0: map_key_clear(KEY_PLAY);            break;
                                case 0x0b1: map_key_clear(KEY_PAUSE);           break;
                                case 0x0b2: map_key_clear(KEY_RECORD);          break;
@@ -430,6 +449,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                case 0x0b6: map_key_clear(KEY_PREVIOUSSONG);    break;
                                case 0x0b7: map_key_clear(KEY_STOPCD);          break;
                                case 0x0b8: map_key_clear(KEY_EJECTCD);         break;
                                case 0x0cd: map_key_clear(KEY_PLAYPAUSE);       break;
                                case 0x0e0: map_abs_clear(ABS_VOLUME);          break;
                                case 0x0e2: map_key_clear(KEY_MUTE);            break;
@@ -437,11 +457,30 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                case 0x0e9: map_key_clear(KEY_VOLUMEUP);        break;
                                case 0x0ea: map_key_clear(KEY_VOLUMEDOWN);      break;
                                case 0x183: map_key_clear(KEY_CONFIG);          break;
+                                case 0x184: map_key_clear(KEY_WORDPROCESSOR);   break;
+                                case 0x185: map_key_clear(KEY_EDITOR);          break;
+                                case 0x186: map_key_clear(KEY_SPREADSHEET);     break;
+                                case 0x187: map_key_clear(KEY_GRAPHICSEDITOR);  break;
+                                case 0x188: map_key_clear(KEY_PRESENTATION);    break;
+                                case 0x189: map_key_clear(KEY_DATABASE);        break;
                                case 0x18a: map_key_clear(KEY_MAIL);            break;
+                                case 0x18b: map_key_clear(KEY_NEWS);            break;
+                                case 0x18c: map_key_clear(KEY_VOICEMAIL);       break;
+                                case 0x18d: map_key_clear(KEY_ADDRESSBOOK);     break;
+                                case 0x18e: map_key_clear(KEY_CALENDAR);        break;
+                                case 0x191: map_key_clear(KEY_FINANCE);         break;
                                case 0x192: map_key_clear(KEY_CALC);            break;
                                case 0x194: map_key_clear(KEY_FILE);            break;
+                                case 0x196: map_key_clear(KEY_WWW);             break;
+                                case 0x19e: map_key_clear(KEY_COFFEE);          break;
+                                case 0x1a6: map_key_clear(KEY_HELP);            break;
                                case 0x1a7: map_key_clear(KEY_DOCUMENTS);       break;
+                                case 0x1bc: map_key_clear(KEY_MESSENGER);       break;
+                                case 0x1bd: map_key_clear(KEY_INFO);            break;
                                case 0x201: map_key_clear(KEY_NEW);             break;
+                                case 0x202: map_key_clear(KEY_OPEN);            break;
+                                case 0x203: map_key_clear(KEY_CLOSE);           break;
+                                case 0x204: map_key_clear(KEY_EXIT);            break;
                                case 0x207: map_key_clear(KEY_SAVE);            break;
                                case 0x208: map_key_clear(KEY_PRINT);           break;
                                case 0x209: map_key_clear(KEY_PROPS);           break;
@@ -456,10 +495,15 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                                case 0x226: map_key_clear(KEY_STOP);            break;
                                case 0x227: map_key_clear(KEY_REFRESH);         break;
                                case 0x22a: map_key_clear(KEY_BOOKMARKS);       break;
+                                case 0x22d: map_key_clear(KEY_ZOOMIN);          break;
+                                case 0x22e: map_key_clear(KEY_ZOOMOUT);         break;
+                                case 0x22f: map_key_clear(KEY_ZOOMRESET);       break;
                                case 0x233: map_key_clear(KEY_SCROLLUP);        break;
                                case 0x234: map_key_clear(KEY_SCROLLDOWN);      break;
                                case 0x238: map_rel(REL_HWHEEL);                break;
+                                case 0x25f: map_key_clear(KEY_CANCEL);          break;
                                case 0x279: map_key_clear(KEY_REDO);            break;
                                case 0x289: map_key_clear(KEY_REPLY);           break;
                                case 0x28b: map_key_clear(KEY_FORWARDMAIL);     break;
                                case 0x28c: map_key_clear(KEY_SEND);            break;
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index d55b938b1aeb..ffdffb6379ef 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -368,7 +368,6 @@ static struct pci_device_id atiixp_pci_tbl[] = {
        { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
        { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-        { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, PCI_ANY_ID, PCI_ANY_ID, (PCI_CLASS_STORAGE_IDE<<8)|0x8a, 0xffff05, 1},
        { 0, },
 };
 MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 7d824cf8ee2d..ada5e9b9988c 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -57,8 +57,8 @@
 #define DRV_MODULE_NAME         "bnx2"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "1.5.1"
+#define DRV_MODULE_VERSION      "1.5.2"
-#define DRV_MODULE_RELDATE      "November 15, 2006"
+#define DRV_MODULE_RELDATE      "December 13, 2006"
 #define RUN_AT(x) (jiffies + (x))
@@ -217,9 +217,16 @@ static inline u32 bnx2_tx_avail(struct bnx2 *bp)
        u32 diff;
        smp_mb();
-        diff = TX_RING_IDX(bp->tx_prod) - TX_RING_IDX(bp->tx_cons);
-        if (diff > MAX_TX_DESC_CNT)
+        /* The ring uses 256 indices for 255 entries, one of them
-                diff = (diff & MAX_TX_DESC_CNT) - 1;
+         * needs to be skipped.
+         */
+        diff = bp->tx_prod - bp->tx_cons;
+        if (unlikely(diff >= TX_DESC_CNT)) {
+                diff &= 0xffff;
+                if (diff == TX_DESC_CNT)
+                        diff = MAX_TX_DESC_CNT;
+        }
        return (bp->tx_ring_size - diff);
 }
@@ -3089,7 +3096,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,
        if ((align_start = (offset32 & 3))) {
                offset32 &= ~3;
-                len32 += align_start;
+                len32 += (4 - align_start);
                if ((rc = bnx2_nvram_read(bp, offset32, start, 4)))
                        return rc;
        }
@@ -3107,7 +3114,7 @@ bnx2_nvram_write(struct bnx2 *bp, u32 offset, u8 *data_buf,
        if (align_start || align_end) {
                buf = kmalloc(len32, GFP_KERNEL);
-                if (buf == 0)
+                if (buf == NULL)
                        return -ENOMEM;
                if (align_start) {
                        memcpy(buf, start, 4);
@@ -3998,7 +4005,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
        if (!skb)
                return -ENOMEM;
        packet = skb_put(skb, pkt_size);
-        memcpy(packet, bp->mac_addr, 6);
+        memcpy(packet, bp->dev->dev_addr, 6);
        memset(packet + 6, 0x0, 8);
        for (i = 14; i < pkt_size; i++)
                packet[i] = (unsigned char) (i & 0xff);
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index d6f4f185bf37..2194b567239f 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -73,7 +73,7 @@
 #include <asm/abs_addr.h>
 #include <asm/iseries/mf.h>
 #include <asm/uaccess.h>
+#include <asm/firmware.h>
 #include <asm/iseries/hv_lp_config.h>
 #include <asm/iseries/hv_types.h>
 #include <asm/iseries/hv_lp_event.h>
@@ -1668,7 +1668,7 @@ static struct vio_driver veth_driver = {
 * Module initialization/cleanup
 */
-void __exit veth_module_cleanup(void)
+static void __exit veth_module_cleanup(void)
 {
        int i;
        struct veth_lpar_connection *cnx;
@@ -1697,11 +1697,14 @@ void __exit veth_module_cleanup(void)
 }
 module_exit(veth_module_cleanup);
-int __init veth_module_init(void)
+static int __init veth_module_init(void)
 {
        int i;
        int rc;
+        if (!firmware_has_feature(FW_FEATURE_ISERIES))
+                return -ENODEV;
        this_lp = HvLpConfig_getLpIndex_outline();
        for (i = 0; i < HVMAXARCHITECTEDLPS; ++i) {
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 571320ae87ab..4056ba1ff3c7 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.70"
+#define DRV_MODULE_VERSION      "3.71"
-#define DRV_MODULE_RELDATE      "December 1, 2006"
+#define DRV_MODULE_RELDATE      "December 15, 2006"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -959,6 +959,13 @@ static int tg3_phy_reset(struct tg3 *tp)
        u32 phy_status;
        int err;
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
+                u32 val;
+                val = tr32(GRC_MISC_CFG);
+                tw32_f(GRC_MISC_CFG, val & ~GRC_MISC_CFG_EPHY_IDDQ);
+                udelay(40);
+        }
        err  = tg3_readphy(tp, MII_BMSR, &phy_status);
        err |= tg3_readphy(tp, MII_BMSR, &phy_status);
        if (err != 0)
@@ -1170,7 +1177,15 @@ static void tg3_power_down_phy(struct tg3 *tp)
        if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
                return;
-        if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5906) {
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
+                u32 val;
+                tg3_bmcr_reset(tp);
+                val = tr32(GRC_MISC_CFG);
+                tw32_f(GRC_MISC_CFG, val | GRC_MISC_CFG_EPHY_IDDQ);
+                udelay(40);
+                return;
+        } else {
                tg3_writephy(tp, MII_TG3_EXT_CTRL,
                             MII_TG3_EXT_CTRL_FORCE_LED_OFF);
                tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x01b2);
@@ -4426,7 +4441,7 @@ static void tg3_free_consistent(struct tg3 *tp)
 */
 static int tg3_alloc_consistent(struct tg3 *tp)
 {
-        tp->rx_std_buffers = kmalloc((sizeof(struct ring_info) *
+        tp->rx_std_buffers = kzalloc((sizeof(struct ring_info) *
                                      (TG3_RX_RING_SIZE +
                                       TG3_RX_JUMBO_RING_SIZE)) +
                                     (sizeof(struct tx_ring_info) *
@@ -4435,13 +4450,6 @@ static int tg3_alloc_consistent(struct tg3 *tp)
        if (!tp->rx_std_buffers)
                return -ENOMEM;
-        memset(tp->rx_std_buffers, 0,
-               (sizeof(struct ring_info) *
-                (TG3_RX_RING_SIZE +
-                 TG3_RX_JUMBO_RING_SIZE)) +
-               (sizeof(struct tx_ring_info) *
-                TG3_TX_RING_SIZE));
        tp->rx_jumbo_buffers = &tp->rx_std_buffers[TG3_RX_RING_SIZE];
        tp->tx_buffers = (struct tx_ring_info *)
                &tp->rx_jumbo_buffers[TG3_RX_JUMBO_RING_SIZE];
@@ -6988,6 +6996,8 @@ static int tg3_open(struct net_device *dev)
        struct tg3 *tp = netdev_priv(dev);
        int err;
+        netif_carrier_off(tp->dev);
        tg3_full_lock(tp, 0);
        err = tg3_set_power_state(tp, PCI_D0);
@@ -7981,6 +7991,10 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                tp->link_config.duplex = cmd->duplex;
        }
+        tp->link_config.orig_speed = tp->link_config.speed;
+        tp->link_config.orig_duplex = tp->link_config.duplex;
+        tp->link_config.orig_autoneg = tp->link_config.autoneg;
        if (netif_running(dev))
                tg3_setup_phy(tp, 1);
@@ -11923,6 +11937,8 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         */
        pci_save_state(tp->pdev);
+        pci_set_drvdata(pdev, dev);
        err = register_netdev(dev);
        if (err) {
                printk(KERN_ERR PFX "Cannot register net device, "
@@ -11930,8 +11946,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                goto err_out_iounmap;
        }
-        pci_set_drvdata(pdev, dev);
        printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] (%s) %s Ethernet ",
               dev->name,
               tp->board_part_number,
@@ -11962,8 +11976,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
               (pdev->dma_mask == DMA_32BIT_MASK) ? 32 :
                (((u64) pdev->dma_mask == DMA_40BIT_MASK) ? 40 : 64));
-        netif_carrier_off(tp->dev);
        return 0;
 err_out_iounmap:
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index dfaf4ed127bd..cf78a7e5997b 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -1350,6 +1350,7 @@
 #define  GRC_MISC_CFG_BOARD_ID_5788     0x00010000
 #define  GRC_MISC_CFG_BOARD_ID_5788M    0x00018000
 #define  GRC_MISC_CFG_BOARD_ID_AC91002A1 0x00018000
+#define  GRC_MISC_CFG_EPHY_IDDQ         0x00200000
 #define  GRC_MISC_CFG_KEEP_GPHY_POWER   0x04000000
 #define GRC_LOCAL_CTRL                  0x00006808
 #define  GRC_LCLCTRL_INT_ACTIVE         0x00000001
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 0b9d0db1590a..bd1faebf61a0 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -1682,7 +1682,7 @@ int __init acpiphp_glue_init(void)
 *
 * This function frees all data allocated in acpiphp_glue_init()
 */
-void __exit acpiphp_glue_exit(void)
+void  acpiphp_glue_exit(void)
 {
        acpi_pci_unregister_driver(&acpi_pci_hp_driver);
 }
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index b771196a654e..3009193f0058 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -47,21 +47,11 @@ static ssize_t location_read_file (struct hotplug_slot *php_slot, char *buf)
        return retval;
 }
-static struct hotplug_slot_attribute hotplug_slot_attr_location = {
+static struct hotplug_slot_attribute php_attr_location = {
        .attr = {.name = "phy_location", .mode = S_IFREG | S_IRUGO},
        .show = location_read_file,
 };
-static void rpaphp_sysfs_add_attr_location (struct hotplug_slot *slot)
-{
-        sysfs_create_file(&slot->kobj, &hotplug_slot_attr_location.attr);
-}
-static void rpaphp_sysfs_remove_attr_location (struct hotplug_slot *slot)
-{
-        sysfs_remove_file(&slot->kobj, &hotplug_slot_attr_location.attr);
-}
 /* free up the memory used by a slot */
 static void rpaphp_release_slot(struct hotplug_slot *hotplug_slot)
 {
@@ -145,7 +135,7 @@ int rpaphp_deregister_slot(struct slot *slot)
        list_del(&slot->rpaphp_slot_list);
        
        /* remove "phy_location" file */
-        rpaphp_sysfs_remove_attr_location(php_slot);
+        sysfs_remove_file(&php_slot->kobj, &php_attr_location.attr);
        retval = pci_hp_deregister(php_slot);
        if (retval)
@@ -160,36 +150,45 @@ EXPORT_SYMBOL_GPL(rpaphp_deregister_slot);
 int rpaphp_register_slot(struct slot *slot)
 {
+        struct hotplug_slot *php_slot = slot->hotplug_slot;
        int retval;
        dbg("%s registering slot:path[%s] index[%x], name[%s] pdomain[%x] type[%d]\n", 
                __FUNCTION__, slot->dn->full_name, slot->index, slot->name, 
                slot->power_domain, slot->type);
        /* should not try to register the same slot twice */
-        if (is_registered(slot)) { /* should't be here */
+        if (is_registered(slot)) {
                err("rpaphp_register_slot: slot[%s] is already registered\n", slot->name);
-                rpaphp_release_slot(slot->hotplug_slot);
+                retval = -EAGAIN;
-                return -EAGAIN;
+                goto register_fail;
        }       
-        retval = pci_hp_register(slot->hotplug_slot);
+        retval = pci_hp_register(php_slot);
        if (retval) {
                err("pci_hp_register failed with error %d\n", retval);
-                rpaphp_release_slot(slot->hotplug_slot);
+                goto register_fail;
-                return retval;
        }
-        
-        /* create "phy_locatoin" file */
-        rpaphp_sysfs_add_attr_location(slot->hotplug_slot);     
-        /* add slot to our internal list */
+        /* create "phy_location" file */
-        dbg("%s adding slot[%s] to rpaphp_slot_list\n",
+        retval = sysfs_create_file(&php_slot->kobj, &php_attr_location.attr);
-            __FUNCTION__, slot->name);
+        if (retval) {
+                err("sysfs_create_file failed with error %d\n", retval);
+                goto sysfs_fail;
+        }
+        /* add slot to our internal list */
        list_add(&slot->rpaphp_slot_list, &rpaphp_slot_head);
        info("Slot [%s](PCI location=%s) registered\n", slot->name,
                        slot->location);
        num_slots++;
        return 0;
+sysfs_fail:
+        pci_hp_deregister(php_slot);
+register_fail:
+        rpaphp_release_slot(php_slot);
+        return retval;
 }
 int rpaphp_get_power_status(struct slot *slot, u8 * value)
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index 50757695844f..3ca6a4f574b3 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -47,11 +47,17 @@ extern int shpchp_poll_time;
 extern int shpchp_debug;
 extern struct workqueue_struct *shpchp_wq;
-/*#define dbg(format, arg...) do { if (shpchp_debug) printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg); } while (0)*/
+#define dbg(format, arg...)                                             \
-#define dbg(format, arg...) do { if (shpchp_debug) printk("%s: " format, MY_NAME , ## arg); } while (0)
+        do {                                                            \
-#define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
+                if (shpchp_debug)                                       \
-#define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
+                        printk("%s: " format, MY_NAME , ## arg);        \
-#define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
+        } while (0)
+#define err(format, arg...)                                             \
+        printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
+#define info(format, arg...)                                            \
+        printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
+#define warn(format, arg...)                                            \
+        printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
 #define SLOT_NAME_SIZE 10
 struct slot {
@@ -83,34 +89,27 @@ struct event_info {
 struct controller {
        struct mutex crit_sect;         /* critical section mutex */
        struct mutex cmd_lock;          /* command lock */
-        struct php_ctlr_state_s *hpc_ctlr_handle; /* HPC controller handle */
        int num_slots;                  /* Number of slots on ctlr */
        int slot_num_inc;               /* 1 or -1 */
        struct pci_dev *pci_dev;
        struct list_head slot_list;
        struct hpc_ops *hpc_ops;
        wait_queue_head_t queue;        /* sleep & wake process */
-        u8 bus;
-        u8 device;
-        u8 function;
        u8 slot_device_offset;
-        u8 add_support;
        u32 pcix_misc2_reg;     /* for amd pogo errata */
-        enum pci_bus_speed speed;
        u32 first_slot;         /* First physical slot number */
-        u8 slot_bus;            /* Bus where the slots handled by this controller sit */
        u32 cap_offset;
        unsigned long mmio_base;
        unsigned long mmio_size;
+        void __iomem *creg;
+        struct timer_list poll_timer;
 };
 /* Define AMD SHPC ID  */
 #define PCI_DEVICE_ID_AMD_GOLAM_7450    0x7450 
 #define PCI_DEVICE_ID_AMD_POGO_7458     0x7458
 /* AMD PCIX bridge registers */
 #define PCIX_MEM_BASE_LIMIT_OFFSET      0x1C
 #define PCIX_MISCII_OFFSET              0x48
 #define PCIX_MISC_BRIDGE_ERRORS_OFFSET  0x80
@@ -145,8 +144,6 @@ struct controller {
 #define POWERON_STATE                   3
 #define POWEROFF_STATE                  4
-#define PCI_TO_PCI_BRIDGE_CLASS         0x00060400
 /* Error messages */
 #define INTERLOCK_OPEN                  0x00000002
 #define ADD_NOT_SUPPORTED               0x00000003
@@ -158,50 +155,32 @@ struct controller {
 #define WRONG_BUS_FREQUENCY             0x0000000D
 #define POWER_FAILURE                   0x0000000E
-#define REMOVE_NOT_SUPPORTED            0x00000003
-#define DISABLE_CARD                    1
-/*
- * error Messages
- */
-#define msg_initialization_err  "Initialization failure, error=%d\n"
-#define msg_button_on           "PCI slot #%s - powering on due to button press.\n"
-#define msg_button_off          "PCI slot #%s - powering off due to button press.\n"
-#define msg_button_cancel       "PCI slot #%s - action canceled due to button press.\n"
-/* sysfs functions for the hotplug controller info */
 extern int __must_check shpchp_create_ctrl_files(struct controller *ctrl);
+extern void shpchp_remove_ctrl_files(struct controller *ctrl);
-extern int      shpchp_sysfs_enable_slot(struct slot *slot);
+extern int shpchp_sysfs_enable_slot(struct slot *slot);
-extern int      shpchp_sysfs_disable_slot(struct slot *slot);
+extern int shpchp_sysfs_disable_slot(struct slot *slot);
+extern u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl);
-extern u8       shpchp_handle_attention_button(u8 hp_slot, void *inst_id);
+extern u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl);
-extern u8       shpchp_handle_switch_change(u8 hp_slot, void *inst_id);
+extern u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl);
-extern u8       shpchp_handle_presence_change(u8 hp_slot, void *inst_id);
+extern u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
-extern u8       shpchp_handle_power_fault(u8 hp_slot, void *inst_id);
+extern int shpchp_configure_device(struct slot *p_slot);
+extern int shpchp_unconfigure_device(struct slot *p_slot);
-/* pci functions */
+extern void cleanup_slots(struct controller *ctrl);
-extern int      shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num);
+extern void queue_pushbutton_work(struct work_struct *work);
-extern int      shpchp_configure_device(struct slot *p_slot);
+extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
-extern int      shpchp_unconfigure_device(struct slot *p_slot);
-extern void     shpchp_remove_ctrl_files(struct controller *ctrl);
-extern void     cleanup_slots(struct controller *ctrl);
-extern void     queue_pushbutton_work(struct work_struct *work);
 #ifdef CONFIG_ACPI
 static inline int get_hp_params_from_firmware(struct pci_dev *dev,
-                        struct hotplug_params *hpp)
+                                              struct hotplug_params *hpp)
 {
        if (ACPI_FAILURE(acpi_get_hp_params_from_firmware(dev->bus, hpp)))
                        return -ENODEV;
        return 0;
 }
-#define get_hp_hw_control_from_firmware(pdev) \
+#define get_hp_hw_control_from_firmware(pdev)                           \
-        do { \
+        do {                                                            \
-                if (DEVICE_ACPI_HANDLE(&(pdev->dev))) \
+                if (DEVICE_ACPI_HANDLE(&(pdev->dev)))                   \
-                        acpi_run_oshp(DEVICE_ACPI_HANDLE(&(pdev->dev))); \
+                        acpi_run_oshp(DEVICE_ACPI_HANDLE(&(pdev->dev)));\
        } while (0)
 #else
 #define get_hp_params_from_firmware(dev, hpp) (-ENODEV)
@@ -222,108 +201,40 @@ struct ctrl_reg {
        volatile u32 serr_loc;
        volatile u32 serr_intr_enable;
        volatile u32 slot1;
-        volatile u32 slot2;
-        volatile u32 slot3;
-        volatile u32 slot4;
-        volatile u32 slot5;
-        volatile u32 slot6;
-        volatile u32 slot7;
-        volatile u32 slot8;
-        volatile u32 slot9;
-        volatile u32 slot10;
-        volatile u32 slot11;
-        volatile u32 slot12;
 } __attribute__ ((packed));
 /* offsets to the controller registers based on the above structure layout */
 enum ctrl_offsets {
-        BASE_OFFSET =   offsetof(struct ctrl_reg, base_offset),
+        BASE_OFFSET      = offsetof(struct ctrl_reg, base_offset),
-        SLOT_AVAIL1 =   offsetof(struct ctrl_reg, slot_avail1),
+        SLOT_AVAIL1      = offsetof(struct ctrl_reg, slot_avail1),
-        SLOT_AVAIL2     =       offsetof(struct ctrl_reg, slot_avail2),
+        SLOT_AVAIL2      = offsetof(struct ctrl_reg, slot_avail2),
-        SLOT_CONFIG =   offsetof(struct ctrl_reg, slot_config),
+        SLOT_CONFIG      = offsetof(struct ctrl_reg, slot_config),
-        SEC_BUS_CONFIG =        offsetof(struct ctrl_reg, sec_bus_config),
+        SEC_BUS_CONFIG   = offsetof(struct ctrl_reg, sec_bus_config),
-        MSI_CTRL        =       offsetof(struct ctrl_reg, msi_ctrl),
+        MSI_CTRL         = offsetof(struct ctrl_reg, msi_ctrl),
-        PROG_INTERFACE =        offsetof(struct ctrl_reg, prog_interface),
+        PROG_INTERFACE   = offsetof(struct ctrl_reg, prog_interface),
-        CMD             =       offsetof(struct ctrl_reg, cmd),
+        CMD              = offsetof(struct ctrl_reg, cmd),
-        CMD_STATUS      =       offsetof(struct ctrl_reg, cmd_status),
+        CMD_STATUS       = offsetof(struct ctrl_reg, cmd_status),
-        INTR_LOC        =       offsetof(struct ctrl_reg, intr_loc),
+        INTR_LOC         = offsetof(struct ctrl_reg, intr_loc),
-        SERR_LOC        =       offsetof(struct ctrl_reg, serr_loc),
+        SERR_LOC         = offsetof(struct ctrl_reg, serr_loc),
-        SERR_INTR_ENABLE =      offsetof(struct ctrl_reg, serr_intr_enable),
+        SERR_INTR_ENABLE = offsetof(struct ctrl_reg, serr_intr_enable),
-        SLOT1 =         offsetof(struct ctrl_reg, slot1),
+        SLOT1            = offsetof(struct ctrl_reg, slot1),
-        SLOT2 =         offsetof(struct ctrl_reg, slot2),
-        SLOT3 =         offsetof(struct ctrl_reg, slot3),
-        SLOT4 =         offsetof(struct ctrl_reg, slot4),
-        SLOT5 =         offsetof(struct ctrl_reg, slot5),
-        SLOT6 =         offsetof(struct ctrl_reg, slot6),               
-        SLOT7 =         offsetof(struct ctrl_reg, slot7),
-        SLOT8 =         offsetof(struct ctrl_reg, slot8),
-        SLOT9 =         offsetof(struct ctrl_reg, slot9),
-        SLOT10 =        offsetof(struct ctrl_reg, slot10),
-        SLOT11 =        offsetof(struct ctrl_reg, slot11),
-        SLOT12 =        offsetof(struct ctrl_reg, slot12),
-};
-typedef u8(*php_intr_callback_t) (u8 hp_slot, void *instance_id);
-struct php_ctlr_state_s {
-        struct php_ctlr_state_s *pnext;
-        struct pci_dev *pci_dev;
-        unsigned int irq;
-        unsigned long flags;    /* spinlock's */
-        u32 slot_device_offset;
-        u32 num_slots;
-        struct timer_list       int_poll_timer; /* Added for poll event */
-        php_intr_callback_t attention_button_callback;
-        php_intr_callback_t switch_change_callback;
-        php_intr_callback_t presence_change_callback;
-        php_intr_callback_t power_fault_callback;
-        void *callback_instance_id;
-        void __iomem *creg;                     /* Ptr to controller register space */
 };
-/* Inline functions */
+static inline struct slot *get_slot(struct hotplug_slot *hotplug_slot)
-/* Inline functions to check the sanity of a pointer that is passed to us */
-static inline int slot_paranoia_check (struct slot *slot, const char *function)
-{
-        if (!slot) {
-                dbg("%s - slot == NULL", function);
-                return -1;
-        }
-        if (!slot->hotplug_slot) {
-                dbg("%s - slot->hotplug_slot == NULL!", function);
-                return -1;
-        }
-        return 0;
-}
-static inline struct slot *get_slot (struct hotplug_slot *hotplug_slot, const char *function)
 { 
-        struct slot *slot;
+        return hotplug_slot->private;
-        if (!hotplug_slot) {
-                dbg("%s - hotplug_slot == NULL\n", function);
-                return NULL;
-        }
-        slot = (struct slot *)hotplug_slot->private;
-        if (slot_paranoia_check (slot, function))
-                return NULL;
-        return slot;
 }
-static inline struct slot *shpchp_find_slot (struct controller *ctrl, u8 device)
+static inline struct slot *shpchp_find_slot(struct controller *ctrl, u8 device)
 {
        struct slot *slot;
-        if (!ctrl)
-                return NULL;
        list_for_each_entry(slot, &ctrl->slot_list, slot_list) {
                if (slot->device == device)
                        return slot;
        }
        err("%s: slot (device=0x%x) not found\n", __FUNCTION__, device);
        return NULL;
 }
@@ -400,44 +311,27 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)
        pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, pcix_misc2_temp);
 }
-enum php_ctlr_type {
-        PCI,
-        ISA,
-        ACPI
-};
-int shpc_init( struct controller *ctrl, struct pci_dev *pdev);
-int shpc_get_ctlr_slot_config( struct controller *ctrl,
-                int *num_ctlr_slots,
-                int *first_device_num,
-                int *physical_slot_num,
-                int *updown,
-                int *flags);
 struct hpc_ops {
-        int     (*power_on_slot )               (struct slot *slot);
+        int (*power_on_slot)(struct slot *slot);
-        int     (*slot_enable )                 (struct slot *slot);
+        int (*slot_enable)(struct slot *slot);
-        int     (*slot_disable )                (struct slot *slot);
+        int (*slot_disable)(struct slot *slot);
-        int     (*set_bus_speed_mode)   (struct slot *slot, enum pci_bus_speed speed);
+        int (*set_bus_speed_mode)(struct slot *slot, enum pci_bus_speed speed);
-        int     (*get_power_status)             (struct slot *slot, u8 *status);
+        int (*get_power_status)(struct slot *slot, u8 *status);
-        int     (*get_attention_status) (struct slot *slot, u8 *status);
+        int (*get_attention_status)(struct slot *slot, u8 *status);
-        int     (*set_attention_status) (struct slot *slot, u8 status);
+        int (*set_attention_status)(struct slot *slot, u8 status);
-        int     (*get_latch_status)             (struct slot *slot, u8 *status);
+        int (*get_latch_status)(struct slot *slot, u8 *status);
-        int     (*get_adapter_status)   (struct slot *slot, u8 *status);
+        int (*get_adapter_status)(struct slot *slot, u8 *status);
+        int (*get_max_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);
-        int     (*get_max_bus_speed)    (struct slot *slot, enum pci_bus_speed *speed);
+        int (*get_cur_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);
-        int     (*get_cur_bus_speed)    (struct slot *slot, enum pci_bus_speed *speed);
+        int (*get_adapter_speed)(struct slot *slot, enum pci_bus_speed *speed);
-        int     (*get_adapter_speed)    (struct slot *slot, enum pci_bus_speed *speed);
+        int (*get_mode1_ECC_cap)(struct slot *slot, u8 *mode);
-        int     (*get_mode1_ECC_cap)    (struct slot *slot, u8 *mode);
+        int (*get_prog_int)(struct slot *slot, u8 *prog_int);
-        int     (*get_prog_int)                 (struct slot *slot, u8 *prog_int);
+        int (*query_power_fault)(struct slot *slot);
+        void (*green_led_on)(struct slot *slot);
-        int     (*query_power_fault)    (struct slot *slot);
+        void (*green_led_off)(struct slot *slot);
-        void    (*green_led_on)         (struct slot *slot);
+        void (*green_led_blink)(struct slot *slot);
-        void    (*green_led_off)        (struct slot *slot);
+        void (*release_ctlr)(struct controller *ctrl);
-        void    (*green_led_blink)      (struct slot *slot);
+        int (*check_cmd_status)(struct controller *ctrl);
-        void    (*release_ctlr)         (struct controller *ctrl);
-        int (*check_cmd_status)         (struct controller *ctrl);
 };
 #endif                          /* _SHPCHP_H */
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c
index 4eac85b3d90e..590cd3cbe010 100644
--- a/drivers/pci/hotplug/shpchp_core.c
+++ b/drivers/pci/hotplug/shpchp_core.c
@@ -104,23 +104,6 @@ static void make_slot_name(struct slot *slot)
                 slot->bus, slot->number);
 }
-static int
-shpchprm_get_physical_slot_number(struct controller *ctrl, u32 *sun,
-                                u8 busnum, u8 devnum)
-{
-        int offset = devnum - ctrl->slot_device_offset;
-        dbg("%s: ctrl->slot_num_inc %d, offset %d\n", __FUNCTION__,
-                        ctrl->slot_num_inc, offset);
-        *sun = (u8) (ctrl->first_slot + ctrl->slot_num_inc *offset);
-        return 0;
-}
 static int init_slots(struct controller *ctrl)
 {
        struct slot *slot;
@@ -128,7 +111,6 @@ static int init_slots(struct controller *ctrl)
        struct hotplug_slot_info *info;
        int retval = -ENOMEM;
        int i;
-        u32 sun;
        for (i = 0; i < ctrl->num_slots; i++) {
                slot = kzalloc(sizeof(*slot), GFP_KERNEL);
@@ -149,16 +131,11 @@ static int init_slots(struct controller *ctrl)
                slot->hp_slot = i;
                slot->ctrl = ctrl;
-                slot->bus = ctrl->slot_bus;
+                slot->bus = ctrl->pci_dev->subordinate->number;
                slot->device = ctrl->slot_device_offset + i;
                slot->hpc_ops = ctrl->hpc_ops;
+                slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);
                mutex_init(&slot->lock);
-                if (shpchprm_get_physical_slot_number(ctrl, &sun,
-                                                      slot->bus, slot->device))
-                        goto error_info;
-                slot->number = sun;
                INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work);
                /* register this slot with the hotplug pci core */
@@ -211,42 +188,12 @@ void cleanup_slots(struct controller *ctrl)
        }
 }
-static int get_ctlr_slot_config(struct controller *ctrl)
-{
-        int num_ctlr_slots;
-        int first_device_num;
-        int physical_slot_num;
-        int updown;
-        int rc;
-        int flags;
-        rc = shpc_get_ctlr_slot_config(ctrl, &num_ctlr_slots,
-                                       &first_device_num, &physical_slot_num,
-                                       &updown, &flags);
-        if (rc) {
-                err("%s: get_ctlr_slot_config fail for b:d (%x:%x)\n",
-                    __FUNCTION__, ctrl->bus, ctrl->device);
-                return -1;
-        }
-        ctrl->num_slots = num_ctlr_slots;
-        ctrl->slot_device_offset = first_device_num;
-        ctrl->first_slot = physical_slot_num;
-        ctrl->slot_num_inc = updown;            /* either -1 or 1 */
-        dbg("%s: num_slot(0x%x) 1st_dev(0x%x) psn(0x%x) updown(%d) for b:d "
-            "(%x:%x)\n", __FUNCTION__, num_ctlr_slots, first_device_num,
-            physical_slot_num, updown, ctrl->bus, ctrl->device);
-        return 0;
-}
 /*
 * set_attention_status - Turns the Amber LED for a slot on, off or blink
 */
 static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -258,7 +205,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)
 static int enable_slot (struct hotplug_slot *hotplug_slot)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -267,7 +214,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot)
 static int disable_slot (struct hotplug_slot *hotplug_slot)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -276,7 +223,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot)
 static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        int retval;
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -290,7 +237,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)
 static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        int retval;
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -304,7 +251,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)
 static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        int retval;
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -318,7 +265,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)
 static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        int retval;
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -332,7 +279,7 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)
 static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        struct pci_bus *bus = slot->ctrl->pci_dev->subordinate;
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -344,7 +291,7 @@ static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)
 static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        int retval;
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -358,7 +305,7 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_sp
 static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)
 {
-        struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);
+        struct slot *slot = get_slot(hotplug_slot);
        int retval;
        dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -385,9 +332,6 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        int rc;
        struct controller *ctrl;
-        struct slot *t_slot;
-        int first_device_num;   /* first PCI device number */
-        int num_ctlr_slots;     /* number of slots implemented */
        if (!is_shpc_capable(pdev))
                return -ENODEV;
@@ -408,47 +352,13 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        pci_set_drvdata(pdev, ctrl);
-        ctrl->bus = pdev->bus->number;
-        ctrl->slot_bus = pdev->subordinate->number;
-        ctrl->device = PCI_SLOT(pdev->devfn);
-        ctrl->function = PCI_FUNC(pdev->devfn);
-        dbg("ctrl bus=0x%x, device=%x, function=%x, irq=%x\n",
-            ctrl->bus, ctrl->device, ctrl->function, pdev->irq);
-        /*
-         * Save configuration headers for this and subordinate PCI buses
-         */
-        rc = get_ctlr_slot_config(ctrl);
-        if (rc) {
-                err(msg_initialization_err, rc);
-                goto err_out_release_ctlr;
-        }
-        first_device_num = ctrl->slot_device_offset;
-        num_ctlr_slots = ctrl->num_slots;
-        ctrl->add_support = 1;
        /* Setup the slot information structures */
        rc = init_slots(ctrl);
        if (rc) {
-                err(msg_initialization_err, 6);
+                err("%s: slot initialization failed\n", SHPC_MODULE_NAME);
                goto err_out_release_ctlr;
        }
-        /* Now hpc_functions (slot->hpc_ops->functions) are ready  */
-        t_slot = shpchp_find_slot(ctrl, first_device_num);
-        /* Check for operation bus speed */
-        rc = t_slot->hpc_ops->get_cur_bus_speed(t_slot, &ctrl->speed);
-        dbg("%s: t_slot->hp_slot %x\n", __FUNCTION__,t_slot->hp_slot);
-        if (rc || ctrl->speed == PCI_SPEED_UNKNOWN) {
-                err(SHPC_MODULE_NAME ": Can't get current bus speed. "
-                    "Set to 33MHz PCI.\n");
-                ctrl->speed = PCI_SPEED_33MHz;
-        }
        rc = shpchp_create_ctrl_files(ctrl);
        if (rc)
                goto err_cleanup_slots;
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index 158ac7836096..6bb84734cd6c 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -57,9 +57,8 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
        return 0;
 }
-u8 shpchp_handle_attention_button(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl)
 {
-        struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u32 event_type;
@@ -81,9 +80,8 @@ u8 shpchp_handle_attention_button(u8 hp_slot, void *inst_id)
 }
-u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
 {
-        struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u8 getstatus;
        u32 event_type;
@@ -120,9 +118,8 @@ u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)
        return 1;
 }
-u8 shpchp_handle_presence_change(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
 {
-        struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u32 event_type;
@@ -154,9 +151,8 @@ u8 shpchp_handle_presence_change(u8 hp_slot, void *inst_id)
        return 1;
 }
-u8 shpchp_handle_power_fault(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
 {
-        struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u32 event_type;
@@ -497,10 +493,12 @@ static void handle_button_press_event(struct slot *p_slot)
                p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                if (getstatus) {
                        p_slot->state = BLINKINGOFF_STATE;
-                        info(msg_button_off, p_slot->name);
+                        info("PCI slot #%s - powering off due to button "
+                             "press.\n", p_slot->name);
                } else {
                        p_slot->state = BLINKINGON_STATE;
-                        info(msg_button_on, p_slot->name);
+                        info("PCI slot #%s - powering on due to button "
+                             "press.\n", p_slot->name);
                }
                /* blink green LED and turn off amber */
                p_slot->hpc_ops->green_led_blink(p_slot);
@@ -523,7 +521,8 @@ static void handle_button_press_event(struct slot *p_slot)
                else
                        p_slot->hpc_ops->green_led_off(p_slot);
                p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                info(msg_button_cancel, p_slot->name);
+                info("PCI slot #%s - action canceled due to button press\n",
+                     p_slot->name);
                p_slot->state = STATIC_STATE;
                break;
        case POWEROFF_STATE:
diff --git a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
index 83a5226ba9ed..b7bede4b7c27 100644
--- a/drivers/pci/hotplug/shpchp_hpc.c
+++ b/drivers/pci/hotplug/shpchp_hpc.c
@@ -212,44 +212,40 @@
 #define SLOT_SERR_INT_MASK      0x3
 DEFINE_DBG_BUFFER               /* Debug string buffer for entire HPC defined here */
-static struct php_ctlr_state_s *php_ctlr_list_head;     /* HPC state linked list */
-static int ctlr_seq_num = 0;    /* Controller sequenc # */
-static spinlock_t list_lock;
 static atomic_t shpchp_num_controllers = ATOMIC_INIT(0);
 static irqreturn_t shpc_isr(int irq, void *dev_id);
-static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec);
+static void start_int_poll_timer(struct controller *ctrl, int sec);
 static int hpc_check_cmd_status(struct controller *ctrl);
 static inline u8 shpc_readb(struct controller *ctrl, int reg)
 {
-        return readb(ctrl->hpc_ctlr_handle->creg + reg);
+        return readb(ctrl->creg + reg);
 }
 static inline void shpc_writeb(struct controller *ctrl, int reg, u8 val)
 {
-        writeb(val, ctrl->hpc_ctlr_handle->creg + reg);
+        writeb(val, ctrl->creg + reg);
 }
 static inline u16 shpc_readw(struct controller *ctrl, int reg)
 {
-        return readw(ctrl->hpc_ctlr_handle->creg + reg);
+        return readw(ctrl->creg + reg);
 }
 static inline void shpc_writew(struct controller *ctrl, int reg, u16 val)
 {
-        writew(val, ctrl->hpc_ctlr_handle->creg + reg);
+        writew(val, ctrl->creg + reg);
 }
 static inline u32 shpc_readl(struct controller *ctrl, int reg)
 {
-        return readl(ctrl->hpc_ctlr_handle->creg + reg);
+        return readl(ctrl->creg + reg);
 }
 static inline void shpc_writel(struct controller *ctrl, int reg, u32 val)
 {
-        writel(val, ctrl->hpc_ctlr_handle->creg + reg);
+        writel(val, ctrl->creg + reg);
 }
 static inline int shpc_indirect_read(struct controller *ctrl, int index,
@@ -268,21 +264,20 @@ static inline int shpc_indirect_read(struct controller *ctrl, int index,
 /*
 * This is the interrupt polling timeout function.
 */
-static void int_poll_timeout(unsigned long lphp_ctlr)
+static void int_poll_timeout(unsigned long data)
 {
-        struct php_ctlr_state_s *php_ctlr =
+        struct controller *ctrl = (struct controller *)data;
-                (struct php_ctlr_state_s *)lphp_ctlr;
        DBG_ENTER_ROUTINE
        /* Poll for interrupt events.  regs == NULL => polling */
-        shpc_isr(0, php_ctlr->callback_instance_id);
+        shpc_isr(0, ctrl);
-        init_timer(&php_ctlr->int_poll_timer);
+        init_timer(&ctrl->poll_timer);
        if (!shpchp_poll_time)
                shpchp_poll_time = 2; /* default polling interval is 2 sec */
-        start_int_poll_timer(php_ctlr, shpchp_poll_time);
+        start_int_poll_timer(ctrl, shpchp_poll_time);
        DBG_LEAVE_ROUTINE
 }
@@ -290,16 +285,16 @@ static void int_poll_timeout(unsigned long lphp_ctlr)
 /*
 * This function starts the interrupt polling timer.
 */
-static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec)
+static void start_int_poll_timer(struct controller *ctrl, int sec)
 {
        /* Clamp to sane value */
        if ((sec <= 0) || (sec > 60))
                sec = 2;
-        php_ctlr->int_poll_timer.function = &int_poll_timeout;
+        ctrl->poll_timer.function = &int_poll_timeout;
-        php_ctlr->int_poll_timer.data = (unsigned long)php_ctlr;
+        ctrl->poll_timer.data = (unsigned long)ctrl;
-        php_ctlr->int_poll_timer.expires = jiffies + sec * HZ;
+        ctrl->poll_timer.expires = jiffies + sec * HZ;
-        add_timer(&php_ctlr->int_poll_timer);
+        add_timer(&ctrl->poll_timer);
 }
 static inline int is_ctrl_busy(struct controller *ctrl)
@@ -666,33 +661,8 @@ static void hpc_set_green_led_blink(struct slot *slot)
        shpc_write_cmd(slot, slot->hp_slot, SET_PWR_BLINK);
 }
-int shpc_get_ctlr_slot_config(struct controller *ctrl,
-        int *num_ctlr_slots,    /* number of slots in this HPC                  */
-        int *first_device_num,  /* PCI dev num of the first slot in this SHPC   */
-        int *physical_slot_num, /* phy slot num of the first slot in this SHPC  */
-        int *updown,            /* physical_slot_num increament: 1 or -1        */
-        int *flags)
-{
-        u32 slot_config;
-        DBG_ENTER_ROUTINE 
-        slot_config = shpc_readl(ctrl, SLOT_CONFIG);
-        *first_device_num = (slot_config & FIRST_DEV_NUM) >> 8;
-        *num_ctlr_slots = slot_config & SLOT_NUM;
-        *physical_slot_num = (slot_config & PSN) >> 16;
-        *updown = ((slot_config & UPDOWN) >> 29) ? 1 : -1;
-        dbg("%s: physical_slot_num = %x\n", __FUNCTION__, *physical_slot_num);
-        DBG_LEAVE_ROUTINE 
-        return 0;
-}
 static void hpc_release_ctlr(struct controller *ctrl)
 {
-        struct php_ctlr_state_s *php_ctlr = ctrl->hpc_ctlr_handle;
-        struct php_ctlr_state_s *p, *p_prev;
        int i;
        u32 slot_reg, serr_int;
@@ -722,40 +692,15 @@ static void hpc_release_ctlr(struct controller *ctrl)
        serr_int &= ~SERR_INTR_RSVDZ_MASK;
        shpc_writel(ctrl, SERR_INTR_ENABLE, serr_int);
-        if (shpchp_poll_mode) {
+        if (shpchp_poll_mode)
-            del_timer(&php_ctlr->int_poll_timer);
+                del_timer(&ctrl->poll_timer);
-        } else {        
+        else {
-                if (php_ctlr->irq) {
+                free_irq(ctrl->pci_dev->irq, ctrl);
-                        free_irq(php_ctlr->irq, ctrl);
+                pci_disable_msi(ctrl->pci_dev);
-                        php_ctlr->irq = 0;
-                        pci_disable_msi(php_ctlr->pci_dev);
-                }
-        }
-        if (php_ctlr->pci_dev) {
-                iounmap(php_ctlr->creg);
-                release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
-                php_ctlr->pci_dev = NULL;
-        }
-        spin_lock(&list_lock);
-        p = php_ctlr_list_head;
-        p_prev = NULL;
-        while (p) {
-                if (p == php_ctlr) {
-                        if (p_prev)
-                                p_prev->pnext = p->pnext;
-                        else
-                                php_ctlr_list_head = p->pnext;
-                        break;
-                } else {
-                        p_prev = p;
-                        p = p->pnext;
-                }
        }
-        spin_unlock(&list_lock);
-        kfree(php_ctlr);
+        iounmap(ctrl->creg);
+        release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
        /*
         * If this is the last controller to be released, destroy the
@@ -764,8 +709,7 @@ static void hpc_release_ctlr(struct controller *ctrl)
        if (atomic_dec_and_test(&shpchp_num_controllers))
                destroy_workqueue(shpchp_wq);
-DBG_LEAVE_ROUTINE
+        DBG_LEAVE_ROUTINE
-                          
 }
 static int hpc_power_on_slot(struct slot * slot)
@@ -891,7 +835,6 @@ static int hpc_set_bus_speed_mode(struct slot * slot, enum pci_bus_speed value)
 static irqreturn_t shpc_isr(int irq, void *dev_id)
 {
        struct controller *ctrl = (struct controller *)dev_id;
-        struct php_ctlr_state_s *php_ctlr = ctrl->hpc_ctlr_handle;
        u32 serr_int, slot_reg, intr_loc, intr_loc2;
        int hp_slot;
@@ -942,20 +885,16 @@ static irqreturn_t shpc_isr(int irq, void *dev_id)
                    __FUNCTION__, hp_slot, slot_reg);
                if (slot_reg & MRL_CHANGE_DETECTED)
-                        php_ctlr->switch_change_callback(
+                        shpchp_handle_switch_change(hp_slot, ctrl);
-                                hp_slot, php_ctlr->callback_instance_id);
                if (slot_reg & BUTTON_PRESS_DETECTED)
-                        php_ctlr->attention_button_callback(
+                        shpchp_handle_attention_button(hp_slot, ctrl);
-                                hp_slot, php_ctlr->callback_instance_id);
                if (slot_reg & PRSNT_CHANGE_DETECTED)
-                        php_ctlr->presence_change_callback(
+                        shpchp_handle_presence_change(hp_slot, ctrl);
-                                hp_slot , php_ctlr->callback_instance_id);
                if (slot_reg & (ISO_PFAULT_DETECTED | CON_PFAULT_DETECTED))
-                        php_ctlr->power_fault_callback(
+                        shpchp_handle_power_fault(hp_slot, ctrl);
-                                hp_slot, php_ctlr->callback_instance_id);
                /* Clear all slot events */
                slot_reg &= ~SLOT_REG_RSVDZ_MASK;
@@ -1114,10 +1053,8 @@ static struct hpc_ops shpchp_hpc_ops = {
        .release_ctlr                   = hpc_release_ctlr,
 };
-int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
+int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
 {
-        struct php_ctlr_state_s *php_ctlr, *p;
-        void *instance_id = ctrl;
        int rc = -1, num_slots = 0;
        u8 hp_slot;
        u32 shpc_base_offset;
@@ -1128,16 +1065,6 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
        ctrl->pci_dev = pdev;  /* pci_dev of the P2P bridge */
-        spin_lock_init(&list_lock);
-        php_ctlr = kzalloc(sizeof(*php_ctlr), GFP_KERNEL);
-        if (!php_ctlr) {        /* allocate controller state data */
-                err("%s: HPC controller memory allocation error!\n", __FUNCTION__);
-                goto abort;
-        }
-        php_ctlr->pci_dev = pdev;       /* save pci_dev in context */
        if ((pdev->vendor == PCI_VENDOR_ID_AMD) || (pdev->device ==
                                PCI_DEVICE_ID_AMD_GOLAM_7450)) {
                /* amd shpc driver doesn't use Base Offset; assume 0 */
@@ -1147,20 +1074,20 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                ctrl->cap_offset = pci_find_capability(pdev, PCI_CAP_ID_SHPC);
                if (!ctrl->cap_offset) {
                        err("%s : cap_offset == 0\n", __FUNCTION__);
-                        goto abort_free_ctlr;
+                        goto abort;
                }
                dbg("%s: cap_offset = %x\n", __FUNCTION__, ctrl->cap_offset);
                rc = shpc_indirect_read(ctrl, 0, &shpc_base_offset);
                if (rc) {
                        err("%s: cannot read base_offset\n", __FUNCTION__);
-                        goto abort_free_ctlr;
+                        goto abort;
                }
                rc = shpc_indirect_read(ctrl, 3, &tempdword);
                if (rc) {
                        err("%s: cannot read slot config\n", __FUNCTION__);
-                        goto abort_free_ctlr;
+                        goto abort;
                }
                num_slots = tempdword & SLOT_NUM;
                dbg("%s: num_slots (indirect) %x\n", __FUNCTION__, num_slots);
@@ -1170,7 +1097,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                        if (rc) {
                                err("%s: cannot read creg (index = %d)\n",
                                    __FUNCTION__, i);
-                                goto abort_free_ctlr;
+                                goto abort;
                        }
                        dbg("%s: offset %d: value %x\n", __FUNCTION__,i,
                                        tempdword);
@@ -1187,24 +1114,24 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
        rc = pci_enable_device(pdev);
        if (rc) {
                err("%s: pci_enable_device failed\n", __FUNCTION__);
-                goto abort_free_ctlr;
+                goto abort;
        }
        if (!request_mem_region(ctrl->mmio_base, ctrl->mmio_size, MY_NAME)) {
                err("%s: cannot reserve MMIO region\n", __FUNCTION__);
                rc = -1;
-                goto abort_free_ctlr;
+                goto abort;
        }
-        php_ctlr->creg = ioremap(ctrl->mmio_base, ctrl->mmio_size);
+        ctrl->creg = ioremap(ctrl->mmio_base, ctrl->mmio_size);
-        if (!php_ctlr->creg) {
+        if (!ctrl->creg) {
                err("%s: cannot remap MMIO region %lx @ %lx\n", __FUNCTION__,
                    ctrl->mmio_size, ctrl->mmio_base);
                release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
                rc = -1;
-                goto abort_free_ctlr;
+                goto abort;
        }
-        dbg("%s: php_ctlr->creg %p\n", __FUNCTION__, php_ctlr->creg);
+        dbg("%s: ctrl->creg %p\n", __FUNCTION__, ctrl->creg);
        mutex_init(&ctrl->crit_sect);
        mutex_init(&ctrl->cmd_lock);
@@ -1212,23 +1139,14 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
        /* Setup wait queue */
        init_waitqueue_head(&ctrl->queue);
-        /* Find the IRQ */
-        php_ctlr->irq = pdev->irq;
-        php_ctlr->attention_button_callback = shpchp_handle_attention_button,
-        php_ctlr->switch_change_callback = shpchp_handle_switch_change;
-        php_ctlr->presence_change_callback = shpchp_handle_presence_change;
-        php_ctlr->power_fault_callback = shpchp_handle_power_fault;
-        php_ctlr->callback_instance_id = instance_id;
-        ctrl->hpc_ctlr_handle = php_ctlr;
        ctrl->hpc_ops = &shpchp_hpc_ops;
        /* Return PCI Controller Info */
        slot_config = shpc_readl(ctrl, SLOT_CONFIG);
-        php_ctlr->slot_device_offset = (slot_config & FIRST_DEV_NUM) >> 8;
+        ctrl->slot_device_offset = (slot_config & FIRST_DEV_NUM) >> 8;
-        php_ctlr->num_slots = slot_config & SLOT_NUM;
+        ctrl->num_slots = slot_config & SLOT_NUM;
-        dbg("%s: slot_device_offset %x\n", __FUNCTION__, php_ctlr->slot_device_offset);
+        ctrl->first_slot = (slot_config & PSN) >> 16;
-        dbg("%s: num_slots %x\n", __FUNCTION__, php_ctlr->num_slots);
+        ctrl->slot_num_inc = ((slot_config & UPDOWN) >> 29) ? 1 : -1;
        /* Mask Global Interrupt Mask & Command Complete Interrupt Mask */
        tempdword = shpc_readl(ctrl, SERR_INTR_ENABLE);
@@ -1243,7 +1161,7 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
        /* Mask the MRL sensor SERR Mask of individual slot in
         * Slot SERR-INT Mask & clear all the existing event if any
         */
-        for (hp_slot = 0; hp_slot < php_ctlr->num_slots; hp_slot++) {
+        for (hp_slot = 0; hp_slot < ctrl->num_slots; hp_slot++) {
                slot_reg = shpc_readl(ctrl, SLOT_REG(hp_slot));
                dbg("%s: Default Logical Slot Register %d value %x\n", __FUNCTION__,
                        hp_slot, slot_reg);
@@ -1255,24 +1173,27 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                shpc_writel(ctrl, SLOT_REG(hp_slot), slot_reg);
        }
        
-        if (shpchp_poll_mode)  {/* Install interrupt polling code */
+        if (shpchp_poll_mode) {
-                /* Install and start the interrupt polling timer */
+                /* Install interrupt polling timer. Start with 10 sec delay */
-                init_timer(&php_ctlr->int_poll_timer);
+                init_timer(&ctrl->poll_timer);
-                start_int_poll_timer( php_ctlr, 10 );   /* start with 10 second delay */
+                start_int_poll_timer(ctrl, 10);
        } else {
                /* Installs the interrupt handler */
                rc = pci_enable_msi(pdev);
                if (rc) {
                        info("Can't get msi for the hotplug controller\n");
                        info("Use INTx for the hotplug controller\n");
-                } else
+                }
-                        php_ctlr->irq = pdev->irq;
                
-                rc = request_irq(php_ctlr->irq, shpc_isr, IRQF_SHARED, MY_NAME, (void *) ctrl);
+                rc = request_irq(ctrl->pci_dev->irq, shpc_isr, IRQF_SHARED,
-                dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc);
+                                 MY_NAME, (void *)ctrl);
+                dbg("%s: request_irq %d for hpc%d (returns %d)\n",
+                    __FUNCTION__, ctrl->pci_dev->irq,
+                    atomic_read(&shpchp_num_controllers), rc);
                if (rc) {
-                        err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);
+                        err("Can't get irq %d for the hotplug controller\n",
-                        goto abort_free_ctlr;
+                            ctrl->pci_dev->irq);
+                        goto abort_iounmap;
                }
        }
        dbg("%s: HPC at b:d:f:irq=0x%x:%x:%x:%x\n", __FUNCTION__,
@@ -1280,24 +1201,6 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                        PCI_FUNC(pdev->devfn), pdev->irq);
        get_hp_hw_control_from_firmware(pdev);
-        /*  Add this HPC instance into the HPC list */
-        spin_lock(&list_lock);
-        if (php_ctlr_list_head == 0) {
-                php_ctlr_list_head = php_ctlr;
-                p = php_ctlr_list_head;
-                p->pnext = NULL;
-        } else {
-                p = php_ctlr_list_head;
-                while (p->pnext)
-                        p = p->pnext;
-                p->pnext = php_ctlr;
-        }
-        spin_unlock(&list_lock);
-        ctlr_seq_num++;
        /*
         * If this is the first controller to be initialized,
         * initialize the shpchpd work queue
@@ -1306,14 +1209,14 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
                shpchp_wq = create_singlethread_workqueue("shpchpd");
                if (!shpchp_wq) {
                        rc = -ENOMEM;
-                        goto abort_free_ctlr;
+                        goto abort_iounmap;
                }
        }
        /*
         * Unmask all event interrupts of all slots
         */
-        for (hp_slot = 0; hp_slot < php_ctlr->num_slots; hp_slot++) {
+        for (hp_slot = 0; hp_slot < ctrl->num_slots; hp_slot++) {
                slot_reg = shpc_readl(ctrl, SLOT_REG(hp_slot));
                dbg("%s: Default Logical Slot Register %d value %x\n", __FUNCTION__,
                        hp_slot, slot_reg);
@@ -1336,10 +1239,8 @@ int shpc_init(struct controller * ctrl, struct pci_dev * pdev)
        return 0;
        /* We end up here for the many possible ways to fail this API.  */
-abort_free_ctlr:
+abort_iounmap:
-        if (php_ctlr->creg)
+        iounmap(ctrl->creg);
-                iounmap(php_ctlr->creg);
-        kfree(php_ctlr);
 abort:
        DBG_LEAVE_ROUTINE
        return rc;
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c
index 0a8d1cce9fa0..279c940a0039 100644
--- a/drivers/pci/htirq.c
+++ b/drivers/pci/htirq.c
@@ -99,14 +99,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
        int pos;
        int irq;
-        pos = pci_find_capability(dev, PCI_CAP_ID_HT);
+        pos = pci_find_ht_capability(dev, HT_CAPTYPE_IRQ);
-        while (pos) {
-                u8 subtype;
-                pci_read_config_byte(dev, pos + 3, &subtype);
-                if (subtype == HT_CAPTYPE_IRQ)
-                        break;
-                pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_HT);
-        }
        if (!pos)
                return -EINVAL;
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index e5ae3a0c13bb..b8d2385e29bc 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -162,14 +162,9 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
 const struct pci_device_id *pci_match_device(struct pci_driver *drv,
                                             struct pci_dev *dev)
 {
-        const struct pci_device_id *id;
        struct pci_dynid *dynid;
-        id = pci_match_id(drv->id_table, dev);
+        /* Look at the dynamic ids first, before the static ones */
-        if (id)
-                return id;
-        /* static ids didn't match, lets look at the dynamic ones */
        spin_lock(&drv->dynids.lock);
        list_for_each_entry(dynid, &drv->dynids.list, node) {
                if (pci_match_one_device(&dynid->id, dev)) {
@@ -178,7 +173,8 @@ const struct pci_device_id *pci_match_device(struct pci_driver *drv,
                }
        }
        spin_unlock(&drv->dynids.lock);
-        return NULL;
+        return pci_match_id(drv->id_table, dev);
 }
 static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
@@ -357,6 +353,8 @@ static int pci_device_resume_early(struct device * dev)
        struct pci_dev * pci_dev = to_pci_dev(dev);
        struct pci_driver * drv = pci_dev->driver;
+        pci_fixup_device(pci_fixup_resume, pci_dev);
        if (drv && drv->resume_early)
                error = drv->resume_early(pci_dev);
        return error;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 5a14b73cf3a1..6bfb942428e4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -68,12 +68,14 @@ pci_max_busnr(void)
 #endif  /*  0  */
-static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn, u8 pos, int cap)
+#define PCI_FIND_CAP_TTL        48
+static int __pci_find_next_cap_ttl(struct pci_bus *bus, unsigned int devfn,
+                                   u8 pos, int cap, int *ttl)
 {
        u8 id;
-        int ttl = 48;
-        while (ttl--) {
+        while ((*ttl)--) {
                pci_bus_read_config_byte(bus, devfn, pos, &pos);
                if (pos < 0x40)
                        break;
@@ -89,6 +91,14 @@ static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn, u8 pos,
        return 0;
 }
+static int __pci_find_next_cap(struct pci_bus *bus, unsigned int devfn,
+                               u8 pos, int cap)
+{
+        int ttl = PCI_FIND_CAP_TTL;
+        return __pci_find_next_cap_ttl(bus, devfn, pos, cap, &ttl);
+}
 int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap)
 {
        return __pci_find_next_cap(dev->bus, dev->devfn,
@@ -96,10 +106,10 @@ int pci_find_next_capability(struct pci_dev *dev, u8 pos, int cap)
 }
 EXPORT_SYMBOL_GPL(pci_find_next_capability);
-static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_type, int cap)
+static int __pci_bus_find_cap_start(struct pci_bus *bus,
+                                    unsigned int devfn, u8 hdr_type)
 {
        u16 status;
-        u8 pos;
        pci_bus_read_config_word(bus, devfn, PCI_STATUS, &status);
        if (!(status & PCI_STATUS_CAP_LIST))
@@ -108,15 +118,14 @@ static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_ty
        switch (hdr_type) {
        case PCI_HEADER_TYPE_NORMAL:
        case PCI_HEADER_TYPE_BRIDGE:
-                pos = PCI_CAPABILITY_LIST;
+                return PCI_CAPABILITY_LIST;
-                break;
        case PCI_HEADER_TYPE_CARDBUS:
-                pos = PCI_CB_CAPABILITY_LIST;
+                return PCI_CB_CAPABILITY_LIST;
-                break;
        default:
                return 0;
        }
-        return __pci_find_next_cap(bus, devfn, pos, cap);
+        return 0;
 }
 /**
@@ -140,7 +149,13 @@ static int __pci_bus_find_cap(struct pci_bus *bus, unsigned int devfn, u8 hdr_ty
 */
 int pci_find_capability(struct pci_dev *dev, int cap)
 {
-        return __pci_bus_find_cap(dev->bus, dev->devfn, dev->hdr_type, cap);
+        int pos;
+        pos = __pci_bus_find_cap_start(dev->bus, dev->devfn, dev->hdr_type);
+        if (pos)
+                pos = __pci_find_next_cap(dev->bus, dev->devfn, pos, cap);
+        return pos;
 }
 /**
@@ -158,11 +173,16 @@ int pci_find_capability(struct pci_dev *dev, int cap)
 */
 int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap)
 {
+        int pos;
        u8 hdr_type;
        pci_bus_read_config_byte(bus, devfn, PCI_HEADER_TYPE, &hdr_type);
-        return __pci_bus_find_cap(bus, devfn, hdr_type & 0x7f, cap);
+        pos = __pci_bus_find_cap_start(bus, devfn, hdr_type & 0x7f);
+        if (pos)
+                pos = __pci_find_next_cap(bus, devfn, pos, cap);
+        return pos;
 }
 /**
@@ -214,6 +234,74 @@ int pci_find_ext_capability(struct pci_dev *dev, int cap)
 }
 EXPORT_SYMBOL_GPL(pci_find_ext_capability);
+static int __pci_find_next_ht_cap(struct pci_dev *dev, int pos, int ht_cap)
+{
+        int rc, ttl = PCI_FIND_CAP_TTL;
+        u8 cap, mask;
+        if (ht_cap == HT_CAPTYPE_SLAVE || ht_cap == HT_CAPTYPE_HOST)
+                mask = HT_3BIT_CAP_MASK;
+        else
+                mask = HT_5BIT_CAP_MASK;
+        pos = __pci_find_next_cap_ttl(dev->bus, dev->devfn, pos,
+                                      PCI_CAP_ID_HT, &ttl);
+        while (pos) {
+                rc = pci_read_config_byte(dev, pos + 3, &cap);
+                if (rc != PCIBIOS_SUCCESSFUL)
+                        return 0;
+                if ((cap & mask) == ht_cap)
+                        return pos;
+                pos = __pci_find_next_cap_ttl(dev->bus, dev->devfn, pos,
+                                              PCI_CAP_ID_HT, &ttl);
+        }
+        return 0;
+}
+/**
+ * pci_find_next_ht_capability - query a device's Hypertransport capabilities
+ * @dev: PCI device to query
+ * @pos: Position from which to continue searching
+ * @ht_cap: Hypertransport capability code
+ *
+ * To be used in conjunction with pci_find_ht_capability() to search for
+ * all capabilities matching @ht_cap. @pos should always be a value returned
+ * from pci_find_ht_capability().
+ *
+ * NB. To be 100% safe against broken PCI devices, the caller should take
+ * steps to avoid an infinite loop.
+ */
+int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap)
+{
+        return __pci_find_next_ht_cap(dev, pos + PCI_CAP_LIST_NEXT, ht_cap);
+}
+EXPORT_SYMBOL_GPL(pci_find_next_ht_capability);
+/**
+ * pci_find_ht_capability - query a device's Hypertransport capabilities
+ * @dev: PCI device to query
+ * @ht_cap: Hypertransport capability code
+ *
+ * Tell if a device supports a given Hypertransport capability.
+ * Returns an address within the device's PCI configuration space
+ * or 0 in case the device does not support the request capability.
+ * The address points to the PCI capability, of type PCI_CAP_ID_HT,
+ * which has a Hypertransport capability matching @ht_cap.
+ */
+int pci_find_ht_capability(struct pci_dev *dev, int ht_cap)
+{
+        int pos;
+        pos = __pci_bus_find_cap_start(dev->bus, dev->devfn, dev->hdr_type);
+        if (pos)
+                pos = __pci_find_next_ht_cap(dev, pos, ht_cap);
+        return pos;
+}
+EXPORT_SYMBOL_GPL(pci_find_ht_capability);
 /**
 * pci_find_parent_resource - return resource region of parent bus of given region
 * @dev: PCI device structure contains resources to be searched
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index b4da7954611e..f17e7ed2b2a5 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -90,7 +90,7 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev,
                return -ENODEV;
        
        pci_set_master(dev);
-        if (!dev->irq) {
+        if (!dev->irq && dev->pin) {
                printk(KERN_WARNING 
                "%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n", 
                __FUNCTION__, dev->device, dev->vendor);
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 6a3c1e728900..1ae9c3f50ffa 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -649,6 +649,9 @@ static void pci_read_irq(struct pci_dev *dev)
 * Returns 0 on success and -1 if unknown type of device (not normal, bridge
 * or CardBus).
 */
+#define LEGACY_IO_RESOURCE      (IORESOURCE_IO | IORESOURCE_PCI_FIXED)
 static int pci_setup_device(struct pci_dev * dev)
 {
        u32 class;
@@ -692,18 +695,18 @@ static int pci_setup_device(struct pci_dev * dev)
                        if ((progif & 1) == 0) {
                                dev->resource[0].start = 0x1F0;
                                dev->resource[0].end = 0x1F7;
-                                dev->resource[0].flags = IORESOURCE_IO;
+                                dev->resource[0].flags = LEGACY_IO_RESOURCE;
                                dev->resource[1].start = 0x3F6;
                                dev->resource[1].end = 0x3F6;
-                                dev->resource[1].flags = IORESOURCE_IO;
+                                dev->resource[1].flags = LEGACY_IO_RESOURCE;
                        }
                        if ((progif & 4) == 0) {
                                dev->resource[2].start = 0x170;
                                dev->resource[2].end = 0x177;
-                                dev->resource[2].flags = IORESOURCE_IO;
+                                dev->resource[2].flags = LEGACY_IO_RESOURCE;
                                dev->resource[3].start = 0x376;
                                dev->resource[3].end = 0x376;
-                                dev->resource[3].flags = IORESOURCE_IO;
+                                dev->resource[3].flags = LEGACY_IO_RESOURCE;
                        }
                }
                break;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 9ca9b9bf6160..8f0322d6f3bf 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -36,7 +36,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR_BRID
 /* Deal with broken BIOS'es that neglect to enable passive release,
   which can cause problems in combination with the 82441FX/PPro MTRRs */
-static void __devinit quirk_passive_release(struct pci_dev *dev)
+static void quirk_passive_release(struct pci_dev *dev)
 {
        struct pci_dev *d = NULL;
        unsigned char dlc;
@@ -53,6 +53,7 @@ static void __devinit quirk_passive_release(struct pci_dev *dev)
        }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82441,      quirk_passive_release );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82441,      quirk_passive_release );
 /*  The VIA VP2/VP3/MVP3 seem to have some 'features'. There may be a workaround
    but VIA don't answer queries. If you happen to have good contacts at VIA
@@ -134,7 +135,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 	PCI_DEVICE_ID_INTEL_82439TX, 	quir
 *      Updated based on further information from the site and also on
 *      information provided by VIA 
 */
-static void __devinit quirk_vialatency(struct pci_dev *dev)
+static void quirk_vialatency(struct pci_dev *dev)
 {
        struct pci_dev *p;
        u8 rev;
@@ -185,6 +186,10 @@ exit:
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8363_0,       quirk_vialatency );
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8371_1,       quirk_vialatency );
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8361,         quirk_vialatency );
+/* Must restore this on a resume from RAM */
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8363_0,       quirk_vialatency );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8371_1,       quirk_vialatency );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8361,         quirk_vialatency );
 /*
 *      VIA Apollo VP3 needs ETBF on BT848/878
@@ -532,7 +537,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_8235,	quirk_vt8235
 * TODO: When we have device-specific interrupt routers,
 * this code will go away from quirks.
 */
-static void __devinit quirk_via_ioapic(struct pci_dev *dev)
+static void quirk_via_ioapic(struct pci_dev *dev)
 {
        u8 tmp;
        
@@ -548,6 +553,7 @@ static void __devinit quirk_via_ioapic(struct pci_dev *dev)
        pci_write_config_byte (dev, 0x58, tmp);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C686,       quirk_via_ioapic );
 /*
 * VIA 8237: Some BIOSs don't set the 'Bypass APIC De-Assert Message' Bit.
@@ -555,7 +561,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C686,	quirk_via_i
 * Set this bit to get rid of cycle wastage.
 * Otherwise uncritical.
 */
-static void __devinit quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
+static void quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
 {
        u8 misc_control2;
 #define BYPASS_APIC_DEASSERT 8
@@ -567,6 +573,7 @@ static void __devinit quirk_via_vt8237_bypass_apic_deassert(struct pci_dev *dev)
        }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA,      PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8237,         quirk_via_vt8237_bypass_apic_deassert);
 /*
 * The AMD io apic can hang the box when an apic irq is masked.
@@ -600,7 +607,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_SI,	PCI_ANY_ID,			quirk_ioapic_rmw );
 #define AMD8131_revB0        0x11
 #define AMD8131_MISC         0x40
 #define AMD8131_NIOAMODE_BIT 0
-static void __init quirk_amd_8131_ioapic(struct pci_dev *dev) 
+static void quirk_amd_8131_ioapic(struct pci_dev *dev)
 { 
        unsigned char revid, tmp;
        
@@ -616,6 +623,7 @@ static void __init quirk_amd_8131_ioapic(struct pci_dev *dev)
        }
 } 
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_amd_8131_ioapic);
 #endif /* CONFIG_X86_IO_APIC */
@@ -641,65 +649,84 @@ static void __devinit quirk_via_acpi(struct pci_dev *d)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C586_3,     quirk_via_acpi );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_82C686_4,     quirk_via_acpi );
-/*
- * Via 686A/B:  The PCI_INTERRUPT_LINE register for the on-chip
- * devices, USB0/1, AC97, MC97, and ACPI, has an unusual feature:
- * when written, it makes an internal connection to the PIC.
- * For these devices, this register is defined to be 4 bits wide.
- * Normally this is fine.  However for IO-APIC motherboards, or
- * non-x86 architectures (yes Via exists on PPC among other places),
- * we must mask the PCI_INTERRUPT_LINE value versus 0xf to get
- * interrupts delivered properly.
- *
- * Some of the on-chip devices are actually '586 devices' so they are
- * listed here.
- */
-static int via_irq_fixup_needed = -1;
 /*
- * As some VIA hardware is available in PCI-card form, we need to restrict
+ *      VIA bridges which have VLink
- * this quirk to VIA PCI hardware built onto VIA-based motherboards only.
- * We try to locate a VIA southbridge before deciding whether the quirk
- * should be applied.
 */
-static const struct pci_device_id via_irq_fixup_tbl[] = {
-        {
+static const struct pci_device_id via_vlink_fixup_tbl[] = {
-                .vendor         = PCI_VENDOR_ID_VIA,
+        /* Internal devices need IRQ line routing, pre VLink */
-                .device         = PCI_ANY_ID,
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_82C686), 0 },
-                .subvendor      = PCI_ANY_ID,
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8231), 17 },
-                .subdevice      = PCI_ANY_ID,
+        /* Devices with VLink */
-                .class          = PCI_CLASS_BRIDGE_ISA << 8,
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233_0), 17},
-                .class_mask     = 0xffff00,
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233A), 17 },
-        },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8233C_0), 17 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8235), 16 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8237), 15 },
+        { PCI_VDEVICE(VIA, PCI_DEVICE_ID_VIA_8237A), 15 },
        { 0, },
 };
-static void quirk_via_irq(struct pci_dev *dev)
+/**
+ *      quirk_via_vlink         -       VIA VLink IRQ number update
+ *      @dev: PCI device
+ *
+ *      If the device we are dealing with is on a PIC IRQ we need to
+ *      ensure that the IRQ line register which usually is not relevant
+ *      for PCI cards, is actually written so that interrupts get sent
+ *      to the right place
+ */
+static void quirk_via_vlink(struct pci_dev *dev)
 {
+        const struct pci_device_id *via_vlink_fixup;
+        static int dev_lo = -1, dev_hi = 18;
        u8 irq, new_irq;
-        if (via_irq_fixup_needed == -1)
+        /* Check if we have VLink and cache the result */
-                via_irq_fixup_needed = pci_dev_present(via_irq_fixup_tbl);
-        if (!via_irq_fixup_needed)
+        /* Checked already - no */
+        if (dev_lo == -2)
                return;
+        /* Not checked - see what bridge we have and find the device
+           ranges */
+        if (dev_lo == -1) {
+                via_vlink_fixup = pci_find_present(via_vlink_fixup_tbl);
+                if (via_vlink_fixup == NULL) {
+                        dev_lo = -2;
+                        return;
+                }
+                dev_lo = via_vlink_fixup->driver_data;
+                /* 82C686 is special - 0/0 */
+                if (dev_lo == 0)
+                        dev_hi = 0;
+        }
        new_irq = dev->irq;
        /* Don't quirk interrupts outside the legacy IRQ range */
        if (!new_irq || new_irq > 15)
                return;
+        /* Internal device ? */
+        if (dev->bus->number != 0 || PCI_SLOT(dev->devfn) > dev_hi ||
+                PCI_SLOT(dev->devfn) < dev_lo)
+                return;
+        /* This is an internal VLink device on a PIC interrupt. The BIOS
+           ought to have set this but may not have, so we redo it */
        pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq);
        if (new_irq != irq) {
-                printk(KERN_INFO "PCI: VIA IRQ fixup for %s, from %d to %d\n",
+                printk(KERN_INFO "PCI: VIA VLink IRQ fixup for %s, from %d to %d\n",
                        pci_name(dev), irq, new_irq);
                udelay(15);     /* unknown if delay really needed */
                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq);
        }
 }
-DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_irq);
+DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_VIA, PCI_ANY_ID, quirk_via_vlink);
 /*
 * VIA VT82C598 has its device ID settable and many BIOSes
@@ -720,13 +747,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA,	PCI_DEVICE_ID_VIA_82C597_0,	quirk_vt
 * do this even if the Linux CardBus driver is not loaded, because
 * the Linux i82365 driver does not (and should not) handle CardBus.
 */
-static void __devinit quirk_cardbus_legacy(struct pci_dev *dev)
+static void quirk_cardbus_legacy(struct pci_dev *dev)
 {
        if ((PCI_CLASS_BRIDGE_CARDBUS << 8) ^ dev->class)
                return;
        pci_write_config_dword(dev, PCI_CB_LEGACY_MODE_BASE, 0);
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
+DECLARE_PCI_FIXUP_RESUME(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
 /*
 * Following the PCI ordering rules is optional on the AMD762. I'm not
@@ -735,7 +763,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_cardbus_legacy);
 * To be fair to AMD, it follows the spec by default, its BIOS people
 * who turn it off!
 */
-static void __devinit quirk_amd_ordering(struct pci_dev *dev)
+static void quirk_amd_ordering(struct pci_dev *dev)
 {
        u32 pcic;
        pci_read_config_dword(dev, 0x4C, &pcic);
@@ -749,6 +777,7 @@ static void __devinit quirk_amd_ordering(struct pci_dev *dev)
        }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD,      PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_AMD,     PCI_DEVICE_ID_AMD_FE_GATE_700C, quirk_amd_ordering );
 /*
 *      DreamWorks provided workaround for Dunord I-3000 problem
@@ -784,7 +813,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TOSHIBA,	0x605,	quirk_transparent_bridge
 * datasheets found at http://www.national.com/ds/GX for info on what
 * these bits do.  <christer@weinigel.se>
 */
-static void __init quirk_mediagx_master(struct pci_dev *dev)
+static void quirk_mediagx_master(struct pci_dev *dev)
 {
        u8 reg;
        pci_read_config_byte(dev, 0x41, &reg);
@@ -795,13 +824,14 @@ 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 );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_CYRIX,   PCI_DEVICE_ID_CYRIX_PCI_MASTER, quirk_mediagx_master );
 /*
 *      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
 */
-static void __init quirk_disable_pxb(struct pci_dev *pdev)
+static void quirk_disable_pxb(struct pci_dev *pdev)
 {
        u16 config;
        u8 rev;
@@ -817,7 +847,25 @@ static void __init quirk_disable_pxb(struct pci_dev *pdev)
        }
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82454NX,    quirk_disable_pxb );
+static void __devinit quirk_sb600_sata(struct pci_dev *pdev)
+{
+        /* set sb600 sata to ahci mode */
+        if ((pdev->class >> 8) == PCI_CLASS_STORAGE_IDE) {
+                u8 tmp;
+                pci_read_config_byte(pdev, 0x40, &tmp);
+                pci_write_config_byte(pdev, 0x40, tmp|1);
+                pci_write_config_byte(pdev, 0x9, 1);
+                pci_write_config_byte(pdev, 0xa, 6);
+                pci_write_config_byte(pdev, 0x40, tmp);
+                pdev->class = 0x010601;
+        }
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_SATA, quirk_sb600_sata);
 /*
 *      Serverworks CSB5 IDE does not fully support native mode
@@ -874,7 +922,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82375,	quirk_e
 * runs everywhere at present we suppress the printk output in most
 * irrelevant cases.
 */
-static void __init k8t_sound_hostbridge(struct pci_dev *dev)
+static void k8t_sound_hostbridge(struct pci_dev *dev)
 {
        unsigned char val;
@@ -893,8 +941,8 @@ static void __init k8t_sound_hostbridge(struct pci_dev *dev)
        }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_hostbridge);
-#ifndef CONFIG_ACPI_SLEEP
 /*
 * On ASUS P4B boards, the SMBus PCI Device within the ICH2/4 southbridge
 * is not activated. The myth is that Asus said that they do not want the
@@ -906,10 +954,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, k8t_sound_ho
 * bridge. Unfortunately, this device has no subvendor/subdevice ID. So it 
 * becomes necessary to do this tweak in two steps -- I've chosen the Host
 * bridge as trigger.
- *
- * Actually, leaving it unhidden and not redoing the quirk over suspend2ram
- * will cause thermal management to break down, and causing machine to
- * overheat.
 */
 static int __initdata asus_hides_smbus;
@@ -1019,7 +1063,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82855PM_HB,	as
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82855GM_HB, asus_hides_smbus_hostbridge );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82915GM_HB, asus_hides_smbus_hostbridge );
-static void __init asus_hides_smbus_lpc(struct pci_dev *dev)
+static void asus_hides_smbus_lpc(struct pci_dev *dev)
 {
        u16 val;
        
@@ -1042,8 +1086,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82801CA_0,	asu
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801BA_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_0,  asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801CA_12, asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801DB_12, asus_hides_smbus_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_82801EB_0,  asus_hides_smbus_lpc );
-static void __init asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
+static void asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
 {
        u32 val, rcba;
        void __iomem *base;
@@ -1059,13 +1109,12 @@ static void __init asus_hides_smbus_lpc_ich6(struct pci_dev *dev)
        printk(KERN_INFO "PCI: Enabled ICH6/i801 SMBus device\n");
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6 );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL,   PCI_DEVICE_ID_INTEL_ICH6_1,     asus_hides_smbus_lpc_ich6 );
-#endif
 /*
 * SiS 96x south bridge: BIOS typically hides SMBus device...
 */
-static void __init quirk_sis_96x_smbus(struct pci_dev *dev)
+static void quirk_sis_96x_smbus(struct pci_dev *dev)
 {
        u8 val = 0;
        printk(KERN_INFO "Enabling SiS 96x SMBus.\n");
@@ -1086,7 +1135,7 @@ static int __devinitdata sis_96x_compatible = 0;
 #define SIS_DETECT_REGISTER 0x40
-static void __init quirk_sis_503(struct pci_dev *dev)
+static void quirk_sis_503(struct pci_dev *dev)
 {
        u8 reg;
        u16 devid;
@@ -1122,13 +1171,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_651,		quirk_sis_96x_
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_735,           quirk_sis_96x_compatible );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_503,           quirk_sis_503 );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_503,           quirk_sis_503 );
 /*
 * On ASUS A8V and A8V Deluxe boards, the onboard AC97 audio controller
 * and MC97 modem controller are disabled when a second PCI soundcard is
 * present. This patch, tweaking the VT8237 ISA bridge, enables them.
 * -- bjd
 */
-static void __init asus_hides_ac97_lpc(struct pci_dev *dev)
+static void asus_hides_ac97_lpc(struct pci_dev *dev)
 {
        u8 val;
        int asus_hides_ac97 = 0;
@@ -1159,6 +1209,14 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_962,		quirk_sis_96x_
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_963,           quirk_sis_96x_smbus );
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_LPC,           quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_VIA,     PCI_DEVICE_ID_VIA_8237, asus_hides_ac97_lpc );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_961,           quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_962,           quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_963,           quirk_sis_96x_smbus );
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_SI,      PCI_DEVICE_ID_SI_LPC,           quirk_sis_96x_smbus );
 #if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)
 /*
@@ -1167,7 +1225,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_
 *      the PCI scanning.
 */
-static void __devinit quirk_jmicron_dualfn(struct pci_dev *pdev)
+static void quirk_jmicron_dualfn(struct pci_dev *pdev)
 {
        u32 conf;
        u8 hdr;
@@ -1205,6 +1263,7 @@ static void __devinit quirk_jmicron_dualfn(struct pci_dev *pdev)
 }
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_JMICRON, PCI_ANY_ID, quirk_jmicron_dualfn);
 #endif
@@ -1532,6 +1591,8 @@ extern struct pci_fixup __start_pci_fixups_final[];
 extern struct pci_fixup __end_pci_fixups_final[];
 extern struct pci_fixup __start_pci_fixups_enable[];
 extern struct pci_fixup __end_pci_fixups_enable[];
+extern struct pci_fixup __start_pci_fixups_resume[];
+extern struct pci_fixup __end_pci_fixups_resume[];
 void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
@@ -1559,6 +1620,11 @@ void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev)
                end = __end_pci_fixups_enable;
                break;
+        case pci_fixup_resume:
+                start = __start_pci_fixups_resume;
+                end = __end_pci_fixups_resume;
+                break;
        default:
                /* stupid compiler warning, you would think with an enum... */
                return;
@@ -1596,7 +1662,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	0x1460,		quirk_p64h2_1k_io);
 * Force it to be linked by setting the corresponding control bit in the
 * config space.
 */
-static void __devinit quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
+static void quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
 {
        uint8_t b;
        if (pci_read_config_byte(dev, 0xf41, &b) == 0) {
@@ -1610,6 +1676,8 @@ static void __devinit quirk_nvidia_ck804_pcie_aer_ext_cap(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
                        quirk_nvidia_ck804_pcie_aer_ext_cap);
+DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_NVIDIA,  PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
+                        quirk_nvidia_ck804_pcie_aer_ext_cap);
 #ifdef CONFIG_PCI_MSI
 /* To disable MSI globally */
@@ -1644,19 +1712,23 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_
 * return 1 if a HT MSI capability is found and enabled */
 static int __devinit msi_ht_cap_enabled(struct pci_dev *dev)
 {
-        u8 pos;
+        int pos, ttl = 48;
-        int ttl;
-        for (pos = pci_find_capability(dev, PCI_CAP_ID_HT), ttl = 48;
+        pos = pci_find_ht_capability(dev, HT_CAPTYPE_MSI_MAPPING);
-             pos && ttl;
+        while (pos && ttl--) {
-             pos = pci_find_next_capability(dev, pos, PCI_CAP_ID_HT), ttl--) {
+                u8 flags;
-                u32 cap_hdr;
-                /* MSI mapping section according to Hypertransport spec */
+                if (pci_read_config_byte(dev, pos + HT_MSI_FLAGS,
-                if (pci_read_config_dword(dev, pos, &cap_hdr) == 0
+                                         &flags) == 0)
-                    && (cap_hdr & 0xf8000000) == 0xa8000000 /* MSI mapping */) {
+                {
-                        printk(KERN_INFO "PCI: Found HT MSI mapping on %s with capability %s\n",
+                        printk(KERN_INFO "PCI: Found %s HT MSI Mapping on %s\n",
-                               pci_name(dev), cap_hdr & 0x10000 ? "enabled" : "disabled");
+                                flags & HT_MSI_FLAGS_ENABLE ?
-                        return (cap_hdr & 0x10000) != 0; /* MSI mapping cap enabled */
+                                "enabled" : "disabled", pci_name(dev));
+                        return (flags & HT_MSI_FLAGS_ENABLE) != 0;
                }
+                pos = pci_find_next_ht_capability(dev, pos,
+                                                  HT_CAPTYPE_MSI_MAPPING);
        }
        return 0;
 }
@@ -1688,8 +1760,9 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
         * a single one having MSI is enough to be sure that MSI are supported.
         */
        pdev = pci_get_slot(dev->bus, 0);
-        if (dev->subordinate && !msi_ht_cap_enabled(dev)
+        if (!pdev)
-            && !msi_ht_cap_enabled(pdev)) {
+                return;
+        if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
                printk(KERN_WARNING "PCI: MSI quirk detected. "
                       "MSI disabled on chipset %s.\n",
                       pci_name(dev));
diff --git a/drivers/pci/search.c b/drivers/pci/search.c
index 2f13eba5d5ae..45f2b20ef513 100644
--- a/drivers/pci/search.c
+++ b/drivers/pci/search.c
@@ -413,6 +413,24 @@ exit:
        return dev;
 }
+const struct pci_device_id *pci_find_present(const struct pci_device_id *ids)
+{
+        struct pci_dev *dev;
+        const struct pci_device_id *found = NULL;
+        WARN_ON(in_interrupt());
+        down_read(&pci_bus_sem);
+        while (ids->vendor || ids->subvendor || ids->class_mask) {
+                list_for_each_entry(dev, &pci_devices, global_list) {
+                        if ((found = pci_match_one_device(ids, dev)) != NULL)
+                                break;
+                }
+                ids++;
+        }
+        up_read(&pci_bus_sem);
+        return found;
+}
 /**
 * pci_dev_present - Returns 1 if device matching the device list is present, 0 if not.
 * @ids: A pointer to a null terminated list of struct pci_device_id structures
@@ -426,25 +444,11 @@ exit:
 */
 int pci_dev_present(const struct pci_device_id *ids)
 {
-        struct pci_dev *dev;
+        return pci_find_present(ids) == NULL ? 0 : 1;
-        int found = 0;
-        WARN_ON(in_interrupt());
-        down_read(&pci_bus_sem);
-        while (ids->vendor || ids->subvendor || ids->class_mask) {
-                list_for_each_entry(dev, &pci_devices, global_list) {
-                        if (pci_match_one_device(ids, dev)) {
-                                found = 1;
-                                goto exit;
-                        }
-                }
-                ids++;
-        }
-exit:
-        up_read(&pci_bus_sem);
-        return found;
 }
 EXPORT_SYMBOL(pci_dev_present);
+EXPORT_SYMBOL(pci_find_present);
 EXPORT_SYMBOL(pci_find_device);
 EXPORT_SYMBOL(pci_find_device_reverse);
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index ab78e4bbdd83..cb4ced3560e9 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -33,11 +33,22 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)
        u32 new, check, mask;
        int reg;
-        /* Ignore resources for unimplemented BARs and unused resource slots
+        /*
-           for 64 bit BARs. */
+         * Ignore resources for unimplemented BARs and unused resource slots
+         * for 64 bit BARs.
+         */
        if (!res->flags)
                return;
+        /*
+         * Ignore non-moveable resources.  This might be legacy resources for
+         * which no functional BAR register exists or another important
+         * system resource we should better not move around in system address
+         * space.
+         */
+        if (res->flags & IORESOURCE_PCI_FIXED)
+                return;
        pcibios_resource_to_bus(dev, &region, res);
        pr_debug("  got res [%llx:%llx] bus [%lx:%lx] flags %lx for "
@@ -212,6 +223,10 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
                resource_size_t r_align;
                r = &dev->resource[i];
+                if (r->flags & IORESOURCE_PCI_FIXED)
+                        continue;
                r_align = r->end - r->start;
                
                if (!(r->flags) || r->parent)
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 6303970e93c1..24ee8be359f5 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -130,7 +130,7 @@ MFG:HEWLETT-PACKARD;MDL:DESKJET 970C;CMD:MLC,PCL,PML;CLASS:PRINTER;DESCRIPTION:H
 struct usblp {
        struct usb_device       *dev;                   /* USB device */
-        struct semaphore        sem;                    /* locks this struct, especially "dev" */
+        struct mutex            mut;                    /* locks this struct, especially "dev" */
        char                    *writebuf;              /* write transfer_buffer */
        char                    *readbuf;               /* read transfer_buffer */
        char                    *statusbuf;             /* status transfer_buffer */
@@ -465,7 +465,7 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        int twoints[2];
        int retval = 0;
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
        if (!usblp->present) {
                retval = -ENODEV;
                goto done;
@@ -644,14 +644,14 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                }
 done:
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
        return retval;
 }
 static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos)
 {
        struct usblp *usblp = file->private_data;
-        int timeout, rv, err = 0, transfer_length = 0;
+        int timeout, intr, rv, err = 0, transfer_length = 0;
        size_t writecount = 0;
        while (writecount < count) {
@@ -668,14 +668,16 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                        if (rv < 0)
                                return writecount ? writecount : -EINTR;
                }
-                down (&usblp->sem);
+                intr = mutex_lock_interruptible (&usblp->mut);
+                if (intr)
+                        return writecount ? writecount : -EINTR;
                if (!usblp->present) {
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                        return -ENODEV;
                }
                if (usblp->sleeping) {
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                        return writecount ? writecount : -ENODEV;
                }
@@ -687,10 +689,10 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                                err = usblp->writeurb->status;
                        } else
                                err = usblp_check_status(usblp, err);
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                        /* if the fault was due to disconnect, let khubd's
-                         * call to usblp_disconnect() grab usblp->sem ...
+                         * call to usblp_disconnect() grab usblp->mut ...
                         */
                        schedule ();
                        continue;
@@ -702,7 +704,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                 */
                writecount += transfer_length;
                if (writecount == count) {
-                        up(&usblp->sem);
+                        mutex_unlock(&usblp->mut);
                        break;
                }
@@ -714,7 +716,7 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                if (copy_from_user(usblp->writeurb->transfer_buffer, 
                                   buffer + writecount, transfer_length)) {
-                        up(&usblp->sem);
+                        mutex_unlock(&usblp->mut);
                        return writecount ? writecount : -EFAULT;
                }
@@ -727,10 +729,10 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
                                count = -EIO;
                        else
                                count = writecount ? writecount : -ENOMEM;
-                        up (&usblp->sem);
+                        mutex_unlock (&usblp->mut);
                        break;
                }
-                up (&usblp->sem);
+                mutex_unlock (&usblp->mut);
        }
        return count;
@@ -739,12 +741,14 @@ static ssize_t usblp_write(struct file *file, const char __user *buffer, size_t
 static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
 {
        struct usblp *usblp = file->private_data;
-        int rv;
+        int rv, intr;
        if (!usblp->bidir)
                return -EINVAL;
-        down (&usblp->sem);
+        intr = mutex_lock_interruptible (&usblp->mut);
+        if (intr)
+                return -EINTR;
        if (!usblp->present) {
                count = -ENODEV;
                goto done;
@@ -757,9 +761,9 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
                        count = -EAGAIN;
                        goto done;
                }
-                up(&usblp->sem);
+                mutex_unlock(&usblp->mut);
                rv = wait_event_interruptible(usblp->wait, usblp->rcomplete || !usblp->present);
-                down(&usblp->sem);
+                mutex_lock(&usblp->mut);
                if (rv < 0) {
                        count = -EINTR;
                        goto done;
@@ -807,7 +811,7 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
        }
 done:
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
        return count;
 }
@@ -886,7 +890,7 @@ static int usblp_probe(struct usb_interface *intf,
                goto abort;
        }
        usblp->dev = dev;
-        init_MUTEX (&usblp->sem);
+        mutex_init (&usblp->mut);
        init_waitqueue_head(&usblp->wait);
        usblp->ifnum = intf->cur_altsetting->desc.bInterfaceNumber;
        usblp->intf = intf;
@@ -1178,7 +1182,7 @@ static void usblp_disconnect(struct usb_interface *intf)
        device_remove_file(&intf->dev, &dev_attr_ieee1284_id);
        mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
        usblp->present = 0;
        usb_set_intfdata (intf, NULL);
@@ -1187,7 +1191,7 @@ static void usblp_disconnect(struct usb_interface *intf)
                        usblp->writebuf, usblp->writeurb->transfer_dma);
        usb_buffer_free (usblp->dev, USBLP_BUF_SIZE,
                        usblp->readbuf, usblp->readurb->transfer_dma);
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
        if (!usblp->used)
                usblp_cleanup (usblp);
@@ -1200,11 +1204,11 @@ static int usblp_suspend (struct usb_interface *intf, pm_message_t message)
        /* this races against normal access and open */
        mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
        /* we take no more IO */
        usblp->sleeping = 1;
        usblp_unlink_urbs(usblp);
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
        mutex_unlock (&usblp_mutex);
        return 0;
@@ -1216,12 +1220,12 @@ static int usblp_resume (struct usb_interface *intf)
        int r;
        mutex_lock (&usblp_mutex);
-        down (&usblp->sem);
+        mutex_lock (&usblp->mut);
        usblp->sleeping = 0;
        r = handle_bidir (usblp);
-        up (&usblp->sem);
+        mutex_unlock (&usblp->mut);
        mutex_unlock (&usblp_mutex);
        return r;
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 3ed4cb2d56d9..4b3a6ab29bd3 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -962,7 +962,11 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                        kfree(dr);
                        return -EFAULT;
                }
-                snoop(&ps->dev->dev, "control urb\n");
+                snoop(&ps->dev->dev, "control urb: bRequest=%02x "
+                        "bRrequestType=%02x wValue=%04x "
+                        "wIndex=%04x wLength=%04x\n",
+                        dr->bRequest, dr->bRequestType, dr->wValue,
+                        dr->wIndex, dr->wLength);
                break;
        case USBDEVFS_URB_TYPE_BULK:
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 3e0abbb49fe1..812c733ba8ce 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -43,14 +43,16 @@
 #include <linux/usb_gadget.h>
 #include <asm/byteorder.h>
+#include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/mach-types.h>
-#include <asm/arch/hardware.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/board.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/at91sam9261_matrix.h>
 #include "at91_udc.h"
@@ -78,27 +80,11 @@
 static const char driver_name [] = "at91_udc";
 static const char ep0name[] = "ep0";
-/*-------------------------------------------------------------------------*/
-/*
+#define at91_udp_read(dev, reg) \
- * Read from a UDP register.
+        __raw_readl((dev)->udp_baseaddr + (reg))
- */
+#define at91_udp_write(dev, reg, val) \
-static inline unsigned long at91_udp_read(unsigned int reg)
+        __raw_writel((val), (dev)->udp_baseaddr + (reg))
-{
-        void __iomem *udp_base = (void __iomem *)AT91_VA_BASE_UDP;
-        return __raw_readl(udp_base + reg);
-}
-/*
- * Write to a UDP register.
- */
-static inline void at91_udp_write(unsigned int reg, unsigned long value)
-{
-        void __iomem *udp_base = (void __iomem *)AT91_VA_BASE_UDP;
-        __raw_writel(value, udp_base + reg);
-}
 /*-------------------------------------------------------------------------*/
@@ -210,13 +196,13 @@ static int proc_udc_show(struct seq_file *s, void *unused)
                return 0;
        }
-        tmp = at91_udp_read(AT91_UDP_FRM_NUM);
+        tmp = at91_udp_read(udc, AT91_UDP_FRM_NUM);
        seq_printf(s, "frame %05x:%s%s frame=%d\n", tmp,
                (tmp & AT91_UDP_FRM_OK) ? " ok" : "",
                (tmp & AT91_UDP_FRM_ERR) ? " err" : "",
                (tmp & AT91_UDP_NUM));
-        tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+        tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
        seq_printf(s, "glbstate %02x:%s" FOURBITS "\n", tmp,
                (tmp & AT91_UDP_RMWUPE) ? " rmwupe" : "",
                (tmp & AT91_UDP_RSMINPR) ? " rsminpr" : "",
@@ -224,13 +210,13 @@ static int proc_udc_show(struct seq_file *s, void *unused)
                (tmp & AT91_UDP_CONFG) ? " confg" : "",
                (tmp & AT91_UDP_FADDEN) ? " fadden" : "");
-        tmp = at91_udp_read(AT91_UDP_FADDR);
+        tmp = at91_udp_read(udc, AT91_UDP_FADDR);
        seq_printf(s, "faddr   %03x:%s fadd=%d\n", tmp,
                (tmp & AT91_UDP_FEN) ? " fen" : "",
                (tmp & AT91_UDP_FADD));
-        proc_irq_show(s, "imr   ", at91_udp_read(AT91_UDP_IMR));
+        proc_irq_show(s, "imr   ", at91_udp_read(udc, AT91_UDP_IMR));
-        proc_irq_show(s, "isr   ", at91_udp_read(AT91_UDP_ISR));
+        proc_irq_show(s, "isr   ", at91_udp_read(udc, AT91_UDP_ISR));
        if (udc->enabled && udc->vbus) {
                proc_ep_show(s, &udc->ep[0]);
@@ -286,6 +272,7 @@ static inline void remove_debug_file(struct at91_udc *udc) {}
 static void done(struct at91_ep *ep, struct at91_request *req, int status)
 {
        unsigned        stopped = ep->stopped;
+        struct at91_udc *udc = ep->udc;
        list_del_init(&req->queue);
        if (req->req.status == -EINPROGRESS)
@@ -301,7 +288,7 @@ static void done(struct at91_ep *ep, struct at91_request *req, int status)
        /* ep0 is always ready; other endpoints need a non-empty queue */
        if (list_empty(&ep->queue) && ep->int_mask != (1 << 0))
-                at91_udp_write(AT91_UDP_IDR, ep->int_mask);
+                at91_udp_write(udc, AT91_UDP_IDR, ep->int_mask);
 }
 /*-------------------------------------------------------------------------*/
@@ -554,8 +541,8 @@ ok:
         * reset/init endpoint fifo.  NOTE:  leaves fifo_bank alone,
         * since endpoint resets don't reset hw pingpong state.
         */
-        at91_udp_write(AT91_UDP_RST_EP, ep->int_mask);
+        at91_udp_write(dev, AT91_UDP_RST_EP, ep->int_mask);
-        at91_udp_write(AT91_UDP_RST_EP, 0);
+        at91_udp_write(dev, AT91_UDP_RST_EP, 0);
        local_irq_restore(flags);
        return 0;
@@ -564,6 +551,7 @@ ok:
 static int at91_ep_disable (struct usb_ep * _ep)
 {
        struct at91_ep  *ep = container_of(_ep, struct at91_ep, ep);
+        struct at91_udc *udc = ep->udc;
        unsigned long   flags;
        if (ep == &ep->udc->ep[0])
@@ -579,8 +567,8 @@ static int at91_ep_disable (struct usb_ep * _ep)
        /* reset fifos and endpoint */
        if (ep->udc->clocked) {
-                at91_udp_write(AT91_UDP_RST_EP, ep->int_mask);
+                at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
-                at91_udp_write(AT91_UDP_RST_EP, 0);
+                at91_udp_write(udc, AT91_UDP_RST_EP, 0);
                __raw_writel(0, ep->creg);
        }
@@ -695,10 +683,10 @@ static int at91_ep_queue(struct usb_ep *_ep,
                         * reconfigures the endpoints.
                         */
                        if (dev->wait_for_config_ack) {
-                                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+                                tmp = at91_udp_read(dev, AT91_UDP_GLB_STAT);
                                tmp ^= AT91_UDP_CONFG;
                                VDBG("toggle config\n");
-                                at91_udp_write(AT91_UDP_GLB_STAT, tmp);
+                                at91_udp_write(dev, AT91_UDP_GLB_STAT, tmp);
                        }
                        if (req->req.length == 0) {
 ep0_in_status:
@@ -727,7 +715,7 @@ ep0_in_status:
        if (req && !status) {
                list_add_tail (&req->queue, &ep->queue);
-                at91_udp_write(AT91_UDP_IER, ep->int_mask);
+                at91_udp_write(dev, AT91_UDP_IER, ep->int_mask);
        }
 done:
        local_irq_restore(flags);
@@ -758,6 +746,7 @@ static int at91_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
 static int at91_ep_set_halt(struct usb_ep *_ep, int value)
 {
        struct at91_ep  *ep = container_of(_ep, struct at91_ep, ep);
+        struct at91_udc *udc = ep->udc;
        u32 __iomem     *creg;
        u32             csr;
        unsigned long   flags;
@@ -785,8 +774,8 @@ static int at91_ep_set_halt(struct usb_ep *_ep, int value)
                        csr |= AT91_UDP_FORCESTALL;
                        VDBG("halt %s\n", ep->ep.name);
                } else {
-                        at91_udp_write(AT91_UDP_RST_EP, ep->int_mask);
+                        at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
-                        at91_udp_write(AT91_UDP_RST_EP, 0);
+                        at91_udp_write(udc, AT91_UDP_RST_EP, 0);
                        csr &= ~AT91_UDP_FORCESTALL;
                }
                __raw_writel(csr, creg);
@@ -813,9 +802,11 @@ static struct usb_ep_ops at91_ep_ops = {
 static int at91_get_frame(struct usb_gadget *gadget)
 {
+        struct at91_udc *udc = to_udc(gadget);
        if (!to_udc(gadget)->clocked)
                return -EINVAL;
-        return at91_udp_read(AT91_UDP_FRM_NUM) & AT91_UDP_NUM;
+        return at91_udp_read(udc, AT91_UDP_FRM_NUM) & AT91_UDP_NUM;
 }
 static int at91_wakeup(struct usb_gadget *gadget)
@@ -833,11 +824,11 @@ static int at91_wakeup(struct usb_gadget *gadget)
        /* NOTE:  some "early versions" handle ESR differently ... */
-        glbstate = at91_udp_read(AT91_UDP_GLB_STAT);
+        glbstate = at91_udp_read(udc, AT91_UDP_GLB_STAT);
        if (!(glbstate & AT91_UDP_ESR))
                goto done;
        glbstate |= AT91_UDP_ESR;
-        at91_udp_write(AT91_UDP_GLB_STAT, glbstate);
+        at91_udp_write(udc, AT91_UDP_GLB_STAT, glbstate);
 done:
        local_irq_restore(flags);
@@ -861,6 +852,7 @@ static void udc_reinit(struct at91_udc *udc)
                ep->stopped = 0;
                ep->fifo_bank = 0;
                ep->ep.maxpacket = ep->maxpacket;
+                ep->creg = (void __iomem *) udc->udp_baseaddr + AT91_UDP_CSR(i);
                // initialiser une queue par endpoint
                INIT_LIST_HEAD(&ep->queue);
        }
@@ -915,14 +907,41 @@ static void pullup(struct at91_udc *udc, int is_on)
        if (!udc->enabled || !udc->vbus)
                is_on = 0;
        DBG("%sactive\n", is_on ? "" : "in");
        if (is_on) {
                clk_on(udc);
-                at91_udp_write(AT91_UDP_TXVC, 0);
+                at91_udp_write(udc, AT91_UDP_TXVC, 0);
-                at91_set_gpio_value(udc->board.pullup_pin, 1);
+                if (cpu_is_at91rm9200())
-        } else  {
+                        at91_set_gpio_value(udc->board.pullup_pin, 1);
+                else if (cpu_is_at91sam9260()) {
+                        u32     txvc = at91_udp_read(udc, AT91_UDP_TXVC);
+                        txvc |= AT91_UDP_TXVC_PUON;
+                        at91_udp_write(udc, AT91_UDP_TXVC, txvc);
+                } else if (cpu_is_at91sam9261()) {
+                        u32     usbpucr;
+                        usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR);
+                        usbpucr |= AT91_MATRIX_USBPUCR_PUON;
+                        at91_sys_write(AT91_MATRIX_USBPUCR, usbpucr);
+                }
+        } else {
                stop_activity(udc);
-                at91_udp_write(AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+                at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
-                at91_set_gpio_value(udc->board.pullup_pin, 0);
+                if (cpu_is_at91rm9200())
+                        at91_set_gpio_value(udc->board.pullup_pin, 0);
+                else if (cpu_is_at91sam9260()) {
+                        u32     txvc = at91_udp_read(udc, AT91_UDP_TXVC);
+                        txvc &= ~AT91_UDP_TXVC_PUON;
+                        at91_udp_write(udc, AT91_UDP_TXVC, txvc);
+                } else if (cpu_is_at91sam9261()) {
+                        u32     usbpucr;
+                        usbpucr = at91_sys_read(AT91_MATRIX_USBPUCR);
+                        usbpucr &= ~AT91_MATRIX_USBPUCR_PUON;
+                        at91_sys_write(AT91_MATRIX_USBPUCR, usbpucr);
+                }
                clk_off(udc);
        }
 }
@@ -936,7 +955,10 @@ static int at91_vbus_session(struct usb_gadget *gadget, int is_active)
        // VDBG("vbus %s\n", is_active ? "on" : "off");
        local_irq_save(flags);
        udc->vbus = (is_active != 0);
-        pullup(udc, is_active);
+        if (udc->driver)
+                pullup(udc, is_active);
+        else
+                pullup(udc, 0);
        local_irq_restore(flags);
        return 0;
 }
@@ -1086,7 +1108,7 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
        case ((USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
                        | USB_REQ_SET_CONFIGURATION:
-                tmp = at91_udp_read(AT91_UDP_GLB_STAT) & AT91_UDP_CONFG;
+                tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT) & AT91_UDP_CONFG;
                if (pkt.r.wValue)
                        udc->wait_for_config_ack = (tmp == 0);
                else
@@ -1103,7 +1125,7 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
        case ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
                        | USB_REQ_GET_STATUS:
                tmp = (udc->selfpowered << USB_DEVICE_SELF_POWERED);
-                if (at91_udp_read(AT91_UDP_GLB_STAT) & AT91_UDP_ESR)
+                if (at91_udp_read(udc, AT91_UDP_GLB_STAT) & AT91_UDP_ESR)
                        tmp |= (1 << USB_DEVICE_REMOTE_WAKEUP);
                PACKET("get device status\n");
                __raw_writeb(tmp, dreg);
@@ -1114,17 +1136,17 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
                        | USB_REQ_SET_FEATURE:
                if (w_value != USB_DEVICE_REMOTE_WAKEUP)
                        goto stall;
-                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+                tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
                tmp |= AT91_UDP_ESR;
-                at91_udp_write(AT91_UDP_GLB_STAT, tmp);
+                at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
                goto succeed;
        case ((USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
                        | USB_REQ_CLEAR_FEATURE:
                if (w_value != USB_DEVICE_REMOTE_WAKEUP)
                        goto stall;
-                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+                tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
                tmp &= ~AT91_UDP_ESR;
-                at91_udp_write(AT91_UDP_GLB_STAT, tmp);
+                at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
                goto succeed;
        /*
@@ -1206,8 +1228,8 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
                } else if (ep->is_in)
                        goto stall;
-                at91_udp_write(AT91_UDP_RST_EP, ep->int_mask);
+                at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
-                at91_udp_write(AT91_UDP_RST_EP, 0);
+                at91_udp_write(udc, AT91_UDP_RST_EP, 0);
                tmp = __raw_readl(ep->creg);
                tmp |= CLR_FX;
                tmp &= ~(SET_FX | AT91_UDP_FORCESTALL);
@@ -1222,7 +1244,10 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
 #undef w_length
        /* pass request up to the gadget driver */
-        status = udc->driver->setup(&udc->gadget, &pkt.r);
+        if (udc->driver)
+                status = udc->driver->setup(&udc->gadget, &pkt.r);
+        else
+                status = -ENODEV;
        if (status < 0) {
 stall:
                VDBG("req %02x.%02x protocol STALL; stat %d\n",
@@ -1300,13 +1325,13 @@ static void handle_ep0(struct at91_udc *udc)
                        if (udc->wait_for_addr_ack) {
                                u32     tmp;
-                                at91_udp_write(AT91_UDP_FADDR,
+                                at91_udp_write(udc, AT91_UDP_FADDR,
                                                AT91_UDP_FEN | udc->addr);
-                                tmp = at91_udp_read(AT91_UDP_GLB_STAT);
+                                tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
                                tmp &= ~AT91_UDP_FADDEN;
                                if (udc->addr)
                                        tmp |= AT91_UDP_FADDEN;
-                                at91_udp_write(AT91_UDP_GLB_STAT, tmp);
+                                at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
                                udc->wait_for_addr_ack = 0;
                                VDBG("address %d\n", udc->addr);
@@ -1374,28 +1399,28 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
        while (rescans--) {
                u32 status;
-                status = at91_udp_read(AT91_UDP_ISR)
+                status = at91_udp_read(udc, AT91_UDP_ISR)
-                        & at91_udp_read(AT91_UDP_IMR);
+                        & at91_udp_read(udc, AT91_UDP_IMR);
                if (!status)
                        break;
                /* USB reset irq:  not maskable */
                if (status & AT91_UDP_ENDBUSRES) {
-                        at91_udp_write(AT91_UDP_IDR, ~MINIMUS_INTERRUPTUS);
+                        at91_udp_write(udc, AT91_UDP_IDR, ~MINIMUS_INTERRUPTUS);
-                        at91_udp_write(AT91_UDP_IER, MINIMUS_INTERRUPTUS);
+                        at91_udp_write(udc, AT91_UDP_IER, MINIMUS_INTERRUPTUS);
                        /* Atmel code clears this irq twice */
-                        at91_udp_write(AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
+                        at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
-                        at91_udp_write(AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
+                        at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
                        VDBG("end bus reset\n");
                        udc->addr = 0;
                        stop_activity(udc);
                        /* enable ep0 */
-                        at91_udp_write(AT91_UDP_CSR(0),
+                        at91_udp_write(udc, AT91_UDP_CSR(0),
                                        AT91_UDP_EPEDS | AT91_UDP_EPTYPE_CTRL);
                        udc->gadget.speed = USB_SPEED_FULL;
                        udc->suspended = 0;
-                        at91_udp_write(AT91_UDP_IER, AT91_UDP_EP(0));
+                        at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_EP(0));
                        /*
                         * NOTE:  this driver keeps clocks off unless the
@@ -1406,9 +1431,9 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
                /* host initiated suspend (3+ms bus idle) */
                } else if (status & AT91_UDP_RXSUSP) {
-                        at91_udp_write(AT91_UDP_IDR, AT91_UDP_RXSUSP);
+                        at91_udp_write(udc, AT91_UDP_IDR, AT91_UDP_RXSUSP);
-                        at91_udp_write(AT91_UDP_IER, AT91_UDP_RXRSM);
+                        at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_RXRSM);
-                        at91_udp_write(AT91_UDP_ICR, AT91_UDP_RXSUSP);
+                        at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_RXSUSP);
                        // VDBG("bus suspend\n");
                        if (udc->suspended)
                                continue;
@@ -1425,9 +1450,9 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc)
                /* host initiated resume */
                } else if (status & AT91_UDP_RXRSM) {
-                        at91_udp_write(AT91_UDP_IDR, AT91_UDP_RXRSM);
+                        at91_udp_write(udc, AT91_UDP_IDR, AT91_UDP_RXRSM);
-                        at91_udp_write(AT91_UDP_IER, AT91_UDP_RXSUSP);
+                        at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_RXSUSP);
-                        at91_udp_write(AT91_UDP_ICR, AT91_UDP_RXRSM);
+                        at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_RXRSM);
                        // VDBG("bus resume\n");
                        if (!udc->suspended)
                                continue;
@@ -1485,8 +1510,6 @@ static struct at91_udc controller = {
                },
                .udc            = &controller,
                .maxpacket      = 8,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(0)),
                .int_mask       = 1 << 0,
        },
        .ep[1] = {
@@ -1497,8 +1520,6 @@ static struct at91_udc controller = {
                .udc            = &controller,
                .is_pingpong    = 1,
                .maxpacket      = 64,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(1)),
                .int_mask       = 1 << 1,
        },
        .ep[2] = {
@@ -1509,8 +1530,6 @@ static struct at91_udc controller = {
                .udc            = &controller,
                .is_pingpong    = 1,
                .maxpacket      = 64,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(2)),
                .int_mask       = 1 << 2,
        },
        .ep[3] = {
@@ -1521,8 +1540,6 @@ static struct at91_udc controller = {
                },
                .udc            = &controller,
                .maxpacket      = 8,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(3)),
                .int_mask       = 1 << 3,
        },
        .ep[4] = {
@@ -1533,8 +1550,6 @@ static struct at91_udc controller = {
                .udc            = &controller,
                .is_pingpong    = 1,
                .maxpacket      = 256,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(4)),
                .int_mask       = 1 << 4,
        },
        .ep[5] = {
@@ -1545,8 +1560,6 @@ static struct at91_udc controller = {
                .udc            = &controller,
                .is_pingpong    = 1,
                .maxpacket      = 256,
-                .creg           = (void __iomem *)(AT91_VA_BASE_UDP
-                                        + AT91_UDP_CSR(5)),
                .int_mask       = 1 << 5,
        },
        /* ep6 and ep7 are also reserved (custom silicon might use them) */
@@ -1572,9 +1585,8 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
        int             retval;
        if (!driver
-                        || driver->speed != USB_SPEED_FULL
+                        || driver->speed < USB_SPEED_FULL
                        || !driver->bind
-                        || !driver->unbind
                        || !driver->setup) {
                DBG("bad parameter.\n");
                return -EINVAL;
@@ -1595,6 +1607,10 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
        if (retval) {
                DBG("driver->bind() returned %d\n", retval);
                udc->driver = NULL;
+                udc->gadget.dev.driver = NULL;
+                udc->gadget.dev.driver_data = NULL;
+                udc->enabled = 0;
+                udc->selfpowered = 0;
                return retval;
        }
@@ -1611,12 +1627,12 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
 {
        struct at91_udc *udc = &controller;
-        if (!driver || driver != udc->driver)
+        if (!driver || driver != udc->driver || !driver->unbind)
                return -EINVAL;
        local_irq_disable();
        udc->enabled = 0;
-        at91_udp_write(AT91_UDP_IDR, ~0);
+        at91_udp_write(udc, AT91_UDP_IDR, ~0);
        pullup(udc, 0);
        local_irq_enable();
@@ -1641,6 +1657,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
        struct device   *dev = &pdev->dev;
        struct at91_udc *udc;
        int             retval;
+        struct resource *res;
        if (!dev->platform_data) {
                /* small (so we copy it) but critical! */
@@ -1658,7 +1675,13 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
                return -ENODEV;
        }
-        if (!request_mem_region(AT91RM9200_BASE_UDP, SZ_16K, driver_name)) {
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -ENXIO;
+        if (!request_mem_region(res->start,
+                        res->end - res->start + 1,
+                        driver_name)) {
                DBG("someone's using UDC memory\n");
                return -EBUSY;
        }
@@ -1668,15 +1691,23 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
        udc->gadget.dev.parent = dev;
        udc->board = *(struct at91_udc_data *) dev->platform_data;
        udc->pdev = pdev;
-        udc_reinit(udc);
        udc->enabled = 0;
+        udc->udp_baseaddr = ioremap(res->start, res->end - res->start + 1);
+        if (!udc->udp_baseaddr) {
+                release_mem_region(res->start, res->end - res->start + 1);
+                return -ENOMEM;
+        }
+        udc_reinit(udc);
        /* get interface and function clocks */
        udc->iclk = clk_get(dev, "udc_clk");
        udc->fclk = clk_get(dev, "udpck");
        if (IS_ERR(udc->iclk) || IS_ERR(udc->fclk)) {
                DBG("clocks missing\n");
-                return -ENODEV;
+                retval = -ENODEV;
+                goto fail0;
        }
        retval = device_register(&udc->gadget.dev);
@@ -1685,8 +1716,10 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
        /* don't do anything until we have both gadget driver and VBUS */
        clk_enable(udc->iclk);
-        at91_udp_write(AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+        at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
-        at91_udp_write(AT91_UDP_IDR, 0xffffffff);
+        at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff);
+        /* Clear all pending interrupts - UDP may be used by bootloader. */
+        at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff);
        clk_disable(udc->iclk);
        /* request UDC and maybe VBUS irqs */
@@ -1698,6 +1731,11 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
                goto fail1;
        }
        if (udc->board.vbus_pin > 0) {
+                /*
+                 * Get the initial state of VBUS - we cannot expect
+                 * a pending interrupt.
+                 */
+                udc->vbus = at91_get_gpio_value(udc->board.vbus_pin);
                if (request_irq(udc->board.vbus_pin, at91_vbus_irq,
                                IRQF_DISABLED, driver_name, udc)) {
                        DBG("request vbus irq %d failed\n",
@@ -1720,7 +1758,7 @@ static int __devinit at91udc_probe(struct platform_device *pdev)
 fail1:
        device_unregister(&udc->gadget.dev);
 fail0:
-        release_mem_region(AT91RM9200_BASE_UDP, SZ_16K);
+        release_mem_region(res->start, res->end - res->start + 1);
        DBG("%s probe failed, %d\n", driver_name, retval);
        return retval;
 }
@@ -1728,13 +1766,14 @@ fail0:
 static int __devexit at91udc_remove(struct platform_device *pdev)
 {
        struct at91_udc *udc = platform_get_drvdata(pdev);
+        struct resource *res;
        DBG("remove\n");
-        pullup(udc, 0);
+        if (udc->driver)
+                return -EBUSY;
-        if (udc->driver != 0)
+        pullup(udc, 0);
-                usb_gadget_unregister_driver(udc->driver);
        device_init_wakeup(&pdev->dev, 0);
        remove_debug_file(udc);
@@ -1742,7 +1781,10 @@ static int __devexit at91udc_remove(struct platform_device *pdev)
                free_irq(udc->board.vbus_pin, udc);
        free_irq(udc->udp_irq, udc);
        device_unregister(&udc->gadget.dev);
-        release_mem_region(AT91RM9200_BASE_UDP, SZ_16K);
+        iounmap(udc->udp_baseaddr);
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        release_mem_region(res->start, res->end - res->start + 1);
        clk_put(udc->iclk);
        clk_put(udc->fclk);
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 882af42e86cc..677089baa59d 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -51,10 +51,10 @@
 #define     AT91_UDP_EP(n)      (1 << (n))      /* Endpoint Interrupt Status */
 #define     AT91_UDP_RXSUSP     (1 <<  8)       /* USB Suspend Interrupt Status */
 #define     AT91_UDP_RXRSM      (1 <<  9)       /* USB Resume Interrupt Status */
-#define     AT91_UDP_EXTRSM     (1 << 10)       /* External Resume Interrupt Status */
+#define     AT91_UDP_EXTRSM     (1 << 10)       /* External Resume Interrupt Status [AT91RM9200 only] */
 #define     AT91_UDP_SOFINT     (1 << 11)       /* Start of Frame Interrupt Status */
 #define     AT91_UDP_ENDBUSRES  (1 << 12)       /* End of Bus Reset Interrpt Status */
-#define     AT91_UDP_WAKEUP     (1 << 13)       /* USB Wakeup Interrupt Status */
+#define     AT91_UDP_WAKEUP     (1 << 13)       /* USB Wakeup Interrupt Status [AT91RM9200 only] */
 #define AT91_UDP_ICR            0x20            /* Interrupt Clear Register */
 #define AT91_UDP_RST_EP         0x28            /* Reset Endpoint Register */
@@ -84,7 +84,7 @@
 #define AT91_UDP_TXVC           0x74            /* Transceiver Control Register */
 #define     AT91_UDP_TXVC_TXVDIS (1 << 8)       /* Transceiver Disable */
+#define     AT91_UDP_TXVC_PUON   (1 << 9)       /* PullUp On [AT91SAM9260 only] */
 /*-------------------------------------------------------------------------*/
@@ -141,6 +141,7 @@ struct at91_udc {
        struct clk                      *iclk, *fclk;
        struct platform_device          *pdev;
        struct proc_dir_entry           *pde;
+        void __iomem                    *udp_baseaddr;
        int                             udp_irq;
 };
diff --git a/drivers/usb/gadget/dummy_hcd.c b/drivers/usb/gadget/dummy_hcd.c
index f1f32d7be5f9..3c2bc075ef4f 100644
--- a/drivers/usb/gadget/dummy_hcd.c
+++ b/drivers/usb/gadget/dummy_hcd.c
@@ -779,7 +779,7 @@ usb_gadget_register_driver (struct usb_gadget_driver *driver)
                return -EINVAL;
        if (dum->driver)
                return -EBUSY;
-        if (!driver->bind || !driver->unbind || !driver->setup
+        if (!driver->bind || !driver->setup
                        || driver->speed == USB_SPEED_UNKNOWN)
                return -EINVAL;
@@ -837,7 +837,8 @@ usb_gadget_register_driver (struct usb_gadget_driver *driver)
 err_bind_driver:
        driver_unregister (&driver->driver);
 err_register:
-        driver->unbind (&dum->gadget);
+        if (driver->unbind)
+                driver->unbind (&dum->gadget);
        spin_lock_irq (&dum->lock);
        dum->pullup = 0;
        set_link_state (dum);
@@ -857,7 +858,7 @@ usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
        if (!dum)
                return -ENODEV;
-        if (!driver || driver != dum->driver)
+        if (!driver || driver != dum->driver || !driver->unbind)
                return -EINVAL;
        dev_dbg (udc_dev(dum), "unregister gadget driver '%s'\n",
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index a265e262a2ee..72f2ae96fbf3 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -4100,7 +4100,7 @@ static struct usb_gadget_driver		fsg_driver = {
 #endif
        .function       = (char *) longname,
        .bind           = fsg_bind,
-        .unbind         = __exit_p(fsg_unbind),
+        .unbind         = fsg_unbind,
        .disconnect     = fsg_disconnect,
        .setup          = fsg_setup,
        .suspend        = fsg_suspend,
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 31351826f2ba..f1a679656c96 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -123,7 +123,7 @@ struct gmidi_device {
        struct usb_request      *req;           /* for control responses */
        u8                      config;
        struct usb_ep           *in_ep, *out_ep;
-        struct snd_card         *card;
+        struct snd_card         *card;
        struct snd_rawmidi      *rmidi;
        struct snd_rawmidi_substream *in_substream;
        struct snd_rawmidi_substream *out_substream;
@@ -490,7 +490,7 @@ static void gmidi_complete(struct usb_ep *ep, struct usb_request *req)
        int status = req->status;
        switch (status) {
-        case 0:                         /* normal completion */
+        case 0:                         /* normal completion */
                if (ep == dev->out_ep) {
                        /* we received stuff.
                           req is queued again, below */
@@ -505,7 +505,7 @@ static void gmidi_complete(struct usb_ep *ep, struct usb_request *req)
                break;
        /* this endpoint is normally active while we're configured */
-        case -ECONNABORTED:             /* hardware forced ep reset */
+        case -ECONNABORTED:             /* hardware forced ep reset */
        case -ECONNRESET:               /* request dequeued */
        case -ESHUTDOWN:                /* disconnect from host */
                VDBG(dev, "%s gone (%d), %d/%d\n", ep->name, status,
@@ -656,7 +656,7 @@ gmidi_set_config(struct gmidi_device *dev, unsigned number, gfp_t gfp_flags)
                case USB_SPEED_LOW:     speed = "low"; break;
                case USB_SPEED_FULL:    speed = "full"; break;
                case USB_SPEED_HIGH:    speed = "high"; break;
-                default:                speed = "?"; break;
+                default:                speed = "?"; break;
                }
                dev->config = number;
@@ -1308,7 +1308,7 @@ static struct usb_gadget_driver gmidi_driver = {
        .speed          = USB_SPEED_FULL,
        .function       = (char *)longname,
        .bind           = gmidi_bind,
-        .unbind         = __exit_p(gmidi_unbind),
+        .unbind         = gmidi_unbind,
        .setup          = gmidi_setup,
        .disconnect     = gmidi_disconnect,
@@ -1316,7 +1316,7 @@ static struct usb_gadget_driver gmidi_driver = {
        .suspend        = gmidi_suspend,
        .resume         = gmidi_resume,
-        .driver         = {
+        .driver         = {
                .name           = (char *)shortname,
                .owner          = THIS_MODULE,
        },
diff --git a/drivers/usb/gadget/goku_udc.c b/drivers/usb/gadget/goku_udc.c
index 805a9826842d..d0ef1d6b3fac 100644
--- a/drivers/usb/gadget/goku_udc.c
+++ b/drivers/usb/gadget/goku_udc.c
@@ -1432,7 +1432,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
        if (!driver
                        || driver->speed != USB_SPEED_FULL
                        || !driver->bind
-                        || !driver->unbind
                        || !driver->disconnect
                        || !driver->setup)
                return -EINVAL;
@@ -1495,7 +1494,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
        if (!dev)
                return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                return -EINVAL;
        spin_lock_irqsave(&dev->lock, flags);
@@ -1808,13 +1807,8 @@ static void goku_remove(struct pci_dev *pdev)
        struct goku_udc         *dev = pci_get_drvdata(pdev);
        DBG(dev, "%s\n", __FUNCTION__);
-        /* start with the driver above us */
-        if (dev->driver) {
+        BUG_ON(dev->driver);
-                /* should have been done already by driver model core */
-                WARN(dev, "pci remove, driver '%s' is still registered\n",
-                                dev->driver->driver.name);
-                usb_gadget_unregister_driver(dev->driver);
-        }
 #ifdef CONFIG_USB_GADGET_DEBUG_FILES
        remove_proc_entry(proc_node_name, NULL);
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 4a991564a03e..a0a73c08a344 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -422,9 +422,10 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
        DEBUG("%s: %s\n", __FUNCTION__, driver->driver.name);
        if (!driver
-            || driver->speed != USB_SPEED_FULL
+                        || driver->speed != USB_SPEED_FULL
-            || !driver->bind
+                        || !driver->bind
-            || !driver->unbind || !driver->disconnect || !driver->setup)
+                        || !driver->disconnect
+                        || !driver->setup)
                return -EINVAL;
        if (!dev)
                return -ENODEV;
@@ -471,7 +472,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
        if (!dev)
                return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                return -EINVAL;
        spin_lock_irqsave(&dev->lock, flags);
@@ -2125,9 +2126,11 @@ static int lh7a40x_udc_remove(struct platform_device *pdev)
        DEBUG("%s: %p\n", __FUNCTION__, pdev);
+        if (dev->driver)
+                return -EBUSY;
        udc_disable(dev);
        remove_proc_files();
-        usb_gadget_unregister_driver(dev->driver);
        free_irq(IRQ_USBINTR, dev);
diff --git a/drivers/usb/gadget/net2280.c b/drivers/usb/gadget/net2280.c
index 3024c679e38e..569eb8ccf232 100644
--- a/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@ -2020,7 +2020,6 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
        if (!driver
                        || driver->speed != USB_SPEED_HIGH
                        || !driver->bind
-                        || !driver->unbind
                        || !driver->setup)
                return -EINVAL;
        if (!dev)
@@ -2107,7 +2106,7 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
        if (!dev)
                return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                return -EINVAL;
        spin_lock_irqsave (&dev->lock, flags);
@@ -2803,13 +2802,7 @@ static void net2280_remove (struct pci_dev *pdev)
 {
        struct net2280          *dev = pci_get_drvdata (pdev);
-        /* start with the driver above us */
+        BUG_ON(dev->driver);
-        if (dev->driver) {
-                /* should have been done already by driver model core */
-                WARN (dev, "pci remove, driver '%s' is still registered\n",
-                                dev->driver->driver.name);
-                usb_gadget_unregister_driver (dev->driver);
-        }
        /* then clean up the resources we allocated during probe() */
        net2280_led_shutdown (dev);
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 030d87c28c2f..15d77c307930 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2043,7 +2043,6 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
                        // FIXME if otg, check:  driver->is_otg
                        || driver->speed < USB_SPEED_FULL
                        || !driver->bind
-                        || !driver->unbind
                        || !driver->setup)
                return -EINVAL;
@@ -2087,9 +2086,11 @@ int usb_gadget_register_driver (struct usb_gadget_driver *driver)
                status = otg_set_peripheral(udc->transceiver, &udc->gadget);
                if (status < 0) {
                        ERR("can't bind to transceiver\n");
-                        driver->unbind (&udc->gadget);
+                        if (driver->unbind) {
-                        udc->gadget.dev.driver = NULL;
+                                driver->unbind (&udc->gadget);
-                        udc->driver = NULL;
+                                udc->gadget.dev.driver = NULL;
+                                udc->driver = NULL;
+                        }
                        goto done;
                }
        } else {
@@ -2117,7 +2118,7 @@ int usb_gadget_unregister_driver (struct usb_gadget_driver *driver)
        if (!udc)
                return -ENODEV;
-        if (!driver || driver != udc->driver)
+        if (!driver || driver != udc->driver || !driver->unbind)
                return -EINVAL;
        if (machine_is_omap_innovator() || machine_is_omap_osk())
@@ -2870,6 +2871,8 @@ static int __exit omap_udc_remove(struct platform_device *pdev)
        if (!udc)
                return -ENODEV;
+        if (udc->driver)
+                return -EBUSY;
        udc->done = &done;
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 1ed506e95985..b78de9694665 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -1623,7 +1623,6 @@ int usb_gadget_register_driver(struct usb_gadget_driver *driver)
        if (!driver
                        || driver->speed < USB_SPEED_FULL
                        || !driver->bind
-                        || !driver->unbind
                        || !driver->disconnect
                        || !driver->setup)
                return -EINVAL;
@@ -1694,7 +1693,7 @@ int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
        if (!dev)
                return -ENODEV;
-        if (!driver || driver != dev->driver)
+        if (!driver || driver != dev->driver || !driver->unbind)
                return -EINVAL;
        local_irq_disable();
@@ -2638,9 +2637,11 @@ static int __exit pxa2xx_udc_remove(struct platform_device *pdev)
 {
        struct pxa2xx_udc *dev = platform_get_drvdata(pdev);
+        if (dev->driver)
+                return -EBUSY;
        udc_disable(dev);
        remove_proc_files();
-        usb_gadget_unregister_driver(dev->driver);
        if (dev->got_irq) {
                free_irq(IRQ_USB, dev);
diff --git a/drivers/usb/gadget/serial.c b/drivers/usb/gadget/serial.c
index 2d12bf9f19d6..f8a3ec64635d 100644
--- a/drivers/usb/gadget/serial.c
+++ b/drivers/usb/gadget/serial.c
@@ -296,7 +296,7 @@ static struct usb_gadget_driver gs_gadget_driver = {
 #endif /* CONFIG_USB_GADGET_DUALSPEED */
        .function =             GS_LONG_NAME,
        .bind =                 gs_bind,
-        .unbind =               __exit_p(gs_unbind),
+        .unbind =               gs_unbind,
        .setup =                gs_setup,
        .disconnect =           gs_disconnect,
        .driver = {
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index b466581beb4a..cc405512fa1c 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -187,7 +187,6 @@ ohci_at91_start (struct usb_hcd *hcd)
 {
        struct at91_usbh_data   *board = hcd->self.controller->platform_data;
        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
-        struct usb_device       *root = hcd->self.root_hub;
        int                     ret;
        if ((ret = ohci_init(ohci)) < 0)
@@ -221,7 +220,7 @@ static const struct hc_driver ohci_at91_hc_driver = {
         */
        .start =                ohci_at91_start,
        .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
        /*
         * managing i/o requests and associated device resources
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index 24e23c5783d8..e70b2430e2a9 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -269,7 +269,7 @@ static const struct hc_driver ohci_au1xxx_hc_driver = {
         */
        .start =                ohci_au1xxx_start,
        .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
        /*
         * managing i/o requests and associated device resources
@@ -336,7 +336,7 @@ static int ohci_hcd_au1xxx_drv_resume(struct platform_device *dev)
 static struct platform_driver ohci_hcd_au1xxx_driver = {
        .probe          = ohci_hcd_au1xxx_drv_probe,
        .remove         = ohci_hcd_au1xxx_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
        /*.suspend      = ohci_hcd_au1xxx_drv_suspend, */
        /*.resume       = ohci_hcd_au1xxx_drv_resume, */
        .driver         = {
diff --git a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
index 0f47a57dac28..273d5ddb72be 100644
--- a/drivers/usb/host/ohci-dbg.c
+++ b/drivers/usb/host/ohci-dbg.c
@@ -16,7 +16,7 @@
        case PIPE_CONTROL:      temp = "ctrl"; break; \
        case PIPE_BULK:         temp = "bulk"; break; \
        case PIPE_INTERRUPT:    temp = "intr"; break; \
-        default:                temp = "isoc"; break; \
+        default:                temp = "isoc"; break; \
        }; temp;})
 #define pipestring(pipe) edstring(usb_pipetype(pipe))
@@ -205,13 +205,13 @@ ohci_dump_status (struct ohci_hcd *controller, char **next, unsigned *size)
                (temp & RH_PS_PSSC) ? " PSSC" : "", \
                (temp & RH_PS_PESC) ? " PESC" : "", \
                (temp & RH_PS_CSC) ? " CSC" : "", \
-                \
+                \
                (temp & RH_PS_LSDA) ? " LSDA" : "", \
                (temp & RH_PS_PPS) ? " PPS" : "", \
                (temp & RH_PS_PRS) ? " PRS" : "", \
                (temp & RH_PS_POCI) ? " POCI" : "", \
                (temp & RH_PS_PSS) ? " PSS" : "", \
-                \
+                \
                (temp & RH_PS_PES) ? " PES" : "", \
                (temp & RH_PS_CCS) ? " CCS" : "" \
                );
@@ -563,7 +563,7 @@ show_periodic (struct class_device *class_dev, char *buf)
                                        (info & ED_SKIP) ? " K" : "",
                                        (ed->hwHeadP &
                                                cpu_to_hc32(ohci, ED_H)) ?
-                                                        " H" : "");
+                                                        " H" : "");
                                size -= temp;
                                next += temp;
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 1bf5e7a4e735..43ae696b2ec2 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -204,7 +204,7 @@ static int ohci_hcd_ep93xx_drv_resume(struct platform_device *pdev)
 static struct platform_driver ohci_hcd_ep93xx_driver = {
        .probe          = ohci_hcd_ep93xx_drv_probe,
        .remove         = ohci_hcd_ep93xx_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
 #ifdef CONFIG_PM
        .suspend        = ohci_hcd_ep93xx_drv_suspend,
        .resume         = ohci_hcd_ep93xx_drv_resume,
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index b28a9b602066..c1c1d871aba4 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -3,77 +3,21 @@
 *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
 * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
 * [ Initialisation is based on Linus'  ]
 * [ uhci code and gregs ohci fragments ]
 * [ (C) Copyright 1999 Linus Torvalds  ]
 * [ (C) Copyright 1999 Gregory P. Smith]
- * 
+ *
- * 
+ *
 * OHCI is the main "non-Intel/VIA" standard for USB 1.1 host controller
 * interfaces (though some non-x86 Intel chips use it).  It supports
 * smarter hardware than UHCI.  A download link for the spec available
 * through the http://www.usb.org website.
 *
- * History:
- * 
- * 2004/03/24 LH7A404 support (Durgesh Pattamatta & Marc Singer)
- * 2004/02/04 use generic dma_* functions instead of pci_* (dsaxena@plexity.net)
- * 2003/02/24 show registers in sysfs (Kevin Brosius)
- *
- * 2002/09/03 get rid of ed hashtables, rework periodic scheduling and
- *      bandwidth accounting; if debugging, show schedules in driverfs
- * 2002/07/19 fixes to management of ED and schedule state.
- * 2002/06/09 SA-1111 support (Christopher Hoover)
- * 2002/06/01 remember frame when HC won't see EDs any more; use that info
- *      to fix urb unlink races caused by interrupt latency assumptions;
- *      minor ED field and function naming updates
- * 2002/01/18 package as a patch for 2.5.3; this should match the
- *      2.4.17 kernel modulo some bugs being fixed.
- *
- * 2001/10/18 merge pmac cleanup (Benjamin Herrenschmidt) and bugfixes
- *      from post-2.4.5 patches.
- * 2001/09/20 URB_ZERO_PACKET support; hcca_dma portability, OPTi warning
- * 2001/09/07 match PCI PM changes, errnos from Linus' tree
- * 2001/05/05 fork 2.4.5 version into "hcd" framework, cleanup, simplify;
- *      pbook pci quirks gone (please fix pbook pci sw!) (db)
- *
- * 2001/04/08 Identify version on module load (gb)
- * 2001/03/24 td/ed hashing to remove bus_to_virt (Steve Longerbeam);
-        pci_map_single (db)
- * 2001/03/21 td and dev/ed allocation uses new pci_pool API (db)
- * 2001/03/07 hcca allocation uses pci_alloc_consistent (Steve Longerbeam)
- *
- * 2000/09/26 fixed races in removing the private portion of the urb
- * 2000/09/07 disable bulk and control lists when unlinking the last
- *      endpoint descriptor in order to avoid unrecoverable errors on
- *      the Lucent chips. (rwc@sgi)
- * 2000/08/29 use bandwidth claiming hooks (thanks Randy!), fix some
- *      urb unlink probs, indentation fixes
- * 2000/08/11 various oops fixes mostly affecting iso and cleanup from
- *      device unplugs.
- * 2000/06/28 use PCI hotplug framework, for better power management
- *      and for Cardbus support (David Brownell)
- * 2000/earlier:  fixes for NEC/Lucent chips; suspend/resume handling
- *      when the controller loses power; handle UE; cleanup; ...
- *
- * v5.2 1999/12/07 URB 3rd preview, 
- * v5.1 1999/11/30 URB 2nd preview, cpia, (usb-scsi)
- * v5.0 1999/11/22 URB Technical preview, Paul Mackerras powerbook susp/resume 
- *      i386: HUB, Keyboard, Mouse, Printer 
- *
- * v4.3 1999/10/27 multiple HCs, bulk_request
- * v4.2 1999/09/05 ISO API alpha, new dev alloc, neg Error-codes
- * v4.1 1999/08/27 Randy Dunlap's - ISO API first impl.
- * v4.0 1999/08/18 
- * v3.0 1999/06/25 
- * v2.1 1999/05/09  code clean up
- * v2.0 1999/05/04 
- * v1.0 1999/04/27 initial release
- *
 * This file is licenced under the GPL.
 */
- 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
@@ -89,7 +33,7 @@
 #include <linux/list.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
-#include <linux/dma-mapping.h> 
+#include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/reboot.h>
@@ -183,11 +127,11 @@ static int ohci_urb_enqueue (
        int             i, size = 0;
        unsigned long   flags;
        int             retval = 0;
-        
 #ifdef OHCI_VERBOSE_DEBUG
        urb_print (urb, "SUB", usb_pipein (pipe));
 #endif
-        
        /* every endpoint has a ed, locate and maybe (re)initialize it */
        if (! (ed = ed_get (ohci, ep, urb->dev, pipe, urb->interval)))
                return -ENOMEM;
@@ -232,7 +176,7 @@ static int ohci_urb_enqueue (
        memset (urb_priv, 0, sizeof (urb_priv_t) + size * sizeof (struct td *));
        INIT_LIST_HEAD (&urb_priv->pending);
        urb_priv->length = size;
-        urb_priv->ed = ed;      
+        urb_priv->ed = ed;
        /* allocate the TDs (deferring hash chain updates) */
        for (i = 0; i < size; i++) {
@@ -242,7 +186,7 @@ static int ohci_urb_enqueue (
                        urb_free_priv (ohci, urb_priv);
                        return -ENOMEM;
                }
-        }       
+        }
        spin_lock_irqsave (&ohci->lock, flags);
@@ -313,13 +257,13 @@ static int ohci_urb_dequeue (struct usb_hcd *hcd, struct urb *urb)
 {
        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
        unsigned long           flags;
-        
 #ifdef OHCI_VERBOSE_DEBUG
        urb_print (urb, "UNLINK", 1);
-#endif            
+#endif
        spin_lock_irqsave (&ohci->lock, flags);
-        if (HC_IS_RUNNING(hcd->state)) {
+        if (HC_IS_RUNNING(hcd->state)) {
                urb_priv_t  *urb_priv;
                /* Unless an IRQ completed the unlink while it was being
@@ -512,11 +456,11 @@ static int ohci_init (struct ohci_hcd *ohci)
 /* Start an OHCI controller, set the BUS operational
 * resets USB and controller
- * enable interrupts 
+ * enable interrupts
 */
 static int ohci_run (struct ohci_hcd *ohci)
 {
-        u32                     mask, temp;
+        u32                     mask, temp;
        int                     first = ohci->fminterval == 0;
        struct usb_hcd          *hcd = ohci_to_hcd(ohci);
@@ -534,7 +478,7 @@ static int ohci_run (struct ohci_hcd *ohci)
                /* also: power/overcurrent flags in roothub.a */
        }
-        /* Reset USB nearly "by the book".  RemoteWakeupConnected was
+        /* Reset USB nearly "by the book".  RemoteWakeupConnected was
         * saved if boot firmware (BIOS/SMM/...) told us it's connected,
         * or if bus glue did the same (e.g. for PCI add-in cards with
         * PCI PM support).
@@ -765,9 +709,9 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
                dl_done_list (ohci);
                spin_unlock (&ohci->lock);
                if (HC_IS_RUNNING(hcd->state))
-                        ohci_writel (ohci, OHCI_INTR_WDH, &regs->intrenable); 
+                        ohci_writel (ohci, OHCI_INTR_WDH, &regs->intrenable);
        }
-  
        /* could track INTR_SO to reduce available PCI/... bandwidth */
        /* handle any pending URB/ED unlinks, leaving INTR_SF enabled
@@ -778,12 +722,12 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
                finish_unlinks (ohci, ohci_frame_no(ohci));
        if ((ints & OHCI_INTR_SF) != 0 && !ohci->ed_rm_list
                        && HC_IS_RUNNING(hcd->state))
-                ohci_writel (ohci, OHCI_INTR_SF, &regs->intrdisable);   
+                ohci_writel (ohci, OHCI_INTR_SF, &regs->intrdisable);
        spin_unlock (&ohci->lock);
        if (HC_IS_RUNNING(hcd->state)) {
                ohci_writel (ohci, ints, &regs->intrstatus);
-                ohci_writel (ohci, OHCI_INTR_MIE, &regs->intrenable);   
+                ohci_writel (ohci, OHCI_INTR_MIE, &regs->intrenable);
                // flush those writes
                (void) ohci_readl (ohci, &ohci->regs->control);
        }
@@ -794,7 +738,7 @@ static irqreturn_t ohci_irq (struct usb_hcd *hcd)
 /*-------------------------------------------------------------------------*/
 static void ohci_stop (struct usb_hcd *hcd)
-{       
+{
        struct ohci_hcd         *ohci = hcd_to_ohci (hcd);
        ohci_dbg (ohci, "stop %s controller (state 0x%02x)\n",
@@ -812,8 +756,8 @@ static void ohci_stop (struct usb_hcd *hcd)
        remove_debug_files (ohci);
        ohci_mem_cleanup (ohci);
        if (ohci->hcca) {
-                dma_free_coherent (hcd->self.controller, 
+                dma_free_coherent (hcd->self.controller,
-                                sizeof *ohci->hcca, 
+                                sizeof *ohci->hcca,
                                ohci->hcca, ohci->hcca_dma);
                ohci->hcca = NULL;
                ohci->hcca_dma = 0;
@@ -836,7 +780,7 @@ static int ohci_restart (struct ohci_hcd *ohci)
         * recycle any "live" eds/tds (and urbs) right away.
         * later, khubd disconnect processing will recycle the other state,
         * (either as disconnect/reconnect, or maybe someday as a reset).
-         */ 
+         */
        spin_lock_irq(&ohci->lock);
        disable (ohci);
        usb_root_hub_lost_power(ohci_to_hcd(ohci)->self.root_hub);
@@ -875,11 +819,11 @@ static int ohci_restart (struct ohci_hcd *ohci)
        /* empty the interrupt branches */
        for (i = 0; i < NUM_INTS; i++) ohci->load [i] = 0;
        for (i = 0; i < NUM_INTS; i++) ohci->hcca->int_table [i] = 0;
-        
        /* no EDs to remove */
        ohci->ed_rm_list = NULL;
-        /* empty control and bulk lists */       
+        /* empty control and bulk lists */
        ohci->ed_controltail = NULL;
        ohci->ed_bulktail    = NULL;
@@ -941,6 +885,10 @@ MODULE_LICENSE ("GPL");
 #include "ohci-au1xxx.c"
 #endif
+#ifdef CONFIG_PNX8550
+#include "ohci-pnx8550.c"
+#endif
 #ifdef CONFIG_USB_OHCI_HCD_PPC_SOC
 #include "ohci-ppc-soc.c"
 #endif
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 2441642cb7b4..216c9c9d4d6d 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -1,9 +1,9 @@
 /*
 * OHCI HCD (Host Controller Driver) for USB.
- * 
+ *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
 * (C) Copyright 2000-2004 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
 * This file is licenced under GPL
 */
@@ -23,13 +23,13 @@
                (temp & RH_PS_PSSC) ? " PSSC" : "", \
                (temp & RH_PS_PESC) ? " PESC" : "", \
                (temp & RH_PS_CSC) ? " CSC" : "", \
-                \
+                \
                (temp & RH_PS_LSDA) ? " LSDA" : "", \
                (temp & RH_PS_PPS) ? " PPS" : "", \
                (temp & RH_PS_PRS) ? " PRS" : "", \
                (temp & RH_PS_POCI) ? " POCI" : "", \
                (temp & RH_PS_PSS) ? " PSS" : "", \
-                \
+                \
                (temp & RH_PS_PES) ? " PES" : "", \
                (temp & RH_PS_CCS) ? " CCS" : "" \
                );
@@ -484,7 +484,7 @@ ohci_hub_descriptor (
        temp = 0;
        if (rh & RH_A_NPS)              /* no power switching? */
            temp |= 0x0002;
-        if (rh & RH_A_PSM)              /* per-port power switching? */
+        if (rh & RH_A_PSM)              /* per-port power switching? */
            temp |= 0x0001;
        if (rh & RH_A_NOCP)             /* no overcurrent reporting? */
            temp |= 0x0010;
@@ -555,7 +555,7 @@ static void start_hnp(struct ohci_hcd *ohci);
 #define tick_before(t1,t2) ((s16)(((s16)(t1))-((s16)(t2))) < 0)
 /* called from some task, normally khubd */
-static inline void root_port_reset (struct ohci_hcd *ohci, unsigned port)
+static inline int root_port_reset (struct ohci_hcd *ohci, unsigned port)
 {
        __hc32 __iomem *portstat = &ohci->regs->roothub.portstatus [port];
        u32     temp;
@@ -570,10 +570,13 @@ static inline void root_port_reset (struct ohci_hcd *ohci, unsigned port)
                /* spin until any current reset finishes */
                for (;;) {
                        temp = ohci_readl (ohci, portstat);
+                        /* handle e.g. CardBus eject */
+                        if (temp == ~(u32)0)
+                                return -ESHUTDOWN;
                        if (!(temp & RH_PS_PRS))
                                break;
                        udelay (500);
-                } 
+                }
                if (!(temp & RH_PS_CCS))
                        break;
@@ -586,6 +589,8 @@ static inline void root_port_reset (struct ohci_hcd *ohci, unsigned port)
                now = ohci_readl(ohci, &ohci->regs->fmnumber);
        } while (tick_before(now, reset_done));
        /* caller synchronizes using PRSC */
+        return 0;
 }
 static int ohci_hub_control (
@@ -702,7 +707,7 @@ static int ohci_hub_control (
                                &ohci->regs->roothub.portstatus [wIndex]);
                        break;
                case USB_PORT_FEAT_RESET:
-                        root_port_reset (ohci, wIndex);
+                        retval = root_port_reset (ohci, wIndex);
                        break;
                default:
                        goto error;
diff --git a/drivers/usb/host/ohci-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index e121d97ed91c..e9807cf73a2f 100644
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -38,7 +38,7 @@ static void lh7a404_start_hc(struct platform_device *dev)
        CSC_PWRCNT |= CSC_PWRCNT_USBH_EN; /* Enable clock */
        udelay(1000);
        USBH_CMDSTATUS = OHCI_HCR;
-        
        printk(KERN_DEBUG __FILE__
                   ": Clock to USB host has been enabled \n");
 }
@@ -89,7 +89,7 @@ int usb_hcd_lh7a404_probe (const struct hc_driver *driver,
                retval = -EBUSY;
                goto err1;
        }
-        
        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
        if (!hcd->regs) {
                pr_debug("ioremap failed");
@@ -174,7 +174,7 @@ static const struct hc_driver ohci_lh7a404_hc_driver = {
         */
        .start =                ohci_lh7a404_start,
        .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
        /*
         * managing i/o requests and associated device resources
@@ -242,7 +242,7 @@ static int ohci_hcd_lh7a404_drv_resume(struct platform_device *dev)
 static struct platform_driver ohci_hcd_lh7a404_driver = {
        .probe          = ohci_hcd_lh7a404_drv_probe,
        .remove         = ohci_hcd_lh7a404_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
        /*.suspend      = ohci_hcd_lh7a404_drv_suspend, */
        /*.resume       = ohci_hcd_lh7a404_drv_resume, */
        .driver         = {
diff --git a/drivers/usb/host/ohci-mem.c b/drivers/usb/host/ohci-mem.c
index d976614eebd3..2f20d3dc895b 100644
--- a/drivers/usb/host/ohci-mem.c
+++ b/drivers/usb/host/ohci-mem.c
@@ -1,24 +1,24 @@
 /*
 * OHCI HCD (Host Controller Driver) for USB.
- * 
+ *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
 * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
 * This file is licenced under the GPL.
 */
 /*-------------------------------------------------------------------------*/
 /*
- * There's basically three types of memory:
+ * OHCI deals with three types of memory:
 *      - data used only by the HCD ... kmalloc is fine
 *      - async and periodic schedules, shared by HC and HCD ... these
 *        need to use dma_pool or dma_alloc_coherent
 *      - driver buffers, read/written by HC ... the hcd glue or the
 *        device driver provides us with dma addresses
 *
- * There's also PCI "register" data, which is memory mapped.
+ * There's also "register" data, which is memory mapped.
- * No memory seen by this driver is pagable.
+ * No memory seen by this driver (or any HCD) may be paged out.
 */
 /*-------------------------------------------------------------------------*/
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 9c02177de50a..27be1f936885 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -447,7 +447,7 @@ static const struct hc_driver ohci_omap_hc_driver = {
        .reset =                ohci_omap_init,
        .start =                ohci_omap_start,
        .stop =                 ohci_omap_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
        /*
         * managing i/o requests and associated device resources
@@ -533,7 +533,7 @@ static int ohci_omap_resume(struct platform_device *dev)
 static struct platform_driver ohci_hcd_omap_driver = {
        .probe          = ohci_hcd_omap_drv_probe,
        .remove         = ohci_hcd_omap_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
 #ifdef  CONFIG_PM
        .suspend        = ohci_omap_suspend,
        .resume         = ohci_omap_resume,
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index 874418552789..596e0b41e606 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -3,17 +3,17 @@
 *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
 * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
 * [ Initialisation is based on Linus'  ]
 * [ uhci code and gregs ohci fragments ]
 * [ (C) Copyright 1999 Linus Torvalds  ]
 * [ (C) Copyright 1999 Gregory P. Smith]
- * 
+ *
 * PCI Bus Glue
 *
 * This file is licenced under the GPL.
 */
- 
 #ifndef CONFIG_PCI
 #error "This file is PCI bus glue.  CONFIG_PCI must be defined."
 #endif
@@ -83,7 +83,7 @@ ohci_pci_start (struct usb_hcd *hcd)
                        pci_dev_put(b);
                }
-                /* Check for Compaq's ZFMicro chipset, which needs short 
+                /* Check for Compaq's ZFMicro chipset, which needs short
                 * delays before control or bulk queues get re-activated
                 * in finish_unlinks()
                 */
@@ -238,8 +238,8 @@ static struct pci_driver ohci_pci_driver = {
        .shutdown =     usb_hcd_pci_shutdown,
 };
- 
-static int __init ohci_hcd_pci_init (void) 
+static int __init ohci_hcd_pci_init (void)
 {
        printk (KERN_DEBUG "%s: " DRIVER_INFO " (PCI)\n", hcd_name);
        if (usb_disabled())
@@ -253,8 +253,8 @@ module_init (ohci_hcd_pci_init);
 /*-------------------------------------------------------------------------*/
-static void __exit ohci_hcd_pci_cleanup (void) 
+static void __exit ohci_hcd_pci_cleanup (void)
-{       
+{
        pci_unregister_driver (&ohci_pci_driver);
 }
 module_exit (ohci_hcd_pci_cleanup);
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index 7f26f9bdbaf1..3a8cbfb69054 100644
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -4,7 +4,7 @@
 * driver for Philips PNX4008 USB Host
 *
 * Authors: Dmitry Chigirev <source@mvista.com>
- *          Vitaly Wool <vitalywool@gmail.com>
+ *          Vitaly Wool <vitalywool@gmail.com>
 *
 * register initialization is based on code examples provided by Philips
 * Copyright (c) 2005 Koninklijke Philips Electronics N.V.
@@ -29,7 +29,7 @@
 #include <asm/arch/irqs.h>
 #include <asm/arch/gpio.h>
-#define USB_CTRL        IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64)
+#define USB_CTRL        IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64)
 /* USB_CTRL bit defines */
 #define USB_SLAVE_HCLK_EN       (1 << 24)
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c
new file mode 100644
index 000000000000..6922b91b1704
--- /dev/null
+++ b/drivers/usb/host/ohci-pnx8550.c
@@ -0,0 +1,258 @@
+/*
+ * OHCI HCD (Host Controller Driver) for USB.
+ *
+ * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
+ * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
+ * (C) Copyright 2002 Hewlett-Packard Company
+ * (C) Copyright 2005 Embedded Alley Solutions, Inc.
+ *
+ * Bus Glue for PNX8550
+ *
+ * Written by Christopher Hoover <ch@hpl.hp.com>
+ * Based on fragments of previous driver by Russell King et al.
+ *
+ * Modified for LH7A404 from ohci-sa1111.c
+ *  by Durgesh Pattamatta <pattamattad@sharpsec.com>
+ *
+ * Modified for PNX8550 from ohci-sa1111.c and sa-omap.c
+ *  by Vitaly Wool <vitalywool@gmail.com>
+ *
+ * This file is licenced under the GPL.
+ */
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <asm/mach-pnx8550/usb.h>
+#include <asm/mach-pnx8550/int.h>
+#include <asm/mach-pnx8550/pci.h>
+#ifndef CONFIG_PNX8550
+#error "This file is PNX8550 bus glue.  CONFIG_PNX8550 must be defined."
+#endif
+extern int usb_disabled(void);
+/*-------------------------------------------------------------------------*/
+static void pnx8550_start_hc(struct platform_device *dev)
+{
+        /*
+         * Set register CLK48CTL to enable and 48MHz
+         */
+        outl(0x00000003, PCI_BASE | 0x0004770c);
+        /*
+         * Set register CLK12CTL to enable and 48MHz
+         */
+        outl(0x00000003, PCI_BASE | 0x00047710);
+        udelay(100);
+}
+static void pnx8550_stop_hc(struct platform_device *dev)
+{
+        udelay(10);
+}
+/*-------------------------------------------------------------------------*/
+/* configure so an HC device and id are always provided */
+/* always called with process context; sleeping is OK */
+/**
+ * usb_hcd_pnx8550_probe - initialize pnx8550-based HCDs
+ * Context: !in_interrupt()
+ *
+ * Allocates basic resources for this USB host controller, and
+ * then invokes the start() method for the HCD associated with it
+ * through the hotplug entry's driver_data.
+ *
+ */
+int usb_hcd_pnx8550_probe (const struct hc_driver *driver,
+                          struct platform_device *dev)
+{
+        int retval;
+        struct usb_hcd *hcd;
+        if (dev->resource[0].flags != IORESOURCE_MEM ||
+                        dev->resource[1].flags != IORESOURCE_IRQ) {
+                dev_err (&dev->dev,"invalid resource type\n");
+                return -ENOMEM;
+        }
+        hcd = usb_create_hcd (driver, &dev->dev, "pnx8550");
+        if (!hcd)
+                return -ENOMEM;
+        hcd->rsrc_start = dev->resource[0].start;
+        hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1;
+        if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
+                dev_err(&dev->dev, "request_mem_region [0x%08llx, 0x%08llx] "
+                                "failed\n", hcd->rsrc_start, hcd->rsrc_len);
+                retval = -EBUSY;
+                goto err1;
+        }
+        hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+        if (!hcd->regs) {
+                dev_err(&dev->dev, "ioremap [[0x%08llx, 0x%08llx] failed\n",
+                                hcd->rsrc_start, hcd->rsrc_len);
+                retval = -ENOMEM;
+                goto err2;
+        }
+        pnx8550_start_hc(dev);
+        ohci_hcd_init(hcd_to_ohci(hcd));
+        retval = usb_add_hcd(hcd, dev->resource[1].start, SA_INTERRUPT);
+        if (retval == 0)
+                return retval;
+        pnx8550_stop_hc(dev);
+        iounmap(hcd->regs);
+ err2:
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+ err1:
+        usb_put_hcd(hcd);
+        return retval;
+}
+/* may be called without controller electrically present */
+/* may be called with controller, bus, and devices active */
+/**
+ * usb_hcd_pnx8550_remove - shutdown processing for pnx8550-based HCDs
+ * @dev: USB Host Controller being removed
+ * Context: !in_interrupt()
+ *
+ * Reverses the effect of usb_hcd_pnx8550_probe(), first invoking
+ * the HCD's stop() method.  It is always called from a thread
+ * context, normally "rmmod", "apmd", or something similar.
+ *
+ */
+void usb_hcd_pnx8550_remove (struct usb_hcd *hcd, struct platform_device *dev)
+{
+        usb_remove_hcd(hcd);
+        pnx8550_stop_hc(dev);
+        iounmap(hcd->regs);
+        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
+        usb_put_hcd(hcd);
+}
+/*-------------------------------------------------------------------------*/
+static int __devinit
+ohci_pnx8550_start (struct usb_hcd *hcd)
+{
+        struct ohci_hcd *ohci = hcd_to_ohci (hcd);
+        int             ret;
+        ohci_dbg (ohci, "ohci_pnx8550_start, ohci:%p", ohci);
+        if ((ret = ohci_init(ohci)) < 0)
+                return ret;
+        if ((ret = ohci_run (ohci)) < 0) {
+                err ("can't start %s", hcd->self.bus_name);
+                ohci_stop (hcd);
+                return ret;
+        }
+        return 0;
+}
+/*-------------------------------------------------------------------------*/
+static const struct hc_driver ohci_pnx8550_hc_driver = {
+        .description =          hcd_name,
+        .product_desc =         "PNX8550 OHCI",
+        .hcd_priv_size =        sizeof(struct ohci_hcd),
+        /*
+         * generic hardware linkage
+         */
+        .irq =                  ohci_irq,
+        .flags =                HCD_USB11 | HCD_MEMORY,
+        /*
+         * basic lifecycle operations
+         */
+        .start =                ohci_pnx8550_start,
+        .stop =                 ohci_stop,
+        /*
+         * managing i/o requests and associated device resources
+         */
+        .urb_enqueue =          ohci_urb_enqueue,
+        .urb_dequeue =          ohci_urb_dequeue,
+        .endpoint_disable =     ohci_endpoint_disable,
+        /*
+         * scheduling support
+         */
+        .get_frame_number =     ohci_get_frame,
+        /*
+         * root hub support
+         */
+        .hub_status_data =      ohci_hub_status_data,
+        .hub_control =          ohci_hub_control,
+        .hub_irq_enable =       ohci_rhsc_enable,
+#ifdef  CONFIG_PM
+        .bus_suspend =          ohci_bus_suspend,
+        .bus_resume =           ohci_bus_resume,
+#endif
+        .start_port_reset =     ohci_start_port_reset,
+};
+/*-------------------------------------------------------------------------*/
+static int ohci_hcd_pnx8550_drv_probe(struct platform_device *pdev)
+{
+        int ret;
+        if (usb_disabled())
+                return -ENODEV;
+        ret = usb_hcd_pnx8550_probe(&ohci_pnx8550_hc_driver, pdev);
+        return ret;
+}
+static int ohci_hcd_pnx8550_drv_remove(struct platform_device *pdev)
+{
+        struct usb_hcd *hcd = platform_get_drvdata(pdev);
+        usb_hcd_pnx8550_remove(hcd, pdev);
+        return 0;
+}
+MODULE_ALIAS("pnx8550-ohci");
+static struct platform_driver ohci_hcd_pnx8550_driver = {
+        .driver = {
+                .name           = "pnx8550-ohci",
+        },
+        .probe          = ohci_hcd_pnx8550_drv_probe,
+        .remove         = ohci_hcd_pnx8550_drv_remove,
+};
+static int __init ohci_hcd_pnx8550_init (void)
+{
+        pr_debug (DRIVER_INFO " (pnx8550)");
+        pr_debug ("block sizes: ed %d td %d\n",
+                sizeof (struct ed), sizeof (struct td));
+        return platform_driver_register(&ohci_hcd_pnx8550_driver);
+}
+static void __exit ohci_hcd_pnx8550_cleanup (void)
+{
+        platform_driver_unregister(&ohci_hcd_pnx8550_driver);
+}
+module_init (ohci_hcd_pnx8550_init);
+module_exit (ohci_hcd_pnx8550_cleanup);
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index d9d1ae236bd5..e1a7eb817313 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -5,7 +5,7 @@
 * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
 * (C) Copyright 2002 Hewlett-Packard Company
 * (C) Copyright 2003-2005 MontaVista Software Inc.
- * 
+ *
 * Bus Glue for PPC On-Chip OHCI driver
 * Tested on Freescale MPC5200 and IBM STB04xxx
 *
@@ -85,7 +85,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
 err2:
        release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 err1:
-        usb_put_hcd(hcd);
+        usb_put_hcd(hcd);
        return retval;
 }
@@ -148,7 +148,7 @@ static const struct hc_driver ohci_ppc_soc_hc_driver = {
         */
        .start =                ohci_ppc_soc_start,
        .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
        /*
         * managing i/o requests and associated device resources
@@ -197,7 +197,7 @@ static int ohci_hcd_ppc_soc_drv_remove(struct platform_device *pdev)
 static struct platform_driver ohci_hcd_ppc_soc_driver = {
        .probe          = ohci_hcd_ppc_soc_drv_probe,
        .remove         = ohci_hcd_ppc_soc_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
 #ifdef  CONFIG_PM
        /*.suspend      = ohci_hcd_ppc_soc_drv_suspend,*/
        /*.resume       = ohci_hcd_ppc_soc_drv_resume,*/
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index e176b04d7aeb..3bbea844a9e3 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -47,7 +47,7 @@ static int pxa27x_ohci_select_pmm( int mode )
        switch ( mode ) {
        case PMM_NPS_MODE:
                UHCRHDA |= RH_A_NPS;
-                break; 
+                break;
        case PMM_GLOBAL_MODE:
                UHCRHDA &= ~(RH_A_NPS & RH_A_PSM);
                break;
@@ -60,7 +60,7 @@ static int pxa27x_ohci_select_pmm( int mode )
                break;
        default:
                printk( KERN_ERR
-                        "Invalid mode %d, set to non-power switch mode.\n", 
+                        "Invalid mode %d, set to non-power switch mode.\n",
                        mode );
                UHCRHDA |= RH_A_NPS;
@@ -270,7 +270,7 @@ static const struct hc_driver ohci_pxa27x_hc_driver = {
         */
        .start =                ohci_pxa27x_start,
        .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
        /*
         * managing i/o requests and associated device resources
@@ -359,9 +359,9 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)
 static struct platform_driver ohci_hcd_pxa27x_driver = {
        .probe          = ohci_hcd_pxa27x_drv_probe,
        .remove         = ohci_hcd_pxa27x_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
 #ifdef CONFIG_PM
-        .suspend        = ohci_hcd_pxa27x_drv_suspend, 
+        .suspend        = ohci_hcd_pxa27x_drv_suspend,
        .resume         = ohci_hcd_pxa27x_drv_resume,
 #endif
        .driver         = {
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index fe1fe2f97cb5..830a3fe8615e 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -1,9 +1,9 @@
 /*
 * OHCI HCD (Host Controller Driver) for USB.
- * 
+ *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
 * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
 * This file is licenced under the GPL.
 */
@@ -89,7 +89,7 @@ __acquires(ohci->lock)
 /*-------------------------------------------------------------------------*
 * ED handling functions
- *-------------------------------------------------------------------------*/  
+ *-------------------------------------------------------------------------*/
 /* search for the right schedule branch to use for a periodic ed.
 * does some load balancing; returns the branch, or negative errno.
@@ -107,7 +107,6 @@ static int balance (struct ohci_hcd *ohci, int interval, int load)
         */
        for (i = 0; i < interval ; i++) {
                if (branch < 0 || ohci->load [branch] > ohci->load [i]) {
-#if 1   /* CONFIG_USB_BANDWIDTH */
                        int     j;
                        /* usb 1.1 says 90% of one frame */
@@ -117,8 +116,7 @@ static int balance (struct ohci_hcd *ohci, int interval, int load)
                        }
                        if (j < NUM_INTS)
                                continue;
-#endif
+                        branch = i;
-                        branch = i; 
                }
        }
        return branch;
@@ -171,7 +169,7 @@ static void periodic_link (struct ohci_hcd *ohci, struct ed *ed)
 /* link an ed into one of the HC chains */
 static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
-{        
+{
        int     branch;
        if (ohci_to_hcd(ohci)->state == HC_STATE_QUIESCING)
@@ -248,7 +246,7 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
                }
                ed->branch = branch;
                periodic_link (ohci, ed);
-        }               
+        }
        /* the HC may not see the schedule updates yet, but if it does
         * then they'll be properly ordered.
@@ -277,7 +275,7 @@ static void periodic_unlink (struct ohci_hcd *ohci, struct ed *ed)
                        *prev = ed->ed_next;
                }
                ohci->load [i] -= ed->load;
-        }       
+        }
        ohci_to_hcd(ohci)->self.bandwidth_allocated -= ed->load / ed->interval;
        ohci_vdbg (ohci, "unlink %sed %p branch %d [%dus.], interval %d\n",
@@ -285,7 +283,7 @@ static void periodic_unlink (struct ohci_hcd *ohci, struct ed *ed)
                ed, ed->branch, ed->load, ed->interval);
 }
-/* unlink an ed from one of the HC chains. 
+/* unlink an ed from one of the HC chains.
 * just the link to the ed is unlinked.
 * the link from the ed still points to another operational ed or 0
 * so the HC can eventually finish the processing of the unlinked ed
@@ -307,7 +305,7 @@ static void periodic_unlink (struct ohci_hcd *ohci, struct ed *ed)
 * When finish_unlinks() runs later, after SOF interrupt, it will often
 * complete one or more URB unlinks before making that state change.
 */
-static void ed_deschedule (struct ohci_hcd *ohci, struct ed *ed) 
+static void ed_deschedule (struct ohci_hcd *ohci, struct ed *ed)
 {
        ed->hwINFO |= cpu_to_hc32 (ohci, ED_SKIP);
        wmb ();
@@ -397,7 +395,7 @@ static struct ed *ed_get (
        unsigned int            pipe,
        int                     interval
 ) {
-        struct ed               *ed; 
+        struct ed               *ed;
        unsigned long           flags;
        spin_lock_irqsave (&ohci->lock, flags);
@@ -413,9 +411,9 @@ static struct ed *ed_get (
                        goto done;
                }
-                /* dummy td; end of td list for ed */
+                /* dummy td; end of td list for ed */
                td = td_alloc (ohci, GFP_ATOMIC);
-                if (!td) {
+                if (!td) {
                        /* out of memory */
                        ed_free (ohci, ed);
                        ed = NULL;
@@ -462,7 +460,7 @@ static struct ed *ed_get (
 done:
        spin_unlock_irqrestore (&ohci->lock, flags);
-        return ed; 
+        return ed;
 }
 /*-------------------------------------------------------------------------*/
@@ -474,7 +472,7 @@ done:
 * and that ed->state is ED_OPER
 */
 static void start_ed_unlink (struct ohci_hcd *ohci, struct ed *ed)
-{    
+{
        ed->hwINFO |= cpu_to_hc32 (ohci, ED_DEQUEUE);
        ed_deschedule (ohci, ed);
@@ -541,7 +539,7 @@ td_fill (struct ohci_hcd *ohci, u32 info,
        td->ed = urb_priv->ed;
        td->next_dl_td = NULL;
        td->index = index;
-        td->urb = urb; 
+        td->urb = urb;
        td->data_dma = data;
        if (!len)
                data = 0;
@@ -553,8 +551,8 @@ td_fill (struct ohci_hcd *ohci, u32 info,
                                                (data & 0x0FFF) | 0xE000);
                td->ed->last_iso = info & 0xffff;
        } else {
-                td->hwCBP = cpu_to_hc32 (ohci, data); 
+                td->hwCBP = cpu_to_hc32 (ohci, data);
-        }                       
+        }
        if (data)
                td->hwBE = cpu_to_hc32 (ohci, data + len - 1);
        else
@@ -597,7 +595,7 @@ static void td_submit_urb (
         * use the device toggle bits for resetting, and rely on the fact
         * that resetting toggle is meaningless if the endpoint is active.
         */
-        if (!usb_gettoggle (urb->dev, usb_pipeendpoint (urb->pipe), is_out)) {
+        if (!usb_gettoggle (urb->dev, usb_pipeendpoint (urb->pipe), is_out)) {
                usb_settoggle (urb->dev, usb_pipeendpoint (urb->pipe),
                        is_out, 1);
                urb_priv->ed->hwHeadP &= ~cpu_to_hc32 (ohci, ED_C);
@@ -721,16 +719,16 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td)
        list_del (&td->td_list);
        /* ISO ... drivers see per-TD length/status */
-        if (tdINFO & TD_ISO) {
+        if (tdINFO & TD_ISO) {
-                u16     tdPSW = ohci_hwPSW (ohci, td, 0);
+                u16     tdPSW = ohci_hwPSW (ohci, td, 0);
                int     dlen = 0;
                /* NOTE:  assumes FC in tdINFO == 0, and that
                 * only the first of 0..MAXPSW psws is used.
                 */
-                cc = (tdPSW >> 12) & 0xF;
+                cc = (tdPSW >> 12) & 0xF;
-                if (tdINFO & TD_CC)     /* hc didn't touch? */
+                if (tdINFO & TD_CC)     /* hc didn't touch? */
                        return;
                if (usb_pipeout (urb->pipe))
@@ -758,7 +756,7 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td)
                int     type = usb_pipetype (urb->pipe);
                u32     tdBE = hc32_to_cpup (ohci, &td->hwBE);
-                cc = TD_CC_GET (tdINFO);
+                cc = TD_CC_GET (tdINFO);
                /* update packet status if needed (short is normally ok) */
                if (cc == TD_DATAUNDERRUN
@@ -787,7 +785,7 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td)
                                urb, td, 1 + td->index, cc,
                                urb->actual_length,
                                urb->transfer_buffer_length);
-        }
+        }
 }
 /*-------------------------------------------------------------------------*/
@@ -795,7 +793,7 @@ static void td_done (struct ohci_hcd *ohci, struct urb *urb, struct td *td)
 static inline struct td *
 ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev)
 {
-        struct urb              *urb = td->urb;
+        struct urb              *urb = td->urb;
        struct ed               *ed = td->ed;
        struct list_head        *tmp = td->td_list.next;
        __hc32                  toggle = ed->hwHeadP & cpu_to_hc32 (ohci, ED_C);
@@ -805,7 +803,7 @@ ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev)
         */
        ed->hwINFO |= cpu_to_hc32 (ohci, ED_SKIP);
        wmb ();
-        ed->hwHeadP &= ~cpu_to_hc32 (ohci, ED_H); 
+        ed->hwHeadP &= ~cpu_to_hc32 (ohci, ED_H);
        /* put any later tds from this urb onto the donelist, after 'td',
         * order won't matter here: no errors, and nothing was transferred.
@@ -833,7 +831,7 @@ ed_halted (struct ohci_hcd *ohci, struct td *td, int cc, struct td *rev)
                info &= ~cpu_to_hc32 (ohci, TD_CC);
                next->hwINFO = info;
-                next->next_dl_td = rev; 
+                next->next_dl_td = rev;
                rev = next;
                ed->hwHeadP = next->hwNextTD | toggle;
@@ -881,8 +879,8 @@ static struct td *dl_reverse_done_list (struct ohci_hcd *ohci)
        /* get TD from hc's singly linked list, and
         * prepend to ours.  ed->td_list changes later.
         */
-        while (td_dma) {                
+        while (td_dma) {
-                int             cc;
+                int             cc;
                td = dma_to_td (ohci, td_dma);
                if (!td) {
@@ -901,10 +899,10 @@ static struct td *dl_reverse_done_list (struct ohci_hcd *ohci)
                                && (td->ed->hwHeadP & cpu_to_hc32 (ohci, ED_H)))
                        td_rev = ed_halted (ohci, td, cc, td_rev);
-                td->next_dl_td = td_rev;        
+                td->next_dl_td = td_rev;
                td_rev = td;
                td_dma = hc32_to_cpup (ohci, &td->hwNextTD);
-        }       
+        }
        return td_rev;
 }
@@ -1013,9 +1011,9 @@ rescan_this:
                if (modified)
                        goto rescan_all;
-        }
+        }
-        /* maybe reenable control and bulk lists */ 
+        /* maybe reenable control and bulk lists */
        if (HC_IS_RUNNING(ohci_to_hcd(ohci)->state)
                        && ohci_to_hcd(ohci)->state != HC_STATE_QUIESCING
                        && !ohci->ed_rm_list) {
@@ -1041,20 +1039,20 @@ rescan_this:
                                        &ohci->regs->ed_bulkcurrent);
                        }
                }
-                
                /* CLE/BLE to enable, CLF/BLF to (maybe) kickstart */
                if (control) {
                        ohci->hc_control |= control;
                        if (ohci->flags & OHCI_QUIRK_ZFMICRO)
                                mdelay(1);
-                        ohci_writel (ohci, ohci->hc_control,
+                        ohci_writel (ohci, ohci->hc_control,
-                                        &ohci->regs->control);   
+                                        &ohci->regs->control);
-                }
+                }
                if (command) {
                        if (ohci->flags & OHCI_QUIRK_ZFMICRO)
                                mdelay(1);
-                        ohci_writel (ohci, command, &ohci->regs->cmdstatus);   
+                        ohci_writel (ohci, command, &ohci->regs->cmdstatus);
-                }
+                }
        }
 }
@@ -1074,19 +1072,19 @@ dl_done_list (struct ohci_hcd *ohci)
 {
        struct td       *td = dl_reverse_done_list (ohci);
-        while (td) {
+        while (td) {
                struct td       *td_next = td->next_dl_td;
                struct urb      *urb = td->urb;
                urb_priv_t      *urb_priv = urb->hcpriv;
                struct ed       *ed = td->ed;
                /* update URB's length and status from TD */
-                td_done (ohci, urb, td);
+                td_done (ohci, urb, td);
-                urb_priv->td_cnt++;
+                urb_priv->td_cnt++;
                /* If all this urb's TDs are done, call complete() */
-                if (urb_priv->td_cnt == urb_priv->length)
+                if (urb_priv->td_cnt == urb_priv->length)
-                        finish_urb (ohci, urb);
+                        finish_urb (ohci, urb);
                /* clean schedule:  unlink EDs that are no longer busy */
                if (list_empty (&ed->td_list)) {
@@ -1094,25 +1092,26 @@ dl_done_list (struct ohci_hcd *ohci)
                                start_ed_unlink (ohci, ed);
                /* ... reenabling halted EDs only after fault cleanup */
-                } else if ((ed->hwINFO & cpu_to_hc32 (ohci, ED_SKIP | ED_DEQUEUE))
+                } else if ((ed->hwINFO & cpu_to_hc32 (ohci,
+                                                ED_SKIP | ED_DEQUEUE))
                                        == cpu_to_hc32 (ohci, ED_SKIP)) {
                        td = list_entry (ed->td_list.next, struct td, td_list);
-                        if (!(td->hwINFO & cpu_to_hc32 (ohci, TD_DONE))) {
+                        if (!(td->hwINFO & cpu_to_hc32 (ohci, TD_DONE))) {
                                ed->hwINFO &= ~cpu_to_hc32 (ohci, ED_SKIP);
                                /* ... hc may need waking-up */
                                switch (ed->type) {
                                case PIPE_CONTROL:
                                        ohci_writel (ohci, OHCI_CLF,
-                                                &ohci->regs->cmdstatus);   
+                                                &ohci->regs->cmdstatus);
                                        break;
                                case PIPE_BULK:
                                        ohci_writel (ohci, OHCI_BLF,
-                                                &ohci->regs->cmdstatus);   
+                                                &ohci->regs->cmdstatus);
                                        break;
                                }
                        }
                }
-                td = td_next;
+                td = td_next;
-        }  
+        }
 }
diff --git a/drivers/usb/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 59e436424d41..b350d45033e7 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -447,7 +447,7 @@ static const struct hc_driver ohci_s3c2410_hc_driver = {
         */
        .start =                ohci_s3c2410_start,
        .stop =                 ohci_stop,
-        .shutdown =             ohci_shutdown,
+        .shutdown =             ohci_shutdown,
        /*
         * managing i/o requests and associated device resources
@@ -492,7 +492,7 @@ static int ohci_hcd_s3c2410_drv_remove(struct platform_device *pdev)
 static struct platform_driver ohci_hcd_s3c2410_driver = {
        .probe          = ohci_hcd_s3c2410_drv_probe,
        .remove         = ohci_hcd_s3c2410_drv_remove,
-        .shutdown       = usb_hcd_platform_shutdown,
+        .shutdown       = usb_hcd_platform_shutdown,
        /*.suspend      = ohci_hcd_s3c2410_drv_suspend, */
        /*.resume       = ohci_hcd_s3c2410_drv_resume, */
        .driver         = {
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index 71371de32ada..fe0090e33675 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -4,7 +4,7 @@
 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
 * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
 * (C) Copyright 2002 Hewlett-Packard Company
- * 
+ *
 * SA1111 Bus Glue
 *
 * Written by Christopher Hoover <ch@hpl.hp.com>
@@ -12,7 +12,7 @@
 *
 * This file is licenced under the GPL.
 */
- 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/arch/assabet.h>
@@ -31,7 +31,7 @@ static void sa1111_start_hc(struct sa1111_dev *dev)
 {
        unsigned int usb_rst = 0;
-        printk(KERN_DEBUG __FILE__ 
+        printk(KERN_DEBUG __FILE__
               ": starting SA-1111 OHCI USB Controller\n");
 #ifdef CONFIG_SA1100_BADGE4
@@ -65,7 +65,7 @@ static void sa1111_start_hc(struct sa1111_dev *dev)
 static void sa1111_stop_hc(struct sa1111_dev *dev)
 {
        unsigned int usb_rst;
-        printk(KERN_DEBUG __FILE__ 
+        printk(KERN_DEBUG __FILE__
               ": stopping SA-1111 OHCI USB Controller\n");
        /*
diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h
index a2f42a2f47c6..405257f3e853 100644
--- a/drivers/usb/host/ohci.h
+++ b/drivers/usb/host/ohci.h
@@ -1,9 +1,9 @@
 /*
 * OHCI HCD (Host Controller Driver) for USB.
- * 
+ *
 * (C) Copyright 1999 Roman Weissgaerber <weissg@vienna.at>
 * (C) Copyright 2000-2002 David Brownell <dbrownell@users.sourceforge.net>
- * 
+ *
 * This file is licenced under the GPL.
 */
@@ -14,7 +14,7 @@
 */
 typedef __u32 __bitwise __hc32;
 typedef __u16 __bitwise __hc16;
- 
 /*
 * OHCI Endpoint Descriptor (ED) ... holds TD queue
 * See OHCI spec, section 4.2
@@ -24,7 +24,7 @@ typedef __u16 __bitwise __hc16;
 */
 struct ed {
        /* first fields are hardware-specified */
-        __hc32                  hwINFO;         /* endpoint config bitmap */
+        __hc32                  hwINFO;      /* endpoint config bitmap */
        /* info bits defined by hcd */
 #define ED_DEQUEUE      (1 << 27)
        /* info bits defined by the hardware */
@@ -52,11 +52,11 @@ struct ed {
         * usually:  OPER --> UNLINK --> (IDLE | OPER) --> ...
         */
        u8                      state;          /* ED_{IDLE,UNLINK,OPER} */
-#define ED_IDLE         0x00            /* NOT linked to HC */
+#define ED_IDLE         0x00            /* NOT linked to HC */
-#define ED_UNLINK       0x01            /* being unlinked from hc */
+#define ED_UNLINK       0x01            /* being unlinked from hc */
 #define ED_OPER         0x02            /* IS linked to hc */
-        u8                      type;           /* PIPE_{BULK,...} */
+        u8                      type;           /* PIPE_{BULK,...} */
        /* periodic scheduling params (for intr and iso) */
        u8                      branch;
@@ -70,7 +70,7 @@ struct ed {
 #define ED_MASK ((u32)~0x0f)            /* strip hw status in low addr bits */
- 
 /*
 * OHCI Transfer Descriptor (TD) ... one per transfer segment
 * See OHCI spec, sections 4.3.1 (general = control/bulk/interrupt)
@@ -107,22 +107,22 @@ struct td {
        /* (no hwINFO #defines yet for iso tds) */
-        __hc32          hwCBP;          /* Current Buffer Pointer (or 0) */
+        __hc32          hwCBP;          /* Current Buffer Pointer (or 0) */
-        __hc32          hwNextTD;       /* Next TD Pointer */
+        __hc32          hwNextTD;       /* Next TD Pointer */
-        __hc32          hwBE;           /* Memory Buffer End Pointer */
+        __hc32          hwBE;           /* Memory Buffer End Pointer */
        /* PSW is only for ISO.  Only 1 PSW entry is used, but on
         * big-endian PPC hardware that's the second entry.
         */
 #define MAXPSW  2
-        __hc16          hwPSW [MAXPSW];
+        __hc16          hwPSW [MAXPSW];
        /* rest are purely for the driver's use */
-        __u8            index;
+        __u8            index;
-        struct ed       *ed;
+        struct ed       *ed;
-        struct td       *td_hash;       /* dma-->td hashtable */
+        struct td       *td_hash;       /* dma-->td hashtable */
-        struct td       *next_dl_td;
+        struct td       *next_dl_td;
-        struct urb      *urb;
+        struct urb      *urb;
        dma_addr_t      td_dma;         /* addr of this TD */
        dma_addr_t      data_dma;       /* addr of data it points to */
@@ -152,8 +152,8 @@ struct td {
 #define TD_NOTACCESSED     0x0F
-/* map OHCI TD status codes (CC) to errno values */ 
+/* map OHCI TD status codes (CC) to errno values */
-static const int cc_to_error [16] = { 
+static const int cc_to_error [16] = {
        /* No  Error  */               0,
        /* CRC Error  */               -EILSEQ,
        /* Bit Stuff  */               -EPROTO,
@@ -169,7 +169,7 @@ static const int cc_to_error [16] = {
        /* BufferOver */               -ECOMM,
        /* BuffUnder  */               -ENOSR,
        /* (for HCD)  */               -EALREADY,
-        /* (for HCD)  */               -EALREADY 
+        /* (for HCD)  */               -EALREADY
 };
@@ -182,7 +182,7 @@ struct ohci_hcca {
 #define NUM_INTS 32
        __hc32  int_table [NUM_INTS];   /* periodic schedule */
-        /* 
+        /*
         * OHCI defines u16 frame_no, followed by u16 zero pad.
         * Since some processors can't do 16 bit bus accesses,
         * portable access must be a 32 bits wide.
@@ -262,10 +262,10 @@ struct ohci_regs {
 * HcCommandStatus (cmdstatus) register masks
 */
 #define OHCI_HCR        (1 << 0)        /* host controller reset */
-#define OHCI_CLF        (1 << 1)        /* control list filled */
+#define OHCI_CLF        (1 << 1)        /* control list filled */
-#define OHCI_BLF        (1 << 2)        /* bulk list filled */
+#define OHCI_BLF        (1 << 2)        /* bulk list filled */
-#define OHCI_OCR        (1 << 3)        /* ownership change request */
+#define OHCI_OCR        (1 << 3)        /* ownership change request */
-#define OHCI_SOC        (3 << 16)       /* scheduling overrun count */
+#define OHCI_SOC        (3 << 16)       /* scheduling overrun count */
 /*
 * masks used with interrupt registers:
@@ -285,20 +285,20 @@ struct ohci_regs {
 /* OHCI ROOT HUB REGISTER MASKS */
- 
 /* roothub.portstatus [i] bits */
-#define RH_PS_CCS            0x00000001         /* current connect status */
+#define RH_PS_CCS            0x00000001         /* current connect status */
-#define RH_PS_PES            0x00000002         /* port enable status*/
+#define RH_PS_PES            0x00000002         /* port enable status*/
-#define RH_PS_PSS            0x00000004         /* port suspend status */
+#define RH_PS_PSS            0x00000004         /* port suspend status */
-#define RH_PS_POCI           0x00000008         /* port over current indicator */
+#define RH_PS_POCI           0x00000008         /* port over current indicator */
-#define RH_PS_PRS            0x00000010         /* port reset status */
+#define RH_PS_PRS            0x00000010         /* port reset status */
-#define RH_PS_PPS            0x00000100         /* port power status */
+#define RH_PS_PPS            0x00000100         /* port power status */
-#define RH_PS_LSDA           0x00000200         /* low speed device attached */
+#define RH_PS_LSDA           0x00000200         /* low speed device attached */
-#define RH_PS_CSC            0x00010000         /* connect status change */
+#define RH_PS_CSC            0x00010000         /* connect status change */
-#define RH_PS_PESC           0x00020000         /* port enable status change */
+#define RH_PS_PESC           0x00020000         /* port enable status change */
-#define RH_PS_PSSC           0x00040000         /* port suspend status change */
+#define RH_PS_PSSC           0x00040000         /* port suspend status change */
-#define RH_PS_OCIC           0x00080000         /* over current indicator change */
+#define RH_PS_OCIC           0x00080000         /* over current indicator change */
-#define RH_PS_PRSC           0x00100000         /* port reset status change */
+#define RH_PS_PRSC           0x00100000         /* port reset status change */
 /* roothub.status bits */
 #define RH_HS_LPS            0x00000001         /* local power status */
@@ -333,7 +333,7 @@ typedef struct urb_priv {
 } urb_priv_t;
 #define TD_HASH_SIZE    64    /* power'o'two */
-// sizeof (struct td) ~= 64 == 2^6 ... 
+// sizeof (struct td) ~= 64 == 2^6 ...
 #define TD_HASH_FUNC(td_dma) ((td_dma ^ (td_dma >> 6)) % TD_HASH_SIZE)
@@ -364,11 +364,11 @@ struct ohci_hcd {
        struct ed               *ed_bulktail;           /* last in bulk list */
        struct ed               *ed_controltail;        /* last in ctrl list */
-        struct ed               *periodic [NUM_INTS];   /* shadow int_table */
+        struct ed               *periodic [NUM_INTS];   /* shadow int_table */
        /*
         * OTG controllers and transceivers need software interaction;
-         * other external transceivers should be software-transparent 
+         * other external transceivers should be software-transparent
         */
        struct otg_transceiver  *transceiver;
@@ -385,7 +385,7 @@ struct ohci_hcd {
         */
        int                     num_ports;
        int                     load [NUM_INTS];
-        u32                     hc_control;     /* copy of hc control reg */
+        u32                     hc_control;     /* copy of hc control reg */
        unsigned long           next_statechange;       /* suspend/resume */
        u32                     fminterval;             /* saved register */
        unsigned                autostop:1;     /* rh auto stopping/stopped */
@@ -598,11 +598,11 @@ static inline void disable (struct ohci_hcd *ohci)
 }
 #define FI                      0x2edf          /* 12000 bits per frame (-1) */
-#define FSMP(fi)                (0x7fff & ((6 * ((fi) - 210)) / 7))
+#define FSMP(fi)                (0x7fff & ((6 * ((fi) - 210)) / 7))
 #define FIT                     (1 << 31)
 #define LSTHRESH                0x628           /* lowspeed bit threshold */
-static void periodic_reinit (struct ohci_hcd *ohci)
+static inline void periodic_reinit (struct ohci_hcd *ohci)
 {
        u32     fi = ohci->fminterval & 0x03fff;
        u32     fit = ohci_readl(ohci, &ohci->regs->fminterval) & FIT;
@@ -626,11 +626,11 @@ static void periodic_reinit (struct ohci_hcd *ohci)
                        temp = ohci_readl (hc, &hc->regs->roothub.register); \
        temp; })
-static u32 roothub_a (struct ohci_hcd *hc)
+static inline u32 roothub_a (struct ohci_hcd *hc)
        { return read_roothub (hc, a, 0xfc0fe000); }
 static inline u32 roothub_b (struct ohci_hcd *hc)
        { return ohci_readl (hc, &hc->regs->roothub.b); }
 static inline u32 roothub_status (struct ohci_hcd *hc)
        { return ohci_readl (hc, &hc->regs->roothub.status); }
-static u32 roothub_portstatus (struct ohci_hcd *hc, int i)
+static inline u32 roothub_portstatus (struct ohci_hcd *hc, int i)
        { return read_roothub (hc, portstatus [i], 0xffe0fce0); }
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index a9d7119e3176..a7fa0d75567d 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -40,6 +40,7 @@
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
 #include <linux/ioport.h>
+#include <linux/pci_ids.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
@@ -210,15 +211,16 @@ struct u132 {
 * these cannot be inlines because we need the structure offset!!
 * Does anyone have a better way?????
 */
+#define ftdi_read_pcimem(pdev, member, data) usb_ftdi_elan_read_pcimem(pdev, \
+        offsetof(struct ohci_regs, member), 0, data);
+#define ftdi_write_pcimem(pdev, member, data) usb_ftdi_elan_write_pcimem(pdev, \
+        offsetof(struct ohci_regs, member), 0, data);
 #define u132_read_pcimem(u132, member, data) \
        usb_ftdi_elan_read_pcimem(u132->platform_dev, offsetof(struct \
        ohci_regs, member), 0, data);
 #define u132_write_pcimem(u132, member, data) \
        usb_ftdi_elan_write_pcimem(u132->platform_dev, offsetof(struct \
        ohci_regs, member), 0, data);
-#define u132_write_pcimem_byte(u132, member, data) \
-        usb_ftdi_elan_write_pcimem(u132->platform_dev, offsetof(struct \
-        ohci_regs, member), 0x0e, data);
 static inline struct u132 *udev_to_u132(struct u132_udev *udev)
 {
        u8 udev_number = udev->udev_number;
@@ -1574,59 +1576,12 @@ static char *hcfs2string(int state)
        return "?";
 }
-static int u132_usb_reset(struct u132 *u132)
-{
-        int retval;
-        retval = u132_read_pcimem(u132, control, &u132->hc_control);
-        if (retval)
-                return retval;
-        u132->hc_control &= OHCI_CTRL_RWC;
-        retval = u132_write_pcimem(u132, control, u132->hc_control);
-        if (retval)
-                return retval;
-        return 0;
-}
 static int u132_init(struct u132 *u132)
 {
        int retval;
        u32 control;
        u132_disable(u132);
-        u132->next_statechange =
+        u132->next_statechange = jiffies;
-                jiffies; /* SMM owns the HC? not for long! */  {
-                u32 control;
-                retval = u132_read_pcimem(u132, control, &control);
-                if (retval)
-                        return retval;
-                if (control & OHCI_CTRL_IR) {
-                        u32 temp = 50;
-                        retval = u132_write_pcimem(u132, intrenable,
-                                OHCI_INTR_OC);
-                        if (retval)
-                                return retval;
-                        retval = u132_write_pcimem_byte(u132, cmdstatus,
-                                OHCI_OCR);
-                        if (retval)
-                                return retval;
-                      check:{
-                                retval = u132_read_pcimem(u132, control,
-                                        &control);
-                                if (retval)
-                                        return retval;
-                        }
-                        if (control & OHCI_CTRL_IR) {
-                                msleep(10);
-                                if (--temp == 0) {
-                                        dev_err(&u132->platform_dev->dev, "USB "
-                                                "HC takeover failed!(BIOS/SMM b"
-                                                "ug) control=%08X\n", control);
-                                        return -EBUSY;
-                                }
-                                goto check;
-                        }
-                        u132_usb_reset(u132);
-                }
-        }
        retval = u132_write_pcimem(u132, intrdisable, OHCI_INTR_MIE);
        if (retval)
                return retval;
@@ -1725,7 +1680,7 @@ static int u132_run(struct u132 *u132)
      retry:retval = u132_read_pcimem(u132, cmdstatus, &status);
        if (retval)
                return retval;
-        retval = u132_write_pcimem_byte(u132, cmdstatus, OHCI_HCR);
+        retval = u132_write_pcimem(u132, cmdstatus, OHCI_HCR);
        if (retval)
                return retval;
      extra:{
@@ -1782,7 +1737,7 @@ static int u132_run(struct u132 *u132)
        retval = u132_write_pcimem(u132, control, u132->hc_control);
        if (retval)
                return retval;
-        retval = u132_write_pcimem_byte(u132, cmdstatus, OHCI_BLF);
+        retval = u132_write_pcimem(u132, cmdstatus, OHCI_BLF);
        if (retval)
                return retval;
        retval = u132_read_pcimem(u132, cmdstatus, &cmdstatus);
@@ -1839,8 +1794,8 @@ static void u132_hcd_stop(struct usb_hcd *hcd)
 {
        struct u132 *u132 = hcd_to_u132(hcd);
        if (u132->going > 1) {
-                dev_err(&u132->platform_dev->dev, "device has been removed %d\n"
+                dev_err(&u132->platform_dev->dev, "u132 device %p(hcd=%p) has b"
-                        , u132->going);
+                        "een removed %d\n", u132, hcd, u132->going);
        } else if (u132->going > 0) {
                dev_err(&u132->platform_dev->dev, "device hcd=%p is being remov"
                        "ed\n", hcd);
@@ -2545,8 +2500,9 @@ static void u132_endpoint_disable(struct usb_hcd *hcd,
 {
        struct u132 *u132 = hcd_to_u132(hcd);
        if (u132->going > 2) {
-                dev_err(&u132->platform_dev->dev, "device has been removed %d\n"
+                dev_err(&u132->platform_dev->dev, "u132 device %p(hcd=%p hep=%p"
-                        , u132->going);
+                        ") has been removed %d\n", u132, hcd, hep,
+                        u132->going);
        } else {
                struct u132_endp *endp = hep->hcpriv;
                if (endp)
@@ -2790,7 +2746,6 @@ static int u132_hub_status_data(struct usb_hcd *hcd, char *buf)
        } else if (u132->going > 0) {
                dev_err(&u132->platform_dev->dev, "device hcd=%p is being remov"
                        "ed\n", hcd);
-                dump_stack();
                return -ESHUTDOWN;
        } else {
                int i, changed = 0, length = 1;
@@ -3034,12 +2989,15 @@ static int __devexit u132_remove(struct platform_device *pdev)
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
        if (hcd) {
                struct u132 *u132 = hcd_to_u132(hcd);
-                dump_stack();
                if (u132->going++ > 1) {
+                        dev_err(&u132->platform_dev->dev, "already being remove"
+                                "d\n");
                        return -ENODEV;
                } else {
                        int rings = MAX_U132_RINGS;
                        int endps = MAX_U132_ENDPS;
+                        dev_err(&u132->platform_dev->dev, "removing device u132"
+                                ".%d\n", u132->sequence_num);
                        msleep(100);
                        down(&u132->sw_lock);
                        u132_monitor_cancel_work(u132);
@@ -3121,10 +3079,24 @@ static void u132_initialise(struct u132 *u132, struct platform_device *pdev)
 static int __devinit u132_probe(struct platform_device *pdev)
 {
        struct usb_hcd *hcd;
+        int retval;
+        u32 control;
+        u32 rh_a = -1;
+        u32 num_ports;
        msleep(100);
        if (u132_exiting > 0) {
                return -ENODEV;
-        }                        /* refuse to confuse usbcore */
+        }
+        retval = ftdi_write_pcimem(pdev, intrdisable, OHCI_INTR_MIE);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(pdev, control, &control);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(pdev, roothub.a, &rh_a);
+        if (retval)
+                return retval;
+        num_ports = rh_a & RH_A_NDP;        /* refuse to confuse usbcore */
        if (pdev->dev.dma_mask) {
                return -EINVAL;
        }
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index e87692c31be4..acd101caeeeb 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -60,6 +60,11 @@ Randy Dunlap, Georg Acher, Deti Fliegl, Thomas Sailer, Roman Weissgaerber, \
 Alan Stern"
 #define DRIVER_DESC "USB Universal Host Controller Interface driver"
+/* for flakey hardware, ignore overcurrent indicators */
+static int ignore_oc;
+module_param(ignore_oc, bool, S_IRUGO);
+MODULE_PARM_DESC(ignore_oc, "ignore hardware overcurrent indications");
 /*
 * debug = 0, no debugging messages
 * debug = 1, dump failed URBs except for stalls
@@ -169,6 +174,11 @@ static int resume_detect_interrupts_are_broken(struct uhci_hcd *uhci)
 {
        int port;
+        /* If we have to ignore overcurrent events then almost by definition
+         * we can't depend on resume-detect interrupts. */
+        if (ignore_oc)
+                return 1;
        switch (to_pci_dev(uhci_dev(uhci))->vendor) {
            default:
                break;
@@ -921,7 +931,8 @@ static int __init uhci_hcd_init(void)
 {
        int retval = -ENOMEM;
-        printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "\n");
+        printk(KERN_INFO DRIVER_DESC " " DRIVER_VERSION "%s\n",
+                        ignore_oc ? ", overcurrent ignored" : "");
        if (usb_disabled())
                return -ENODEV;
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c
index f8347f1a10b6..bacc25c53ba3 100644
--- a/drivers/usb/host/uhci-hub.c
+++ b/drivers/usb/host/uhci-hub.c
@@ -52,10 +52,20 @@ static int any_ports_active(struct uhci_hcd *uhci)
 static inline int get_hub_status_data(struct uhci_hcd *uhci, char *buf)
 {
        int port;
+        int mask = RWC_BITS;
+        /* Some boards (both VIA and Intel apparently) report bogus
+         * overcurrent indications, causing massive log spam unless
+         * we completely ignore them.  This doesn't seem to be a problem
+         * with the chipset so much as with the way it is connected on
+         * the motherboard; if the overcurrent input is left to float
+         * then it may constantly register false positives. */
+        if (ignore_oc)
+                mask &= ~USBPORTSC_OCC;
        *buf = 0;
        for (port = 0; port < uhci->rh_numports; ++port) {
-                if ((inw(uhci->io_addr + USBPORTSC1 + port * 2) & RWC_BITS) ||
+                if ((inw(uhci->io_addr + USBPORTSC1 + port * 2) & mask) ||
                                test_bit(port, &uhci->port_c_suspend))
                        *buf |= (1 << (port + 1));
        }
@@ -263,7 +273,7 @@ static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
                        wPortChange |= USB_PORT_STAT_C_CONNECTION;
                if (status & USBPORTSC_PEC)
                        wPortChange |= USB_PORT_STAT_C_ENABLE;
-                if (status & USBPORTSC_OCC)
+                if ((status & USBPORTSC_OCC) && !ignore_oc)
                        wPortChange |= USB_PORT_STAT_C_OVERCURRENT;
                if (test_bit(port, &uhci->port_c_suspend)) {
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 8a62d4785755..e308f6dc2b87 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -7,7 +7,8 @@ comment "USB Input Devices"
 config USB_HID
        tristate "USB Human Interface Device (full HID) support"
        default y
-        depends on USB && HID
+        depends on USB
+        select HID
        ---help---
          Say Y here if you want full HID support to connect USB keyboards,
          mice, joysticks, graphic tablets, or any other HID based devices
diff --git a/drivers/usb/input/wacom_sys.c b/drivers/usb/input/wacom_sys.c
index e7cc20ab8155..12b42746ded8 100644
--- a/drivers/usb/input/wacom_sys.c
+++ b/drivers/usb/input/wacom_sys.c
@@ -159,13 +159,13 @@ void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
        input_dev->keybit[LONG(BTN_DIGI)] |= BIT(BTN_TOOL_FINGER);
        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_0) | BIT(BTN_1) | BIT(BTN_2) | BIT(BTN_3);
-        input_set_abs_params(input_dev, ABS_RX, 0, 4097, 0, 0);
+        input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
 }
 void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
        input_dev->keybit[LONG(BTN_LEFT)] |= BIT(BTN_4) | BIT(BTN_5) | BIT(BTN_6) | BIT(BTN_7);
-        input_set_abs_params(input_dev, ABS_RY, 0, 4097, 0, 0);
+        input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
 }
 void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
diff --git a/drivers/usb/input/wacom_wac.c b/drivers/usb/input/wacom_wac.c
index 92726fe89379..4142e36730fc 100644
--- a/drivers/usb/input/wacom_wac.c
+++ b/drivers/usb/input/wacom_wac.c
@@ -209,13 +209,15 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                        wacom_report_key(wcombo, BTN_STYLUS, data[1] & 0x02);
                        wacom_report_key(wcombo, BTN_STYLUS2, data[1] & 0x04);
                }
-        }
-        if (data[1] & 0x10)
                wacom_report_abs(wcombo, ABS_MISC, id); /* report tool id */
+        }
        else
                wacom_report_abs(wcombo, ABS_MISC, 0); /* reset tool id */
-        wacom_report_key(wcombo, wacom->tool[0], data[1] & 0x10);
+        if (data[1] & 0x10)  /* only report prox-in when in area */
+                wacom_report_key(wcombo, wacom->tool[0], 1);
+        if (!(data[1] & 0x90))  /* report prox-out when physically out */
+                wacom_report_key(wcombo, wacom->tool[0], 0);
        wacom_input_sync(wcombo);
        /* send pad data */
@@ -405,7 +407,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
        if ((wacom->features->type == CINTIQ) && !(data[1] & 0x40))
                 return 0;
-        if (wacom->features->type >= INTUOS3) {
+        if (wacom->features->type >= INTUOS3S) {
                wacom_report_abs(wcombo, ABS_X, (data[2] << 9) | (data[3] << 1) | ((data[9] >> 1) & 1));
                wacom_report_abs(wcombo, ABS_Y, (data[4] << 9) | (data[5] << 1) | (data[9] & 1));
                wacom_report_abs(wcombo, ABS_DISTANCE, ((data[9] >> 2) & 0x3f));
@@ -423,7 +425,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                if (data[1] & 0x02) {
                        /* Rotation packet */
-                        if (wacom->features->type >= INTUOS3) {
+                        if (wacom->features->type >= INTUOS3S) {
                                /* I3 marker pen rotation reported as wheel
                                 * due to valuator limitation
                                 */
@@ -547,11 +549,11 @@ static struct wacom_features wacom_features[] = {
        { "Wacom Graphire3 6x8", 8,  16704, 12064,  511, 63, GRAPHIRE },
        { "Wacom Graphire4 4x5", 8,  10208,  7424,  511, 63, WACOM_G4 },
        { "Wacom Graphire4 6x8", 8,  16704, 12064,  511, 63, WACOM_G4 },
-        { "Wacom Volito",        8,   5104,  3712,  511,  0, GRAPHIRE },
+        { "Wacom Volito",        8,   5104,  3712,  511, 63, GRAPHIRE },
-        { "Wacom PenStation2",   8,   3250,  2320,  255,  0, GRAPHIRE },
+        { "Wacom PenStation2",   8,   3250,  2320,  255, 63, GRAPHIRE },
-        { "Wacom Volito2 4x5",   8,   5104,  3712,  511,  0, GRAPHIRE },
+        { "Wacom Volito2 4x5",   8,   5104,  3712,  511, 63, GRAPHIRE },
-        { "Wacom Volito2 2x3",   8,   3248,  2320,  511,  0, GRAPHIRE },
+        { "Wacom Volito2 2x3",   8,   3248,  2320,  511, 63, GRAPHIRE },
-        { "Wacom PenPartner2",   8,   3250,  2320,  255,  0, GRAPHIRE },
+        { "Wacom PenPartner2",   8,   3250,  2320,  255, 63, GRAPHIRE },
        { "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 63, INTUOS },
        { "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 63, INTUOS },
        { "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 63, INTUOS },
@@ -580,7 +582,7 @@ static struct wacom_features wacom_features[] = {
        { "Wacom Intuos3 12x12", 10, 60960, 60960, 1023, 63, INTUOS3L },
        { "Wacom Intuos3 12x19", 10, 97536, 60960, 1023, 63, INTUOS3L },
        { "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 63, INTUOS3 },
-        { "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 15, INTUOS3S },
+        { "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 63, INTUOS3S },
        { "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 63, CINTIQ },
        { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 63, INTUOS },
        { }
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 6c7f3efb1d40..b5332e679c46 100644
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -1376,7 +1376,7 @@ static int auerchar_open (struct inode *inode, struct file *file)
        }
        /* we have access to the device. Now lets allocate memory */
-        ccp = (pauerchar_t) kmalloc(sizeof(auerchar_t), GFP_KERNEL);
+        ccp = kzalloc(sizeof(auerchar_t), GFP_KERNEL);
        if (ccp == NULL) {
                err ("out of memory");
                ret = -ENOMEM;
@@ -1384,7 +1384,6 @@ static int auerchar_open (struct inode *inode, struct file *file)
        }
        /* Initialize device descriptor */
-        memset( ccp, 0, sizeof(auerchar_t));
        init_MUTEX( &ccp->mutex);
        init_MUTEX( &ccp->readmutex);
        auerbuf_init (&ccp->bufctl);
@@ -1912,14 +1911,13 @@ static int auerswald_probe (struct usb_interface *intf,
                return -ENODEV;
        /* allocate memory for our device and initialize it */
-        cp = kmalloc (sizeof(auerswald_t), GFP_KERNEL);
+        cp = kzalloc (sizeof(auerswald_t), GFP_KERNEL);
        if (cp == NULL) {
                err ("out of memory");
                goto pfail;
        }
        /* Initialize device descriptor */
-        memset (cp, 0, sizeof(auerswald_t));
        init_MUTEX (&cp->mutex);
        cp->usbdev = usbdev;
        auerchain_init (&cp->controlchain);
diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 18b1925032a8..41c0161abdb9 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -40,6 +40,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/ioctl.h>
+#include <linux/pci_ids.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kref.h>
@@ -51,6 +52,10 @@ MODULE_AUTHOR("Tony Olech");
 MODULE_DESCRIPTION("FTDI ELAN driver");
 MODULE_LICENSE("GPL");
 #define INT_MODULE_PARM(n, v) static int n = v;module_param(n, int, 0444)
+static int distrust_firmware = 1;
+module_param(distrust_firmware, bool, 0);
+MODULE_PARM_DESC(distrust_firmware, "true to distrust firmware power/overcurren"
+        "t setup");
 extern struct platform_driver u132_platform_driver;
 static struct workqueue_struct *status_queue;
 static struct workqueue_struct *command_queue;
@@ -66,7 +71,9 @@ static struct list_head ftdi_static_list;
 * end of the global variables protected by ftdi_module_lock
 */
 #include "usb_u132.h"
-#define TD_DEVNOTRESP 5
+#include <asm/io.h>
+#include "../core/hcd.h"
+#include "../host/ohci.h"
 /* Define these values to match your devices*/
 #define USB_FTDI_ELAN_VENDOR_ID 0x0403
 #define USB_FTDI_ELAN_PRODUCT_ID 0xd6ea
@@ -551,7 +558,7 @@ static void ftdi_elan_status_work(struct work_struct *work)
                } else {
                        dev_err(&ftdi->udev->dev, "initialized failed - trying "
                                "again in 10 seconds\n");
-                        work_delay_in_msec = 10 *1000;
+                        work_delay_in_msec = 1 *1000;
                }
        } else if (ftdi->registered == 0) {
                work_delay_in_msec = 10;
@@ -2288,82 +2295,288 @@ static int ftdi_elan_checkingPCI(struct usb_ftdi *ftdi)
        }
 }
-static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
+#define ftdi_read_pcimem(ftdi, member, data) ftdi_elan_read_pcimem(ftdi, \
+        offsetof(struct ohci_regs, member), 0, data);
+#define ftdi_write_pcimem(ftdi, member, data) ftdi_elan_write_pcimem(ftdi, \
+        offsetof(struct ohci_regs, member), 0, data);
+#define OHCI_QUIRK_AMD756 0x01
+#define OHCI_QUIRK_SUPERIO 0x02
+#define OHCI_QUIRK_INITRESET 0x04
+#define OHCI_BIG_ENDIAN 0x08
+#define OHCI_QUIRK_ZFMICRO 0x10
+#define OHCI_CONTROL_INIT OHCI_CTRL_CBSR
+#define OHCI_INTR_INIT (OHCI_INTR_MIE | OHCI_INTR_UE | OHCI_INTR_RD | \
+        OHCI_INTR_WDH)
+static int ftdi_elan_check_controller(struct usb_ftdi *ftdi, int quirk)
+{
+        int devices = 0;
+        int retval;
+        u32 hc_control;
+        int num_ports;
+        u32 control;
+        u32 rh_a = -1;
+        u32 status;
+        u32 fminterval;
+        u32 hc_fminterval;
+        u32 periodicstart;
+        u32 cmdstatus;
+        u32 roothub_a;
+        int mask = OHCI_INTR_INIT;
+        int sleep_time = 0;
+        int reset_timeout = 30;        /* ... allow extra time */
+        int temp;
+        retval = ftdi_write_pcimem(ftdi, intrdisable, OHCI_INTR_MIE);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, roothub.a, &rh_a);
+        if (retval)
+                return retval;
+        num_ports = rh_a & RH_A_NDP;
+        retval = ftdi_read_pcimem(ftdi, fminterval, &hc_fminterval);
+        if (retval)
+                return retval;
+        hc_fminterval &= 0x3fff;
+        if (hc_fminterval != FI) {
+        }
+        hc_fminterval |= FSMP(hc_fminterval) << 16;
+        retval = ftdi_read_pcimem(ftdi, control, &hc_control);
+        if (retval)
+                return retval;
+        switch (hc_control & OHCI_CTRL_HCFS) {
+        case OHCI_USB_OPER:
+                sleep_time = 0;
+                break;
+        case OHCI_USB_SUSPEND:
+        case OHCI_USB_RESUME:
+                hc_control &= OHCI_CTRL_RWC;
+                hc_control |= OHCI_USB_RESUME;
+                sleep_time = 10;
+                break;
+        default:
+                hc_control &= OHCI_CTRL_RWC;
+                hc_control |= OHCI_USB_RESET;
+                sleep_time = 50;
+                break;
+        }
+        retval = ftdi_write_pcimem(ftdi, control, hc_control);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+        msleep(sleep_time);
+        retval = ftdi_read_pcimem(ftdi, roothub.a, &roothub_a);
+        if (retval)
+                return retval;
+        if (!(roothub_a & RH_A_NPS)) {        /* power down each port */
+                for (temp = 0; temp < num_ports; temp++) {
+                        retval = ftdi_write_pcimem(ftdi,
+                                roothub.portstatus[temp], RH_PS_LSDA);
+                        if (retval)
+                                return retval;
+                }
+        }
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+      retry:retval = ftdi_read_pcimem(ftdi, cmdstatus, &status);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, cmdstatus, OHCI_HCR);
+        if (retval)
+                return retval;
+      extra:{
+                retval = ftdi_read_pcimem(ftdi, cmdstatus, &status);
+                if (retval)
+                        return retval;
+                if (0 != (status & OHCI_HCR)) {
+                        if (--reset_timeout == 0) {
+                                dev_err(&ftdi->udev->dev, "USB HC reset timed o"
+                                        "ut!\n");
+                                return -ENODEV;
+                        } else {
+                                msleep(5);
+                                goto extra;
+                        }
+                }
+        }
+        if (quirk & OHCI_QUIRK_INITRESET) {
+                retval = ftdi_write_pcimem(ftdi, control, hc_control);
+                if (retval)
+                        return retval;
+                retval = ftdi_read_pcimem(ftdi, control, &control);
+                if (retval)
+                        return retval;
+        }
+        retval = ftdi_write_pcimem(ftdi, ed_controlhead, 0x00000000);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, ed_bulkhead, 0x11000000);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, hcca, 0x00000000);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, fminterval, &fminterval);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, fminterval,
+                ((fminterval & FIT) ^ FIT) | hc_fminterval);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, periodicstart,
+                ((9 *hc_fminterval) / 10) & 0x3fff);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, fminterval, &fminterval);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, periodicstart, &periodicstart);
+        if (retval)
+                return retval;
+        if (0 == (fminterval & 0x3fff0000) || 0 == periodicstart) {
+                if (!(quirk & OHCI_QUIRK_INITRESET)) {
+                        quirk |= OHCI_QUIRK_INITRESET;
+                        goto retry;
+                } else
+                        dev_err(&ftdi->udev->dev, "init err(%08x %04x)\n",
+                                fminterval, periodicstart);
+        }                        /* start controller operations */
+        hc_control &= OHCI_CTRL_RWC;
+        hc_control |= OHCI_CONTROL_INIT | OHCI_CTRL_BLE | OHCI_USB_OPER;
+        retval = ftdi_write_pcimem(ftdi, control, hc_control);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, cmdstatus, OHCI_BLF);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, cmdstatus, &cmdstatus);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, roothub.status, RH_HS_DRWE);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, intrstatus, mask);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, intrdisable,
+                OHCI_INTR_MIE | OHCI_INTR_OC | OHCI_INTR_RHSC | OHCI_INTR_FNO |
+                OHCI_INTR_UE | OHCI_INTR_RD | OHCI_INTR_SF | OHCI_INTR_WDH |
+                OHCI_INTR_SO);
+        if (retval)
+                return retval;        /* handle root hub init quirks ... */
+        retval = ftdi_read_pcimem(ftdi, roothub.a, &roothub_a);
+        if (retval)
+                return retval;
+        roothub_a &= ~(RH_A_PSM | RH_A_OCPM);
+        if (quirk & OHCI_QUIRK_SUPERIO) {
+                roothub_a |= RH_A_NOCP;
+                roothub_a &= ~(RH_A_POTPGT | RH_A_NPS);
+                retval = ftdi_write_pcimem(ftdi, roothub.a, roothub_a);
+                if (retval)
+                        return retval;
+        } else if ((quirk & OHCI_QUIRK_AMD756) || distrust_firmware) {
+                roothub_a |= RH_A_NPS;
+                retval = ftdi_write_pcimem(ftdi, roothub.a, roothub_a);
+                if (retval)
+                        return retval;
+        }
+        retval = ftdi_write_pcimem(ftdi, roothub.status, RH_HS_LPSC);
+        if (retval)
+                return retval;
+        retval = ftdi_write_pcimem(ftdi, roothub.b,
+                (roothub_a & RH_A_NPS) ? 0 : RH_B_PPCM);
+        if (retval)
+                return retval;
+        retval = ftdi_read_pcimem(ftdi, control, &control);
+        if (retval)
+                return retval;
+        mdelay((roothub_a >> 23) & 0x1fe);
+        for (temp = 0; temp < num_ports; temp++) {
+                u32 portstatus;
+                retval = ftdi_read_pcimem(ftdi, roothub.portstatus[temp],
+                        &portstatus);
+                if (retval)
+                        return retval;
+                if (1 & portstatus)
+                        devices += 1;
+        }
+        return devices;
+}
+static int ftdi_elan_setup_controller(struct usb_ftdi *ftdi, int fn)
 {
        u32 latence_timer;
-        u32 controlreg;
        int UxxxStatus;
        u32 pcidata;
        int reg = 0;
-        int foundOHCI = 0;
+        int activePCIfn = fn << 8;
-        u8 fn;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x2800);
-        int activePCIfn = 0;
-        u32 pciVID = 0;
-        u32 pciPID = 0;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
-        if (UxxxStatus)
-                return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000000L);
-        if (UxxxStatus)
-                return UxxxStatus;
-        msleep(750);
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x100);
        if (UxxxStatus)
                return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x500);
+        reg = 16;
+        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0,
+                0xFFFFFFFF);
        if (UxxxStatus)
                return UxxxStatus;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &pcidata);
        if (UxxxStatus)
                return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020CL | 0x000);
+        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0,
+                0xF0000000);
        if (UxxxStatus)
                return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020DL | 0x000);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &pcidata);
        if (UxxxStatus)
                return UxxxStatus;
-        msleep(250);
+        reg = 12;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020FL | 0x000);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &latence_timer);
        if (UxxxStatus)
                return UxxxStatus;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        latence_timer &= 0xFFFF00FF;
+        latence_timer |= 0x00001600;
+        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0x00,
+                latence_timer);
        if (UxxxStatus)
                return UxxxStatus;
-        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x800);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &pcidata);
        if (UxxxStatus)
                return UxxxStatus;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        reg = 4;
+        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0x00,
+                0x06);
        if (UxxxStatus)
                return UxxxStatus;
-        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
+                &pcidata);
        if (UxxxStatus)
                return UxxxStatus;
-        msleep(1000);
+        for (reg = 0; reg <= 0x54; reg += 4) {
-        for (fn = 0; (fn < 4) && (!foundOHCI); fn++) {
+                UxxxStatus = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-                activePCIfn = fn << 8;
-                ftdi->function = fn + 1;
-                UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
-                        &pcidata);
                if (UxxxStatus)
                        return UxxxStatus;
-                pciVID = pcidata & 0xFFFF;
-                pciPID = (pcidata >> 16) & 0xFFFF;
-                if ((pciVID == 0x1045) && (pciPID == 0xc861)) {
-                        foundOHCI = 1;
-                } else if ((pciVID == 0x1033) && (pciPID == 0x0035)) {
-                        foundOHCI = 1;
-                } else if ((pciVID == 0x10b9) && (pciPID == 0x5237)) {
-                        foundOHCI = 1;
-                } else if ((pciVID == 0x11c1) && (pciPID == 0x5802)) {
-                        foundOHCI = 1;
-                } else if ((pciVID == 0x11AB) && (pciPID == 0x1FA6)) {
-                }
-        }
-        if (foundOHCI == 0) {
-                return -ENXIO;
        }
-        ftdi->platform_data.vendor = pciVID;
+        return 0;
-        ftdi->platform_data.device = pciPID;
+}
+static int ftdi_elan_close_controller(struct usb_ftdi *ftdi, int fn)
+{
+        u32 latence_timer;
+        int UxxxStatus;
+        u32 pcidata;
+        int reg = 0;
+        int activePCIfn = fn << 8;
        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x2800);
        if (UxxxStatus)
                return UxxxStatus;
@@ -2377,7 +2590,7 @@ static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
        if (UxxxStatus)
                return UxxxStatus;
        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0,
-                0xF0000000);
+                0x00000000);
        if (UxxxStatus)
                return UxxxStatus;
        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
@@ -2401,7 +2614,7 @@ static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
                return UxxxStatus;
        reg = 4;
        UxxxStatus = ftdi_elan_write_config(ftdi, activePCIfn | reg, 0x00,
-                0x06);
+                0x00);
        if (UxxxStatus)
                return UxxxStatus;
        UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
@@ -2411,159 +2624,139 @@ static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
        return 0;
 }
+static int ftdi_elan_found_controller(struct usb_ftdi *ftdi, int fn, int quirk)
+{
+        int result;
+        int UxxxStatus;
+        UxxxStatus = ftdi_elan_setup_controller(ftdi, fn);
+        if (UxxxStatus)
+                return UxxxStatus;
+        result = ftdi_elan_check_controller(ftdi, quirk);
+        UxxxStatus = ftdi_elan_close_controller(ftdi, fn);
+        if (UxxxStatus)
+                return UxxxStatus;
+        return result;
+}
+static int ftdi_elan_enumeratePCI(struct usb_ftdi *ftdi)
+{
+        u32 controlreg;
+        u8 sensebits;
+        int UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000000L);
+        if (UxxxStatus)
+                return UxxxStatus;
+        msleep(750);
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x100);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x00000200L | 0x500);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020CL | 0x000);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020DL | 0x000);
+        if (UxxxStatus)
+                return UxxxStatus;
+        msleep(250);
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000020FL | 0x000);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_write_reg(ftdi, 0x0000025FL | 0x800);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        UxxxStatus = ftdi_elan_read_reg(ftdi, &controlreg);
+        if (UxxxStatus)
+                return UxxxStatus;
+        msleep(1000);
+        sensebits = (controlreg >> 16) & 0x000F;
+        if (0x0D == sensebits)
+                return 0;
+        else
+                return - ENXIO;
+}
 static int ftdi_elan_setupOHCI(struct usb_ftdi *ftdi)
 {
+        int UxxxStatus;
        u32 pcidata;
-        int U132Status;
+        int reg = 0;
-        int reg;
+        u8 fn;
-        int reset_repeat = 0;
+        int activePCIfn = 0;
-      do_reset:reg = 8;
+        int max_devices = 0;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x0e, 0x01);
+        int controllers = 0;
-        if (U132Status)
+        int unrecognized = 0;
-                return U132Status;
+        ftdi->function = 0;
-      reset_check:{
+        for (fn = 0; (fn < 4); fn++) {
-                U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
+                u32 pciVID = 0;
-                if (U132Status)
+                u32 pciPID = 0;
-                        return U132Status;
+                int devices = 0;
-                if (pcidata & 1) {
+                activePCIfn = fn << 8;
-                        msleep(500);
+                UxxxStatus = ftdi_elan_read_config(ftdi, activePCIfn | reg, 0,
-                        if (reset_repeat++ > 100) {
+                        &pcidata);
-                                reset_repeat = 0;
+                if (UxxxStatus)
-                                goto do_reset;
+                        return UxxxStatus;
-                        } else
+                pciVID = pcidata & 0xFFFF;
-                                goto reset_check;
+                pciPID = (pcidata >> 16) & 0xFFFF;
+                if ((pciVID == PCI_VENDOR_ID_OPTI) && (pciPID == 0xc861)) {
+                        devices = ftdi_elan_found_controller(ftdi, fn, 0);
+                        controllers += 1;
+                } else if ((pciVID == PCI_VENDOR_ID_NEC) && (pciPID == 0x0035))
+                        {
+                        devices = ftdi_elan_found_controller(ftdi, fn, 0);
+                        controllers += 1;
+                } else if ((pciVID == PCI_VENDOR_ID_AL) && (pciPID == 0x5237)) {
+                        devices = ftdi_elan_found_controller(ftdi, fn, 0);
+                        controllers += 1;
+                } else if ((pciVID == PCI_VENDOR_ID_ATT) && (pciPID == 0x5802))
+                        {
+                        devices = ftdi_elan_found_controller(ftdi, fn, 0);
+                        controllers += 1;
+                } else if (pciVID == PCI_VENDOR_ID_AMD && pciPID == 0x740c) {
+                        devices = ftdi_elan_found_controller(ftdi, fn,
+                                OHCI_QUIRK_AMD756);
+                        controllers += 1;
+                } else if (pciVID == PCI_VENDOR_ID_COMPAQ && pciPID == 0xa0f8) {
+                        devices = ftdi_elan_found_controller(ftdi, fn,
+                                OHCI_QUIRK_ZFMICRO);
+                        controllers += 1;
+                } else if (0 == pcidata) {
+                } else
+                        unrecognized += 1;
+                if (devices > max_devices) {
+                        max_devices = devices;
+                        ftdi->function = fn + 1;
+                        ftdi->platform_data.vendor = pciVID;
+                        ftdi->platform_data.device = pciPID;
                }
        }
-        goto dump_regs;
+        if (ftdi->function > 0) {
-        msleep(500);
+                UxxxStatus = ftdi_elan_setup_controller(ftdi,
-        reg = 0x28;
+                        ftdi->function - 1);
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x11000000);
+                if (UxxxStatus)
-        if (U132Status)
+                        return UxxxStatus;
-                return U132Status;
+                return 0;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
+        } else if (controllers > 0) {
-        if (U132Status)
+                return -ENXIO;
-                return U132Status;
+        } else if (unrecognized > 0) {
-        reg = 0x40;
+                return -ENXIO;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x2edf);
+        } else {
-        if (U132Status)
+                ftdi->enumerated = 0;
-                return U132Status;
+                return -ENXIO;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x34;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x2edf2edf);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 4;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0xA0);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        msleep(250);
-        reg = 8;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x0e, 0x04);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x28;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 8;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x48;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x00001200);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x54;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x58;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x34;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x28002edf);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        msleep(100);
-        reg = 0x50;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x10000);
-        if (U132Status)
-                return U132Status;
-        reg = 0x54;
-      power_check:U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        if (!(pcidata & 1)) {
-                msleep(500);
-                goto power_check;
-        }
-        msleep(3000);
-        reg = 0x54;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x58;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x54;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x02);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x54;
-        U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x10);
-        if (U132Status)
-                return U132Status;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        msleep(750);
-        reg = 0x54;
-        if (0) {
-                U132Status = ftdi_elan_write_pcimem(ftdi, reg, 0x00, 0x02);
-                if (U132Status)
-                        return U132Status;
-        }
-        if (0) {
-                U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-                if (U132Status)
-                        return U132Status;
-        }
-        reg = 0x54;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-        reg = 0x58;
-        U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-        if (U132Status)
-                return U132Status;
-      dump_regs:for (reg = 0; reg <= 0x54; reg += 4) {
-                U132Status = ftdi_elan_read_pcimem(ftdi, reg, 0, &pcidata);
-                if (U132Status)
-                        return U132Status;
        }
-        return 0;
 }
@@ -2688,6 +2881,7 @@ static void ftdi_elan_disconnect(struct usb_interface *interface)
                        platform_device_unregister(&ftdi->platform_dev);
                        ftdi->synchronized = 0;
                        ftdi->enumerated = 0;
+                        ftdi->initialized = 0;
                        ftdi->registered = 0;
                }
                flush_workqueue(status_queue);
diff --git a/drivers/usb/misc/phidgetservo.c b/drivers/usb/misc/phidgetservo.c
index 7163f05c5b27..0d9de2f73930 100644
--- a/drivers/usb/misc/phidgetservo.c
+++ b/drivers/usb/misc/phidgetservo.c
@@ -282,6 +282,7 @@ servo_probe(struct usb_interface *interface, const struct usb_device_id *id)
                dev->dev = NULL;
                goto out;
        }
+        dev_set_drvdata(dev->dev, dev);
        servo_count = dev->type & SERVO_COUNT_QUAD ? 4 : 1;
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c
index 33cd91d11eca..67e2fc20eeeb 100644
--- a/drivers/usb/misc/trancevibrator.c
+++ b/drivers/usb/misc/trancevibrator.c
@@ -120,8 +120,8 @@ static void tv_disconnect(struct usb_interface *interface)
        struct trancevibrator *dev;
        dev = usb_get_intfdata (interface);
-        usb_set_intfdata(interface, NULL);
        device_remove_file(&interface->dev, &dev_attr_speed);
+        usb_set_intfdata(interface, NULL);
        usb_put_dev(dev->udev);
        kfree(dev);
 }
diff --git a/drivers/usb/net/gl620a.c b/drivers/usb/net/gl620a.c
index a3242be21959..a6f0f4d934df 100644
--- a/drivers/usb/net/gl620a.c
+++ b/drivers/usb/net/gl620a.c
@@ -79,160 +79,6 @@ struct gl_header {
        struct gl_packet        packets;
 };
-#ifdef  GENELINK_ACK
-// FIXME:  this code is incomplete, not debugged; it doesn't
-// handle interrupts correctly; it should use the generic
-// status IRQ code (which didn't exist back in 2001).
-struct gl_priv {
-        struct urb      *irq_urb;
-        char            irq_buf [INTERRUPT_BUFSIZE];
-};
-static inline int gl_control_write(struct usbnet *dev, u8 request, u16 value)
-{
-        int retval;
-        retval = usb_control_msg(dev->udev,
-                      usb_sndctrlpipe(dev->udev, 0),
-                      request,
-                      USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                      value,
-                      0,                        // index
-                      0,                        // data buffer
-                      0,                        // size
-                      USB_CTRL_SET_TIMEOUT);
-        return retval;
-}
-static void gl_interrupt_complete(struct urb *urb)
-{
-        int status = urb->status;
-        switch (status) {
-        case 0:
-                /* success */
-                break;
-        case -ECONNRESET:
-        case -ENOENT:
-        case -ESHUTDOWN:
-                /* this urb is terminated, clean up */
-                dbg("%s - urb shutting down with status: %d",
-                                __FUNCTION__, status);
-                return;
-        default:
-                dbg("%s - nonzero urb status received: %d",
-                                __FUNCTION__, urb->status);
-        }
-        status = usb_submit_urb(urb, GFP_ATOMIC);
-        if (status)
-                err("%s - usb_submit_urb failed with result %d",
-                     __FUNCTION__, status);
-}
-static int gl_interrupt_read(struct usbnet *dev)
-{
-        struct gl_priv  *priv = dev->priv_data;
-        int             retval;
-        // issue usb interrupt read
-        if (priv && priv->irq_urb) {
-                // submit urb
-                if ((retval = usb_submit_urb(priv->irq_urb, GFP_KERNEL)) != 0)
-                        dbg("gl_interrupt_read: submit fail - %X...", retval);
-                else
-                        dbg("gl_interrupt_read: submit success...");
-        }
-        return 0;
-}
-// check whether another side is connected
-static int genelink_check_connect(struct usbnet *dev)
-{
-        int                     retval;
-        dbg("genelink_check_connect...");
-        // detect whether another side is connected
-        if ((retval = gl_control_write(dev, GENELINK_CONNECT_WRITE, 0)) != 0) {
-                dbg("%s: genelink_check_connect write fail - %X",
-                        dev->net->name, retval);
-                return retval;
-        }
-        // usb interrupt read to ack another side
-        if ((retval = gl_interrupt_read(dev)) != 0) {
-                dbg("%s: genelink_check_connect read fail - %X",
-                        dev->net->name, retval);
-                return retval;
-        }
-        dbg("%s: genelink_check_connect read success", dev->net->name);
-        return 0;
-}
-// allocate and initialize the private data for genelink
-static int genelink_init(struct usbnet *dev)
-{
-        struct gl_priv *priv;
-        // allocate the private data structure
-        if ((priv = kmalloc(sizeof *priv, GFP_KERNEL)) == 0) {
-                dbg("%s: cannot allocate private data per device",
-                        dev->net->name);
-                return -ENOMEM;
-        }
-        // allocate irq urb
-        if ((priv->irq_urb = usb_alloc_urb(0, GFP_KERNEL)) == 0) {
-                dbg("%s: cannot allocate private irq urb per device",
-                        dev->net->name);
-                kfree(priv);
-                return -ENOMEM;
-        }
-        // fill irq urb
-        usb_fill_int_urb(priv->irq_urb, dev->udev,
-                usb_rcvintpipe(dev->udev, GENELINK_INTERRUPT_PIPE),
-                priv->irq_buf, INTERRUPT_BUFSIZE,
-                gl_interrupt_complete, 0,
-                GENELINK_INTERRUPT_INTERVAL);
-        // set private data pointer
-        dev->priv_data = priv;
-        return 0;
-}
-// release the private data
-static int genelink_free(struct usbnet *dev)
-{
-        struct gl_priv  *priv = dev->priv_data;
-        if (!priv)
-                return 0;
-// FIXME:  can't cancel here; it's synchronous, and
-// should have happened earlier in any case (interrupt
-// handling needs to be generic)
-        // cancel irq urb first
-        usb_kill_urb(priv->irq_urb);
-        // free irq urb
-        usb_free_urb(priv->irq_urb);
-        // free the private data structure
-        kfree(priv);
-        return 0;
-}
-#endif
 static int genelink_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 {
        struct gl_header        *header;
diff --git a/drivers/usb/net/rtl8150.c b/drivers/usb/net/rtl8150.c
index c54235f73cb6..e0eecda78ec1 100644
--- a/drivers/usb/net/rtl8150.c
+++ b/drivers/usb/net/rtl8150.c
@@ -124,10 +124,11 @@
 #define RX_URB_FAIL             3
 /* Define these values to match your device */
-#define VENDOR_ID_REALTEK               0x0bda
+#define VENDOR_ID_REALTEK               0x0bda
 #define VENDOR_ID_MELCO                 0x0411
-#define VENDOR_ID_MICRONET              0x3980
+#define VENDOR_ID_MICRONET              0x3980
 #define VENDOR_ID_LONGSHINE             0x07b8
+#define VENDOR_ID_OQO                   0x1557
 #define VENDOR_ID_ZYXEL                 0x0586
 #define PRODUCT_ID_RTL8150              0x8150
@@ -144,6 +145,7 @@ static struct usb_device_id rtl8150_table[] = {
        {USB_DEVICE(VENDOR_ID_MELCO, PRODUCT_ID_LUAKTX)},
        {USB_DEVICE(VENDOR_ID_MICRONET, PRODUCT_ID_SP128AR)},
        {USB_DEVICE(VENDOR_ID_LONGSHINE, PRODUCT_ID_LCS8138TX)},
+        {USB_DEVICE(VENDOR_ID_OQO, PRODUCT_ID_RTL8150)},
        {USB_DEVICE(VENDOR_ID_ZYXEL, PRODUCT_ID_PRESTIGE)},
        {}
 };
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index 96c73726d74a..f2ca76a9cbac 100644
--- a/drivers/usb/serial/airprime.c
+++ b/drivers/usb/serial/airprime.c
@@ -19,8 +19,11 @@
 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, 0x1130) }, /* Novatel Wireless S720 CDMA/EV-DO */
+        { USB_DEVICE(0x1410, 0x2110) }, /* Novatel Wireless U720 CDMA/EV-DO */
        { USB_DEVICE(0x1410, 0x1430) }, /* Novatel Merlin XU870 HSDPA/3G */
        { USB_DEVICE(0x1410, 0x1100) }, /* ExpressCard34 Qualcomm 3G CDMA */
+        { USB_DEVICE(0x413c, 0x8115) }, /* Dell Wireless HSDPA 5500 */
        { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index 2f9b7ac32663..7ebaffd6ed86 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -69,6 +69,7 @@ static struct usb_device_id id_table [] = {
        { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
        { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
        { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
+        { USB_DEVICE(0x13AD, 0x9999) }, /* Baltech card reader */
        { USB_DEVICE(0x16D6, 0x0001) }, /* Jablotron serial interface */
        { } /* Terminating Entry */
 };
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 45cdf9bc43b2..6bc1f404e186 100644
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -962,21 +962,6 @@ static int cypress_ioctl (struct usb_serial_port *port, struct file * file, unsi
                        cypress_set_termios(port, &priv->tmp_termios);
                        return (0);
                        break;
-                /* these are called when setting baud rate from gpsd */
-                case TCGETS:
-                        if (copy_to_user((void __user *)arg, port->tty->termios, sizeof(struct termios))) {
-                                return -EFAULT;
-                        }
-                        return (0);
-                        break;
-                case TCSETS:
-                        if (copy_from_user(port->tty->termios, (void __user *)arg, sizeof(struct termios))) {
-                                return -EFAULT;
-                        }
-                        /* here we need to call cypress_set_termios to invoke the new settings */
-                        cypress_set_termios(port, &priv->tmp_termios);
-                        return (0);
-                        break;
                /* This code comes from drivers/char/serial.c and ftdi_sio.c */
                case TIOCMIWAIT:
                        while (priv != NULL) {
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 41b0ad2d56ac..6986e756f7c0 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -452,6 +452,7 @@ static struct usb_device_id id_table_combined [] = {
        { USB_DEVICE(FTDI_VID, LINX_FUTURE_2_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_CCSICDU20_0_PID) },
        { USB_DEVICE(FTDI_VID, FTDI_CCSICDU40_1_PID) },
+        { USB_DEVICE(FTDI_VID, FTDI_CCSMACHX_2_PID) },
        { USB_DEVICE(FTDI_VID, INSIDE_ACCESSO) },
        { USB_DEVICE(INTREPID_VID, INTREPID_VALUECAN_PID) },
        { USB_DEVICE(INTREPID_VID, INTREPID_NEOVI_PID) },
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index bae117d359af..40dd394de58d 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -312,8 +312,9 @@
 /* CCS Inc. ICDU/ICDU40 product ID - the FT232BM is used in an in-circuit-debugger */
 /* unit for PIC16's/PIC18's */
-#define FTDI_CCSICDU20_0_PID    0xF9D0     
+#define FTDI_CCSICDU20_0_PID    0xF9D0
-#define FTDI_CCSICDU40_1_PID    0xF9D1     
+#define FTDI_CCSICDU40_1_PID    0xF9D1
+#define FTDI_CCSMACHX_2_PID     0xF9D2
 /* Inside Accesso contactless reader (http://www.insidefr.com) */
 #define INSIDE_ACCESSO          0xFAD0
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index 77b977206a8c..d3be9214c7c1 100644
--- a/drivers/usb/serial/funsoft.c
+++ b/drivers/usb/serial/funsoft.c
@@ -14,6 +14,9 @@
 #include <linux/module.h>
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
+#include <asm/uaccess.h>
+static int debug;
 static struct usb_device_id id_table [] = {
        { USB_DEVICE(0x1404, 0xcddc) },
@@ -21,6 +24,26 @@ static struct usb_device_id id_table [] = {
 };
 MODULE_DEVICE_TABLE(usb, id_table);
+static int funsoft_ioctl(struct usb_serial_port *port, struct file *file,
+                         unsigned int cmd, unsigned long arg)
+{
+        struct termios t;
+        dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd);
+        if (cmd == TCSETSF) {
+                if (user_termios_to_kernel_termios(&t, (void __user *)arg))
+                        return -EFAULT;
+                dbg("%s - iflag:%x oflag:%x cflag:%x lflag:%x", __FUNCTION__,
+                    t.c_iflag, t.c_oflag, t.c_cflag, t.c_lflag);
+                if (!(t.c_lflag & ICANON))
+                        return -EINVAL;
+        }
+        return -ENOIOCTLCMD;
+}
 static struct usb_driver funsoft_driver = {
        .name =         "funsoft",
        .probe =        usb_serial_probe,
@@ -39,6 +62,7 @@ static struct usb_serial_driver funsoft_device = {
        .num_bulk_in =          NUM_DONT_CARE,
        .num_bulk_out =         NUM_DONT_CARE,
        .num_ports =            1,
+        .ioctl =                funsoft_ioctl,
 };
 static int __init funsoft_init(void)
@@ -63,3 +87,6 @@ static void __exit funsoft_exit(void)
 module_init(funsoft_init);
 module_exit(funsoft_exit);
 MODULE_LICENSE("GPL");
+module_param(debug, bool, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(debug, "Debug enabled or not");
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index 73d755df4840..5c4b06a99ac0 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -87,10 +87,6 @@ static int  klsi_105_write_room          (struct usb_serial_port *port);
 static void klsi_105_read_bulk_callback  (struct urb *urb);
 static void klsi_105_set_termios         (struct usb_serial_port *port,
                                          struct ktermios *old);
-static int  klsi_105_ioctl               (struct usb_serial_port *port,
-                                          struct file * file,
-                                          unsigned int cmd,
-                                          unsigned long arg);
 static void klsi_105_throttle            (struct usb_serial_port *port);
 static void klsi_105_unthrottle          (struct usb_serial_port *port);
 /*
@@ -140,7 +136,6 @@ static struct usb_serial_driver kl5kusb105d_device = {
        .chars_in_buffer =   klsi_105_chars_in_buffer,
        .write_room =        klsi_105_write_room,
        .read_bulk_callback =klsi_105_read_bulk_callback,
-        .ioctl =             klsi_105_ioctl,
        .set_termios =       klsi_105_set_termios,
        /*.break_ctl =       klsi_105_break_ctl,*/
        .tiocmget =          klsi_105_tiocmget,
@@ -899,69 +894,6 @@ static int klsi_105_tiocmset (struct usb_serial_port *port, struct file *file,
 */
        return retval;
 }
-                                        
-static int klsi_105_ioctl (struct usb_serial_port *port, struct file * file,
-                           unsigned int cmd, unsigned long arg)
-{
-        struct klsi_105_private *priv = usb_get_serial_port_data(port);
-        void __user *user_arg = (void __user *)arg;
-        
-        dbg("%scmd=0x%x", __FUNCTION__, cmd);
-        /* Based on code from acm.c and others */
-        switch (cmd) {
-        case TIOCMIWAIT:
-                /* wait for any of the 4 modem inputs (DCD,RI,DSR,CTS)*/
-                /* TODO */
-                dbg("%s - TIOCMIWAIT not handled", __FUNCTION__);
-                return -ENOIOCTLCMD;
-        case TIOCGICOUNT:
-                /* return count of modemline transitions */
-                /* TODO */
-                dbg("%s - TIOCGICOUNT not handled", __FUNCTION__);
-                return -ENOIOCTLCMD;
-        case TCGETS:
-                /* return current info to caller */
-                dbg("%s - TCGETS data faked/incomplete", __FUNCTION__);
-                if (!access_ok(VERIFY_WRITE, user_arg, sizeof(struct termios)))
-                        return -EFAULT;
-                if (kernel_termios_to_user_termios((struct termios __user *)arg,
-                                                   &priv->termios))
-                        return -EFAULT;
-                return 0;
-        case TCSETS:
-                /* set port termios to the one given by the user */
-                dbg("%s - TCSETS not handled", __FUNCTION__);
-                if (!access_ok(VERIFY_READ, user_arg, sizeof(struct termios)))
-                        return -EFAULT;
-                if (user_termios_to_kernel_termios(&priv->termios,
-                                                   (struct termios __user *)arg))
-                        return -EFAULT;
-                klsi_105_set_termios(port, &priv->termios);
-                return 0;
-        case TCSETSW: {
-                /* set port termios and try to wait for completion of last
-                 * write operation */
-                /* We guess here. If there are not too many write urbs
-                 * outstanding, we lie. */
-                /* what is the right way to wait here? schedule() ? */
-                /*
-                while (klsi_105_chars_in_buffer(port) > (NUM_URBS / 4 ) * URB_TRANSFER_BUFFER_SIZE)
-                            schedule();
-                 */
-                return -ENOIOCTLCMD;
-                      }
-        default:
-                dbg("%s: arg not supported - 0x%04x", __FUNCTION__,cmd);
-                return(-ENOIOCTLCMD);
-                break;
-        }
-        return 0;
-} /* klsi_105_ioctl */
 static void klsi_105_throttle (struct usb_serial_port *port)
 {
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index 8cc728a49e41..83f661403ba1 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -2460,12 +2460,6 @@ static int mos7840_ioctl(struct usb_serial_port *port, struct file *file,
                tty_ldisc_deref(ld);
                return 0;
-        case TCGETS:
-                if (kernel_termios_to_user_termios
-                    ((struct termios __user *)argp, tty->termios))
-                        return -EFAULT;
-                return 0;
        case TIOCSERGETLSR:
                dbg("%s (%d) TIOCSERGETLSR", __FUNCTION__, port->number);
                return mos7840_get_lsr_info(mos7840_port, argp);
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 0ae4098718c3..819266b7e2f8 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -79,6 +79,7 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define OPTION_PRODUCT_COBRA            0x6500
 #define OPTION_PRODUCT_COBRA2           0x6600
 #define HUAWEI_PRODUCT_E600             0x1001
+#define HUAWEI_PRODUCT_E220             0x1003
 #define AUDIOVOX_PRODUCT_AIRCARD        0x0112
 #define NOVATELWIRELESS_PRODUCT_U740    0x1400
 #define ANYDATA_PRODUCT_ID              0x6501
@@ -90,6 +91,7 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
+        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
        { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
@@ -103,6 +105,7 @@ static struct usb_device_id option_ids1[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
+        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
        { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
        { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID,NOVATELWIRELESS_PRODUCT_U740) },
        { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ID) },
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index db8b26012c75..5fe7ff441a09 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -153,6 +153,13 @@ UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
+/* Reported by <honkkis@gmail.com> */
+UNUSUAL_DEV(  0x0421, 0x0433, 0x0100, 0x0100,
+                "Nokia",
+                "E70",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_RESIDUE | US_FL_FIX_CAPACITY ),
 /* Reported by Jon Hart <Jon.Hart@web.de> */
 UNUSUAL_DEV(  0x0421, 0x0434, 0x0100, 0x0100,
                "Nokia",
@@ -1328,6 +1335,15 @@ UNUSUAL_DEV(  0x1210, 0x0003, 0x0100, 0x0100,
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_IGNORE_RESIDUE ),
+/* This prevents the kernel from detecting the virtual cd-drive with the
+ * Windows drivers.  <johann.wilhelm@student.tugraz.at>
+*/
+UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0xffff,
+                "HUAWEI",
+                "E220 USB-UMTS Install",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_IGNORE_DEVICE),
 /* Reported by Vilius Bilinkevicius <vilisas AT xxx DOT lt) */
 UNUSUAL_DEV(  0x132b, 0x000b, 0x0001, 0x0001,
                "Minolta",
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 38eb0b69c2d7..b4947c810706 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -1216,7 +1216,7 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
                done:
                        if (res_specified) {
                                dev_info(dev, "overriding resolution: %dx%d\n", xres, yres);
-                                inf->xres = xres; inf->yres = yres;
+                                inf->modes[0].xres = xres; inf->modes[0].yres = yres;
                        }
                        if (bpp_specified)
                                switch (bpp) {
@@ -1225,48 +1225,48 @@ static int __init pxafb_parse_options(struct device *dev, char *options)
                                case 4:
                                case 8:
                                case 16:
-                                        inf->bpp = bpp;
+                                        inf->modes[0].bpp = bpp;
                                        dev_info(dev, "overriding bit depth: %d\n", bpp);
                                        break;
                                default:
                                        dev_err(dev, "Depth %d is not valid\n", bpp);
                                }
                } else if (!strncmp(this_opt, "pixclock:", 9)) {
-                        inf->pixclock = simple_strtoul(this_opt+9, NULL, 0);
+                        inf->modes[0].pixclock = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override pixclock: %ld\n", inf->pixclock);
+                        dev_info(dev, "override pixclock: %ld\n", inf->modes[0].pixclock);
                } else if (!strncmp(this_opt, "left:", 5)) {
-                        inf->left_margin = simple_strtoul(this_opt+5, NULL, 0);
+                        inf->modes[0].left_margin = simple_strtoul(this_opt+5, NULL, 0);
-                        dev_info(dev, "override left: %u\n", inf->left_margin);
+                        dev_info(dev, "override left: %u\n", inf->modes[0].left_margin);
                } else if (!strncmp(this_opt, "right:", 6)) {
-                        inf->right_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        inf->modes[0].right_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override right: %u\n", inf->right_margin);
+                        dev_info(dev, "override right: %u\n", inf->modes[0].right_margin);
                } else if (!strncmp(this_opt, "upper:", 6)) {
-                        inf->upper_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        inf->modes[0].upper_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override upper: %u\n", inf->upper_margin);
+                        dev_info(dev, "override upper: %u\n", inf->modes[0].upper_margin);
                } else if (!strncmp(this_opt, "lower:", 6)) {
-                        inf->lower_margin = simple_strtoul(this_opt+6, NULL, 0);
+                        inf->modes[0].lower_margin = simple_strtoul(this_opt+6, NULL, 0);
-                        dev_info(dev, "override lower: %u\n", inf->lower_margin);
+                        dev_info(dev, "override lower: %u\n", inf->modes[0].lower_margin);
                } else if (!strncmp(this_opt, "hsynclen:", 9)) {
-                        inf->hsync_len = simple_strtoul(this_opt+9, NULL, 0);
+                        inf->modes[0].hsync_len = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override hsynclen: %u\n", inf->hsync_len);
+                        dev_info(dev, "override hsynclen: %u\n", inf->modes[0].hsync_len);
                } else if (!strncmp(this_opt, "vsynclen:", 9)) {
-                        inf->vsync_len = simple_strtoul(this_opt+9, NULL, 0);
+                        inf->modes[0].vsync_len = simple_strtoul(this_opt+9, NULL, 0);
-                        dev_info(dev, "override vsynclen: %u\n", inf->vsync_len);
+                        dev_info(dev, "override vsynclen: %u\n", inf->modes[0].vsync_len);
                } else if (!strncmp(this_opt, "hsync:", 6)) {
                        if (simple_strtoul(this_opt+6, NULL, 0) == 0) {
                                dev_info(dev, "override hsync: Active Low\n");
-                                inf->sync &= ~FB_SYNC_HOR_HIGH_ACT;
+                                inf->modes[0].sync &= ~FB_SYNC_HOR_HIGH_ACT;
                        } else {
                                dev_info(dev, "override hsync: Active High\n");
-                                inf->sync |= FB_SYNC_HOR_HIGH_ACT;
+                                inf->modes[0].sync |= FB_SYNC_HOR_HIGH_ACT;
                        }
                } else if (!strncmp(this_opt, "vsync:", 6)) {
                        if (simple_strtoul(this_opt+6, NULL, 0) == 0) {
                                dev_info(dev, "override vsync: Active Low\n");
-                                inf->sync &= ~FB_SYNC_VERT_HIGH_ACT;
+                                inf->modes[0].sync &= ~FB_SYNC_VERT_HIGH_ACT;
                        } else {
                                dev_info(dev, "override vsync: Active High\n");
-                                inf->sync |= FB_SYNC_VERT_HIGH_ACT;
+                                inf->modes[0].sync |= FB_SYNC_VERT_HIGH_ACT;
                        }
                } else if (!strncmp(this_opt, "dpc:", 4)) {
                        if (simple_strtoul(this_opt+4, NULL, 0) == 0) {
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index cd10b18150b8..5d2a4a4b731c 100644
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1200,9 +1200,9 @@ static void set_ctrlr_state(struct sa1100fb_info *fbi, u_int state)
 * Our LCD controller task (which is called when we blank or unblank)
 * via keventd.
 */
-static void sa1100fb_task(void *dummy)
+static void sa1100fb_task(struct work_struct *w)
 {
-        struct sa1100fb_info *fbi = dummy;
+        struct sa1100fb_info *fbi = container_of(w, struct sa1100fb_info, task);
        u_int state = xchg(&fbi->task_state, -1);
        set_ctrlr_state(fbi, state);
@@ -1444,7 +1444,7 @@ static struct sa1100fb_info * __init sa1100fb_init_fbinfo(struct device *dev)
                                          fbi->max_bpp / 8;
        init_waitqueue_head(&fbi->ctrlr_wait);
-        INIT_WORK(&fbi->task, sa1100fb_task, fbi);
+        INIT_WORK(&fbi->task, sa1100fb_task);
        init_MUTEX(&fbi->ctrlr_sem);
        return fbi;