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

244 files changed, 3393 insertions, 2973 deletions

diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index d25ef961415c..44ad90c03c2e 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -610,7 +610,7 @@ write_led(const char __user * buffer, unsigned long count,
             (led_out) ? (hotk->status | ledmask) : (hotk->status & ~ledmask);
 
         if (invert)             /* invert target value */
-                led_out = !led_out & 0x1;
+                led_out = !led_out;
 
         if (!write_acpi_int(hotk->handle, ledname, led_out, NULL))
                 printk(KERN_WARNING "Asus ACPI: LED (%s) write failed\n",
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index f6215e809808..d5729d5dc190 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -293,13 +293,12 @@ static int extract_package(struct acpi_battery *battery,
                                 strncpy(ptr, (u8 *)&element->integer.value,
                                         sizeof(acpi_integer));
                                 ptr[sizeof(acpi_integer)] = 0;
-                        } else return -EFAULT;
+                        } else
+                                *ptr = 0; /* don't have value */
                 } else {
-                        if (element->type == ACPI_TYPE_INTEGER) {
-                                int *x = (int *)((u8 *)battery +
-                                                offsets[i].offset);
-                                *x = element->integer.value;
-                        } else return -EFAULT;
+                        int *x = (int *)((u8 *)battery + offsets[i].offset);
+                        *x = (element->type == ACPI_TYPE_INTEGER) ?
+                                element->integer.value : -1;
                 }
         }
         return 0;
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 307cef65c247..fa44fb96fc34 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -710,6 +710,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
         if (!count)
                 return -EINVAL;
 
+        begin_undock(dock_station);
         ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
         return ret ? ret: count;
 }
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index e7e197e3a4ff..7222a18a0319 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -129,7 +129,6 @@ static struct acpi_ec {
         struct mutex lock;
         wait_queue_head_t wait;
         struct list_head list;
-        atomic_t irq_count;
         u8 handlers_installed;
 } *boot_ec, *first_ec;
 
@@ -182,8 +181,6 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
 {
         int ret = 0;
 
-        atomic_set(&ec->irq_count, 0);
-
         if (unlikely(event == ACPI_EC_EVENT_OBF_1 &&
                      test_bit(EC_FLAGS_NO_OBF1_GPE, &ec->flags)))
                 force_poll = 1;
@@ -230,7 +227,6 @@ static int acpi_ec_wait(struct acpi_ec *ec, enum ec_event event, int force_poll)
                 while (time_before(jiffies, delay)) {
                         if (acpi_ec_check_status(ec, event))
                                 goto end;
-                        msleep(5);
                 }
         }
         pr_err(PREFIX "acpi_ec_wait timeout,"
@@ -533,13 +529,6 @@ static u32 acpi_ec_gpe_handler(void *data)
         struct acpi_ec *ec = data;
 
         pr_debug(PREFIX "~~~> interrupt\n");
-        atomic_inc(&ec->irq_count);
-        if (atomic_read(&ec->irq_count) > 5) {
-                pr_err(PREFIX "GPE storm detected, disabling EC GPE\n");
-                acpi_disable_gpe(NULL, ec->gpe, ACPI_ISR);
-                clear_bit(EC_FLAGS_GPE_MODE, &ec->flags);
-                return ACPI_INTERRUPT_HANDLED;
-        }
         clear_bit(EC_FLAGS_WAIT_GPE, &ec->flags);
         if (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))
                 wake_up(&ec->wait);
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 7af414a3c63e..89022a74faee 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -131,8 +131,8 @@ struct prt_quirk {
  */
 static struct prt_quirk prt_quirks[] = {
         { medion_md9580, 0, 0, 9, 'A',
-                "\\_SB_.PCI0.ISA.LNKA",
-                "\\_SB_.PCI0.ISA.LNKB"},
+                "\\_SB_.PCI0.ISA_.LNKA",
+                "\\_SB_.PCI0.ISA_.LNKB"},
         { dell_optiplex, 0, 0, 0xd, 'A',
                 "\\_SB_.LNKB",
                 "\\_SB_.LNKA"},
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 6f3b217699e9..788da9781f80 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -216,8 +216,10 @@ static void acpi_safe_halt(void)
          * test NEED_RESCHED:
          */
         smp_mb();
-        if (!need_resched())
+        if (!need_resched()) {
                 safe_halt();
+                local_irq_disable();
+        }
         current_thread_info()->status |= TS_POLLING;
 }
 
@@ -421,7 +423,9 @@ static void acpi_processor_idle(void)
                 else
                         acpi_safe_halt();
 
-                local_irq_enable();
+                if (irqs_disabled())
+                        local_irq_enable();
+
                 return;
         }
 
@@ -530,7 +534,9 @@ static void acpi_processor_idle(void)
                  *       skew otherwise.
                  */
                 sleep_ticks = 0xFFFFFFFF;
-                local_irq_enable();
+                if (irqs_disabled())
+                        local_irq_enable();
+
                 break;
 
         case ACPI_STATE_C2:
@@ -1481,7 +1487,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                 return 0;
         }
 
-        acpi_unlazy_tlb(smp_processor_id());
         /*
          * Must be done before busmaster disable as we might need to
          * access HPET !
@@ -1571,6 +1576,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                 return 0;
         }
 
+        acpi_unlazy_tlb(smp_processor_id());
+
         /* Tell the scheduler that we are going deep-idle: */
         sched_clock_idle_sleep_event();
         /*
@@ -1686,7 +1693,9 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
                 switch (cx->type) {
                         case ACPI_STATE_C1:
                         state->flags |= CPUIDLE_FLAG_SHALLOW;
-                        state->flags |= CPUIDLE_FLAG_TIME_VALID;
+                        if (cx->entry_method == ACPI_CSTATE_FFH)
+                                state->flags |= CPUIDLE_FLAG_TIME_VALID;
+
                         state->enter = acpi_idle_enter_c1;
                         dev->safe_state = state;
                         break;
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index a2cf3008ce6c..bcf2c70fca87 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -130,7 +130,6 @@ static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
                 goto end;
         }
         smb_hc_write(hc, ACPI_SMB_COMMAND, command);
-        smb_hc_write(hc, ACPI_SMB_COMMAND, command);
         if (!(protocol & 0x01)) {
                 smb_hc_write(hc, ACPI_SMB_BLOCK_COUNT, length);
                 for (i = 0; i < length; ++i)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 57570ac47803..e6ce262b5d44 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -39,20 +39,26 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
                            int size)
 {
         int len;
+        int count;
 
-        if (!acpi_dev->flags.hardware_id)
+        if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids)
                 return -ENODEV;
 
-        len = snprintf(modalias, size, "acpi:%s:",
-                       acpi_dev->pnp.hardware_id);
-        if (len < 0 || len >= size)
-                return -EINVAL;
+        len = snprintf(modalias, size, "acpi:");
         size -= len;
 
+        if (acpi_dev->flags.hardware_id) {
+                count = snprintf(&modalias[len], size, "%s:",
+                                 acpi_dev->pnp.hardware_id);
+                if (count < 0 || count >= size)
+                        return -EINVAL;
+                len += count;
+                size -= count;
+        }
+
         if (acpi_dev->flags.compatible_ids) {
                 struct acpi_compatible_id_list *cid_list;
                 int i;
-                int count;
 
                 cid_list = acpi_dev->pnp.cid_list;
                 for (i = 0; i < cid_list->count; i++) {
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index d2f71a54726c..71183eea7906 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -26,21 +26,6 @@ u8 sleep_states[ACPI_S_STATE_COUNT];
 
 #ifdef CONFIG_PM_SLEEP
 static u32 acpi_target_sleep_state = ACPI_STATE_S0;
-static bool acpi_sleep_finish_wake_up;
-
-/*
- * ACPI 2.0 and later want us to execute _PTS after suspending devices, so we
- * allow the user to request that behavior by using the 'acpi_new_pts_ordering'
- * kernel command line option that causes the following variable to be set.
- */
-static bool new_pts_ordering;
-
-static int __init acpi_new_pts_ordering(char *str)
-{
-        new_pts_ordering = true;
-        return 1;
-}
-__setup("acpi_new_pts_ordering", acpi_new_pts_ordering);
 #endif
 
 static int acpi_sleep_prepare(u32 acpi_state)
@@ -91,14 +76,6 @@ static int acpi_pm_begin(suspend_state_t pm_state)
 
         if (sleep_states[acpi_state]) {
                 acpi_target_sleep_state = acpi_state;
-                if (new_pts_ordering)
-                        return 0;
-
-                error = acpi_sleep_prepare(acpi_state);
-                if (error)
-                        acpi_target_sleep_state = ACPI_STATE_S0;
-                else
-                        acpi_sleep_finish_wake_up = true;
         } else {
                 printk(KERN_ERR "ACPI does not support this state: %d\n",
                         pm_state);
@@ -116,14 +93,11 @@ static int acpi_pm_begin(suspend_state_t pm_state)
 
 static int acpi_pm_prepare(void)
 {
-        if (new_pts_ordering) {
-                int error = acpi_sleep_prepare(acpi_target_sleep_state);
+        int error = acpi_sleep_prepare(acpi_target_sleep_state);
 
-                if (error) {
-                        acpi_target_sleep_state = ACPI_STATE_S0;
-                        return error;
-                }
-                acpi_sleep_finish_wake_up = true;
+        if (error) {
+                acpi_target_sleep_state = ACPI_STATE_S0;
+                return error;
         }
 
         return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
@@ -212,7 +186,6 @@ static void acpi_pm_finish(void)
         acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
         acpi_target_sleep_state = ACPI_STATE_S0;
-        acpi_sleep_finish_wake_up = false;
 
 #ifdef CONFIG_X86
         if (init_8259A_after_S1) {
@@ -229,11 +202,10 @@ static void acpi_pm_finish(void)
 static void acpi_pm_end(void)
 {
         /*
-         * This is necessary in case acpi_pm_finish() is not called directly
-         * during a failing transition to a sleep state.
+         * This is necessary in case acpi_pm_finish() is not called during a
+         * failing transition to a sleep state.
          */
-        if (acpi_sleep_finish_wake_up)
-                acpi_pm_finish();
+        acpi_target_sleep_state = ACPI_STATE_S0;
 }
 
 static int acpi_pm_state_valid(suspend_state_t pm_state)
@@ -285,31 +257,18 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
 #ifdef CONFIG_HIBERNATION
 static int acpi_hibernation_begin(void)
 {
-        int error;
-
         acpi_target_sleep_state = ACPI_STATE_S4;
-        if (new_pts_ordering)
-                return 0;
 
-        error = acpi_sleep_prepare(ACPI_STATE_S4);
-        if (error)
-                acpi_target_sleep_state = ACPI_STATE_S0;
-        else
-                acpi_sleep_finish_wake_up = true;
-
-        return error;
+        return 0;
 }
 
 static int acpi_hibernation_prepare(void)
 {
-        if (new_pts_ordering) {
-                int error = acpi_sleep_prepare(ACPI_STATE_S4);
+        int error = acpi_sleep_prepare(ACPI_STATE_S4);
 
-                if (error) {
-                        acpi_target_sleep_state = ACPI_STATE_S0;
-                        return error;
-                }
-                acpi_sleep_finish_wake_up = true;
+        if (error) {
+                acpi_target_sleep_state = ACPI_STATE_S0;
+                return error;
         }
 
         return ACPI_SUCCESS(acpi_hw_disable_all_gpes()) ? 0 : -EFAULT;
@@ -353,17 +312,15 @@ static void acpi_hibernation_finish(void)
         acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
         acpi_target_sleep_state = ACPI_STATE_S0;
-        acpi_sleep_finish_wake_up = false;
 }
 
 static void acpi_hibernation_end(void)
 {
         /*
          * This is necessary in case acpi_hibernation_finish() is not called
-         * directly during a failing transition to the sleep state.
+         * during a failing transition to the sleep state.
          */
-        if (acpi_sleep_finish_wake_up)
-                acpi_hibernation_finish();
+        acpi_target_sleep_state = ACPI_STATE_S0;
 }
 
 static int acpi_hibernation_pre_restore(void)
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 1bc0c74f2755..12fb44f16766 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -807,40 +807,11 @@ static void acpi_video_bus_find_cap(struct acpi_video_bus *video)
 static int acpi_video_bus_check(struct acpi_video_bus *video)
 {
         acpi_status status = -ENOENT;
-        long device_id;
-        struct device *dev;
-        struct acpi_device *device;
+
 
         if (!video)
                 return -EINVAL;
 
-        device = video->device;
-
-        status =
-            acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
-
-        if (!ACPI_SUCCESS(status))
-                return -ENODEV;
-
-        /* We need to attempt to determine whether the _ADR refers to a
-           PCI device or not. There's no terribly good way to do this,
-           so the best we can hope for is to assume that there'll never
-           be a video device in the host bridge */
-        if (device_id >= 0x10000) {
-                /* It looks like a PCI device. Does it exist? */
-                dev = acpi_get_physical_device(device->handle);
-        } else {
-                /* It doesn't look like a PCI device. Does its parent
-                   exist? */
-                acpi_handle phandle;
-                if (acpi_get_parent(device->handle, &phandle))
-                        return -ENODEV;
-                dev = acpi_get_physical_device(phandle);
-        }
-        if (!dev)
-                return -ENODEV;
-        put_device(dev);
-
         /* Since there is no HID, CID and so on for VGA driver, we have
          * to check well known required nodes.
          */
@@ -1366,37 +1337,8 @@ acpi_video_bus_write_DOS(struct file *file,
 
 static int acpi_video_bus_add_fs(struct acpi_device *device)
 {
-        long device_id;
-        int status;
         struct proc_dir_entry *entry = NULL;
         struct acpi_video_bus *video;
-        struct device *dev;
-
-        status =
-            acpi_evaluate_integer(device->handle, "_ADR", NULL, &device_id);
-
-        if (!ACPI_SUCCESS(status))
-                return -ENODEV;
-
-        /* We need to attempt to determine whether the _ADR refers to a
-           PCI device or not. There's no terribly good way to do this,
-           so the best we can hope for is to assume that there'll never
-           be a video device in the host bridge */
-        if (device_id >= 0x10000) {
-                /* It looks like a PCI device. Does it exist? */
-                dev = acpi_get_physical_device(device->handle);
-        } else {
-                /* It doesn't look like a PCI device. Does its parent
-                   exist? */
-                acpi_handle phandle;
-                if (acpi_get_parent(device->handle, &phandle))
-                        return -ENODEV;
-                dev = acpi_get_physical_device(phandle);
-        }
-        if (!dev)
-                return -ENODEV;
-        put_device(dev);
-
 
 
         video = acpi_driver_data(device);
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e469647330de..25aba69b59b4 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -30,6 +30,7 @@ config ATA_NONSTANDARD
 config ATA_ACPI
         bool
         depends on ACPI && PCI
+        select ACPI_DOCK
         default y
         help
           This option adds support for ATA-related ACPI objects.
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 17ee6ed985d9..b1eb4e24c86a 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -433,6 +433,7 @@ static const struct ata_port_info ahci_port_info[] = {
         /* board_ahci_sb600 */
         {
                 AHCI_HFLAGS     (AHCI_HFLAG_IGN_SERR_INTERNAL |
+                                 AHCI_HFLAG_32BIT_ONLY |
                                  AHCI_HFLAG_SECT255 | AHCI_HFLAG_NO_PMP),
                 .flags          = AHCI_FLAG_COMMON,
                 .link_flags     = AHCI_LFLAG_COMMON,
@@ -1217,8 +1218,11 @@ static void ahci_dev_config(struct ata_device *dev)
 {
         struct ahci_host_priv *hpriv = dev->link->ap->host->private_data;
 
-        if (hpriv->flags & AHCI_HFLAG_SECT255)
+        if (hpriv->flags & AHCI_HFLAG_SECT255) {
                 dev->max_sectors = 255;
+                ata_dev_printk(dev, KERN_INFO,
+                               "SB600 AHCI: limiting to 255 sectors per cmd\n");
+        }
 }
 
 static unsigned int ahci_dev_classify(struct ata_port *ap)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 4bbe31f98ef8..48519887f94a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -972,7 +972,7 @@ static void ata_dev_disable_pm(struct ata_device *dev)
 void ata_lpm_schedule(struct ata_port *ap, enum link_pm policy)
 {
         ap->pm_policy = policy;
-        ap->link.eh_info.action |= ATA_EHI_LPM;
+        ap->link.eh_info.action |= ATA_EH_LPM;
         ap->link.eh_info.flags |= ATA_EHI_NO_AUTOPSY;
         ata_port_schedule_eh(ap);
 }
@@ -1416,12 +1416,12 @@ static int ata_hpa_resize(struct ata_device *dev)
         /* read native max address */
         rc = ata_read_native_max_address(dev, &native_sectors);
         if (rc) {
-                /* If HPA isn't going to be unlocked, skip HPA
-                 * resizing from the next try.
+                /* If device aborted the command or HPA isn't going to
+                 * be unlocked, skip HPA resizing.
                  */
-                if (!ata_ignore_hpa) {
+                if (rc == -EACCES || !ata_ignore_hpa) {
                         ata_dev_printk(dev, KERN_WARNING, "HPA support seems "
-                                       "broken, will skip HPA handling\n");
+                                       "broken, skipping HPA handling\n");
                         dev->horkage |= ATA_HORKAGE_BROKEN_HPA;
 
                         /* we can continue if device aborted the command */
@@ -2092,24 +2092,34 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class,
                                      id, sizeof(id[0]) * ATA_ID_WORDS, 0);
         if (err_mask) {
                 if (err_mask & AC_ERR_NODEV_HINT) {
-                        DPRINTK("ata%u.%d: NODEV after polling detection\n",
-                                ap->print_id, dev->devno);
+                        ata_dev_printk(dev, KERN_DEBUG,
+                                       "NODEV after polling detection\n");
                         return -ENOENT;
                 }
 
-                /* Device or controller might have reported the wrong
-                 * device class.  Give a shot at the other IDENTIFY if
-                 * the current one is aborted by the device.
-                 */
-                if (may_fallback &&
-                    (err_mask == AC_ERR_DEV) && (tf.feature & ATA_ABORTED)) {
-                        may_fallback = 0;
+                if ((err_mask == AC_ERR_DEV) && (tf.feature & ATA_ABORTED)) {
+                        /* Device or controller might have reported
+                         * the wrong device class.  Give a shot at the
+                         * other IDENTIFY if the current one is
+                         * aborted by the device.
+                         */
+                        if (may_fallback) {
+                                may_fallback = 0;
 
-                        if (class == ATA_DEV_ATA)
-                                class = ATA_DEV_ATAPI;
-                        else
-                                class = ATA_DEV_ATA;
-                        goto retry;
+                                if (class == ATA_DEV_ATA)
+                                        class = ATA_DEV_ATAPI;
+                                else
+                                        class = ATA_DEV_ATA;
+                                goto retry;
+                        }
+
+                        /* Control reaches here iff the device aborted
+                         * both flavors of IDENTIFYs which happens
+                         * sometimes with phantom devices.
+                         */
+                        ata_dev_printk(dev, KERN_DEBUG,
+                                       "both IDENTIFYs aborted, assuming NODEV\n");
+                        return -ENOENT;
                 }
 
                 rc = -EIO;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 681252fd8143..a5830329eda4 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2748,7 +2748,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
                         ehc->i.flags &= ~ATA_EHI_SETMODE;
                 }
 
-                if (ehc->i.action & ATA_EHI_LPM)
+                if (ehc->i.action & ATA_EH_LPM)
                         ata_link_for_each_dev(dev, link)
                                 ata_dev_enable_pm(dev, ap->pm_policy);
 
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 8f0e8f2bc628..15795394b0a8 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -527,6 +527,14 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
         return qc;
 }
 
+static void ata_qc_set_pc_nbytes(struct ata_queued_cmd *qc)
+{
+        struct scsi_cmnd *scmd = qc->scsicmd;
+
+        qc->extrabytes = scmd->request->extra_len;
+        qc->nbytes = scsi_bufflen(scmd) + qc->extrabytes;
+}
+
 /**
  *      ata_dump_status - user friendly display of error info
  *      @id: id of the port in question
@@ -2539,7 +2547,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
         }
 
         qc->tf.command = ATA_CMD_PACKET;
-        qc->nbytes = scsi_bufflen(scmd) + scmd->request->extra_len;
+        ata_qc_set_pc_nbytes(qc);
 
         /* check whether ATAPI DMA is safe */
         if (!using_pio && ata_check_atapi_dma(qc))
@@ -2550,7 +2558,7 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc)
          * want to set it properly, and for DMA where it is
          * effectively meaningless.
          */
-        nbytes = min(scmd->request->data_len, (unsigned int)63 * 1024);
+        nbytes = min(ata_qc_raw_nbytes(qc), (unsigned int)63 * 1024);
 
         /* Most ATAPI devices which honor transfer chunk size don't
          * behave according to the spec when odd chunk size which
@@ -2876,7 +2884,7 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
          * TODO: find out if we need to do more here to
          *       cover scatter/gather case.
          */
-        qc->nbytes = scsi_bufflen(scmd) + scmd->request->extra_len;
+        ata_qc_set_pc_nbytes(qc);
 
         /* request result TF and be quiet about device error */
         qc->flags |= ATA_QCFLAG_RESULT_TF | ATA_QCFLAG_QUIET;
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 109ddd42c266..257951d03dbb 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -564,7 +564,7 @@ static int it821x_check_atapi_dma(struct ata_queued_cmd *qc)
         struct it821x_dev *itdev = ap->private_data;
 
         /* Only use dma for transfers to/from the media. */
-        if (qc->nbytes < 2048)
+        if (ata_qc_raw_nbytes(qc) < 2048)
                 return -EOPNOTSUPP;
 
         /* No ATAPI DMA in smart mode */
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 503245a1eafa..3988e44f4934 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -269,7 +269,11 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio)
         dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n",
                 tmpbyte & 1, tmpbyte & 0x30);
 
-        *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
+        *try_mmio = 0;
+#ifdef CONFIG_PPC
+        if (machine_is(cell))
+                *try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);
+#endif
 
         switch(tmpbyte & 0x30) {
                 case 0x00:
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index f251a5f569d5..11c1afea2db2 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -46,7 +46,7 @@
 #include "sata_promise.h"
 
 #define DRV_NAME        "sata_promise"
-#define DRV_VERSION     "2.11"
+#define DRV_VERSION     "2.12"
 
 enum {
         PDC_MAX_PORTS           = 4,
@@ -145,7 +145,9 @@ static int pdc_old_sata_check_atapi_dma(struct ata_queued_cmd *qc);
 static void pdc_irq_clear(struct ata_port *ap);
 static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc);
 static void pdc_freeze(struct ata_port *ap);
+static void pdc_sata_freeze(struct ata_port *ap);
 static void pdc_thaw(struct ata_port *ap);
+static void pdc_sata_thaw(struct ata_port *ap);
 static void pdc_pata_error_handler(struct ata_port *ap);
 static void pdc_sata_error_handler(struct ata_port *ap);
 static void pdc_post_internal_cmd(struct ata_queued_cmd *qc);
@@ -180,8 +182,8 @@ static const struct ata_port_operations pdc_sata_ops = {
 
         .qc_prep                = pdc_qc_prep,
         .qc_issue               = pdc_qc_issue_prot,
-        .freeze                 = pdc_freeze,
-        .thaw                   = pdc_thaw,
+        .freeze                 = pdc_sata_freeze,
+        .thaw                   = pdc_sata_thaw,
         .error_handler          = pdc_sata_error_handler,
         .post_internal_cmd      = pdc_post_internal_cmd,
         .cable_detect           = pdc_sata_cable_detect,
@@ -205,8 +207,8 @@ static const struct ata_port_operations pdc_old_sata_ops = {
 
         .qc_prep                = pdc_qc_prep,
         .qc_issue               = pdc_qc_issue_prot,
-        .freeze                 = pdc_freeze,
-        .thaw                   = pdc_thaw,
+        .freeze                 = pdc_sata_freeze,
+        .thaw                   = pdc_sata_thaw,
         .error_handler          = pdc_sata_error_handler,
         .post_internal_cmd      = pdc_post_internal_cmd,
         .cable_detect           = pdc_sata_cable_detect,
@@ -631,6 +633,41 @@ static void pdc_qc_prep(struct ata_queued_cmd *qc)
         }
 }
 
+static int pdc_is_sataii_tx4(unsigned long flags)
+{
+        const unsigned long mask = PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS;
+        return (flags & mask) == mask;
+}
+
+static unsigned int pdc_port_no_to_ata_no(unsigned int port_no,
+                                          int is_sataii_tx4)
+{
+        static const unsigned char sataii_tx4_port_remap[4] = { 3, 1, 0, 2};
+        return is_sataii_tx4 ? sataii_tx4_port_remap[port_no] : port_no;
+}
+
+static unsigned int pdc_sata_nr_ports(const struct ata_port *ap)
+{
+        return (ap->flags & PDC_FLAG_4_PORTS) ? 4 : 2;
+}
+
+static unsigned int pdc_sata_ata_port_to_ata_no(const struct ata_port *ap)
+{
+        const struct ata_host *host = ap->host;
+        unsigned int nr_ports = pdc_sata_nr_ports(ap);
+        unsigned int i;
+
+        for(i = 0; i < nr_ports && host->ports[i] != ap; ++i)
+                ;
+        BUG_ON(i >= nr_ports);
+        return pdc_port_no_to_ata_no(i, pdc_is_sataii_tx4(ap->flags));
+}
+
+static unsigned int pdc_sata_hotplug_offset(const struct ata_port *ap)
+{
+        return (ap->flags & PDC_FLAG_GEN_II) ? PDC2_SATA_PLUG_CSR : PDC_SATA_PLUG_CSR;
+}
+
 static void pdc_freeze(struct ata_port *ap)
 {
         void __iomem *mmio = ap->ioaddr.cmd_addr;
@@ -643,6 +680,29 @@ static void pdc_freeze(struct ata_port *ap)
         readl(mmio + PDC_CTLSTAT); /* flush */
 }
 
+static void pdc_sata_freeze(struct ata_port *ap)
+{
+        struct ata_host *host = ap->host;
+        void __iomem *host_mmio = host->iomap[PDC_MMIO_BAR];
+        unsigned int hotplug_offset = pdc_sata_hotplug_offset(ap);
+        unsigned int ata_no = pdc_sata_ata_port_to_ata_no(ap);
+        u32 hotplug_status;
+
+        /* Disable hotplug events on this port.
+         *
+         * Locking:
+         * 1) hotplug register accesses must be serialised via host->lock
+         * 2) ap->lock == &ap->host->lock
+         * 3) ->freeze() and ->thaw() are called with ap->lock held
+         */
+        hotplug_status = readl(host_mmio + hotplug_offset);
+        hotplug_status |= 0x11 << (ata_no + 16);
+        writel(hotplug_status, host_mmio + hotplug_offset);
+        readl(host_mmio + hotplug_offset); /* flush */
+
+        pdc_freeze(ap);
+}
+
 static void pdc_thaw(struct ata_port *ap)
 {
         void __iomem *mmio = ap->ioaddr.cmd_addr;
@@ -658,6 +718,26 @@ static void pdc_thaw(struct ata_port *ap)
         readl(mmio + PDC_CTLSTAT); /* flush */
 }
 
+static void pdc_sata_thaw(struct ata_port *ap)
+{
+        struct ata_host *host = ap->host;
+        void __iomem *host_mmio = host->iomap[PDC_MMIO_BAR];
+        unsigned int hotplug_offset = pdc_sata_hotplug_offset(ap);
+        unsigned int ata_no = pdc_sata_ata_port_to_ata_no(ap);
+        u32 hotplug_status;
+
+        pdc_thaw(ap);
+
+        /* Enable hotplug events on this port.
+         * Locking: see pdc_sata_freeze().
+         */
+        hotplug_status = readl(host_mmio + hotplug_offset);
+        hotplug_status |= 0x11 << ata_no;
+        hotplug_status &= ~(0x11 << (ata_no + 16));
+        writel(hotplug_status, host_mmio + hotplug_offset);
+        readl(host_mmio + hotplug_offset); /* flush */
+}
+
 static void pdc_common_error_handler(struct ata_port *ap, ata_reset_fn_t hardreset)
 {
         if (!(ap->pflags & ATA_PFLAG_FROZEN))
@@ -765,19 +845,6 @@ static void pdc_irq_clear(struct ata_port *ap)
         readl(mmio + PDC_INT_SEQMASK);
 }
 
-static int pdc_is_sataii_tx4(unsigned long flags)
-{
-        const unsigned long mask = PDC_FLAG_GEN_II | PDC_FLAG_4_PORTS;
-        return (flags & mask) == mask;
-}
-
-static unsigned int pdc_port_no_to_ata_no(unsigned int port_no,
-                                          int is_sataii_tx4)
-{
-        static const unsigned char sataii_tx4_port_remap[4] = { 3, 1, 0, 2};
-        return is_sataii_tx4 ? sataii_tx4_port_remap[port_no] : port_no;
-}
-
 static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
 {
         struct ata_host *host = dev_instance;
@@ -799,6 +866,8 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
 
         mmio_base = host->iomap[PDC_MMIO_BAR];
 
+        spin_lock(&host->lock);
+
         /* read and clear hotplug flags for all ports */
         if (host->ports[0]->flags & PDC_FLAG_GEN_II)
                 hotplug_offset = PDC2_SATA_PLUG_CSR;
@@ -814,11 +883,9 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
 
         if (mask == 0xffffffff && hotplug_status == 0) {
                 VPRINTK("QUICK EXIT 2\n");
-                return IRQ_NONE;
+                goto done_irq;
         }
 
-        spin_lock(&host->lock);
-
         mask &= 0xffff;         /* only 16 tags possible */
         if (mask == 0 && hotplug_status == 0) {
                 VPRINTK("QUICK EXIT 3\n");
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 7de543d1d0b4..24198ad01976 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -19,6 +19,7 @@
 #include <linux/kdev_t.h>
 #include <linux/notifier.h>
 #include <linux/genhd.h>
+#include <linux/kallsyms.h>
 #include <asm/semaphore.h>
 
 #include "base.h"
@@ -68,6 +69,10 @@ static ssize_t dev_attr_show(struct kobject *kobj, struct attribute *attr,
 
         if (dev_attr->show)
                 ret = dev_attr->show(dev, dev_attr, buf);
+        if (ret >= (ssize_t)PAGE_SIZE) {
+                print_symbol("dev_attr_show: %s returned bad count\n",
+                                (unsigned long)dev_attr->show);
+        }
         return ret;
 }
 
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index bf31a0170a48..9a6537f14401 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -133,6 +133,7 @@ int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
 {
         va_list args;
         char *name;
+        int ret;
 
         va_start(args, fmt);
         name = kvasprintf(GFP_KERNEL, fmt, args);
@@ -141,7 +142,9 @@ int driver_add_kobj(struct device_driver *drv, struct kobject *kobj,
         if (!name)
                 return -ENOMEM;
 
-        return kobject_add(kobj, &drv->p->kobj, "%s", name);
+        ret = kobject_add(kobj, &drv->p->kobj, "%s", name);
+        kfree(name);
+        return ret;
 }
 EXPORT_SYMBOL_GPL(driver_add_kobj);
 
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index b6d230b3209f..0d1d2133d9bc 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -44,16 +44,6 @@ config MAC_FLOPPY
           If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
           floppy controller, say Y here. Most commonly found in PowerMacs.
 
-config BLK_DEV_PS2
-        tristate "PS/2 ESDI hard disk support"
-        depends on MCA && MCA_LEGACY && BROKEN
-        help
-          Say Y here if you have a PS/2 machine with a MCA bus and an ESDI
-          hard disk.
-
-          To compile this driver as a module, choose M here: the
-          module will be called ps2esdi.
-
 config AMIGA_Z2RAM
         tristate "Amiga Zorro II ramdisk support"
         depends on ZORRO
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 01c972415cb2..5e584306be99 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o
 obj-$(CONFIG_AMIGA_Z2RAM)       += z2ram.o
 obj-$(CONFIG_BLK_DEV_RAM)       += brd.o
 obj-$(CONFIG_BLK_DEV_LOOP)      += loop.o
-obj-$(CONFIG_BLK_DEV_PS2)       += ps2esdi.o
 obj-$(CONFIG_BLK_DEV_XD)        += xd.o
 obj-$(CONFIG_BLK_CPQ_DA)        += cpqarray.o
 obj-$(CONFIG_BLK_CPQ_CISS_DA)  += cciss.o
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b53fdb0a282c..60cc54368b66 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -153,6 +153,12 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
         struct kvec iov;
         sigset_t blocked, oldset;
 
+        if (unlikely(!sock)) {
+                printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
+                       lo->disk->disk_name, (send ? "send" : "recv"));
+                return -EINVAL;
+        }
+
         /* Allow interception of SIGKILL only
          * Don't allow other signals to interrupt the transmission */
         siginitsetinv(&blocked, sigmask(SIGKILL));
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
deleted file mode 100644
index 3c796e236253..000000000000
--- a/drivers/block/ps2esdi.c
+++ /dev/null
@@ -1,1079 +0,0 @@
-/* ps2esdi driver based on assembler code by Arindam Banerji,
-   written by Peter De Schrijver */
-/* Reassuring note to IBM : This driver was NOT developed by vice-versa
-   engineering the PS/2's BIOS */
-/* Dedicated to Wannes, Tofke, Ykke, Godot, Killroy and all those 
-   other lovely fish out there... */
-/* This code was written during the long and boring WINA 
-   elections 1994 */
-/* Thanks to Arindam Banerij for giving me the source of his driver */
-/* This code may be freely distributed and modified in any way, 
-   as long as these notes remain intact */
-
-/*  Revised: 05/07/94 by Arindam Banerji (axb@cse.nd.edu) */
-/*  Revised: 09/08/94 by Peter De Schrijver (stud11@cc4.kuleuven.ac.be)
-   Thanks to Arindam Banerij for sending me the docs of the adapter */
-
-/* BA Modified for ThinkPad 720 by Boris Ashkinazi */
-/*                    (bash@vnet.ibm.com) 08/08/95 */
-
-/* Modified further for ThinkPad-720C by Uri Blumenthal */
-/*                    (uri@watson.ibm.com) Sep 11, 1995 */
-
-/* TODO : 
-   + Timeouts
-   + Get disk parameters
-   + DMA above 16MB
-   + reset after read/write error
- */
-
-#define DEVICE_NAME "PS/2 ESDI"
-
-#include <linux/major.h>
-#include <linux/errno.h>
-#include <linux/wait.h>
-#include <linux/interrupt.h>
-#include <linux/fs.h>
-#include <linux/kernel.h>
-#include <linux/genhd.h>
-#include <linux/ps2esdi.h>
-#include <linux/blkdev.h>
-#include <linux/mca-legacy.h>
-#include <linux/init.h>
-#include <linux/ioport.h>
-#include <linux/module.h>
-#include <linux/hdreg.h>
-
-#include <asm/system.h>
-#include <asm/io.h>
-#include <asm/dma.h>
-#include <asm/mca_dma.h>
-#include <asm/uaccess.h>
-
-#define PS2ESDI_IRQ 14
-#define MAX_HD 2
-#define MAX_RETRIES 5
-#define MAX_16BIT 65536
-#define ESDI_TIMEOUT   0xf000
-#define ESDI_STAT_TIMEOUT 4
-
-#define TYPE_0_CMD_BLK_LENGTH 2
-#define TYPE_1_CMD_BLK_LENGTH 4
-
-static void reset_ctrl(void);
-
-static int ps2esdi_geninit(void);
-
-static void do_ps2esdi_request(struct request_queue * q);
-
-static void ps2esdi_readwrite(int cmd, struct request *req);
-
-static void ps2esdi_fill_cmd_block(u_short * cmd_blk, u_short cmd,
-u_short cyl, u_short head, u_short sector, u_short length, u_char drive);
-
-static int ps2esdi_out_cmd_blk(u_short * cmd_blk);
-
-static void ps2esdi_prep_dma(char *buffer, u_short length, u_char dma_xmode);
-
-static irqreturn_t ps2esdi_interrupt_handler(int irq, void *dev_id);
-static void (*current_int_handler) (u_int) = NULL;
-static void ps2esdi_normal_interrupt_handler(u_int);
-static void ps2esdi_initial_reset_int_handler(u_int);
-static void ps2esdi_geometry_int_handler(u_int);
-static int ps2esdi_getgeo(struct block_device *bdev, struct hd_geometry *geo);
-
-static int ps2esdi_read_status_words(int num_words, int max_words, u_short * buffer);
-
-static void dump_cmd_complete_status(u_int int_ret_code);
-
-static void ps2esdi_get_device_cfg(void);
-
-static void ps2esdi_reset_timer(unsigned long unused);
-
-static u_int dma_arb_level;             /* DMA arbitration level */
-
-static DECLARE_WAIT_QUEUE_HEAD(ps2esdi_int);
-
-static int no_int_yet;
-static int ps2esdi_drives;
-static u_short io_base;
-static DEFINE_TIMER(esdi_timer, ps2esdi_reset_timer, 0, 0);
-static int reset_status;
-static int ps2esdi_slot = -1;
-static int tp720esdi = 0;       /* Is it Integrated ESDI of ThinkPad-720? */
-static int intg_esdi = 0;       /* If integrated adapter */
-struct ps2esdi_i_struct {
-        unsigned int head, sect, cyl, wpcom, lzone, ctl;
-};
-static DEFINE_SPINLOCK(ps2esdi_lock);
-static struct request_queue *ps2esdi_queue;
-static struct request *current_req;
-
-#if 0
-#if 0                           /* try both - I don't know which one is better... UB */
-static struct ps2esdi_i_struct ps2esdi_info[MAX_HD] =
-{
-        {4, 48, 1553, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0}};
-#else
-static struct ps2esdi_i_struct ps2esdi_info[MAX_HD] =
-{
-        {64, 32, 161, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0}};
-#endif
-#endif
-static struct ps2esdi_i_struct ps2esdi_info[MAX_HD] =
-{
-        {0, 0, 0, 0, 0, 0},
-        {0, 0, 0, 0, 0, 0}};
-
-static struct block_device_operations ps2esdi_fops =
-{
-        .owner          = THIS_MODULE,
-        .getgeo         = ps2esdi_getgeo,
-};
-
-static struct gendisk *ps2esdi_gendisk[2];
-
-/* initialization routine called by ll_rw_blk.c   */
-static int __init ps2esdi_init(void)
-{
-
-        int error = 0;
-
-        /* register the device - pass the name and major number */
-        if (register_blkdev(PS2ESDI_MAJOR, "ed"))
-                return -EBUSY;
-
-        /* set up some global information - indicating device specific info */
-        ps2esdi_queue = blk_init_queue(do_ps2esdi_request, &ps2esdi_lock);
-        if (!ps2esdi_queue) {
-                unregister_blkdev(PS2ESDI_MAJOR, "ed");
-                return -ENOMEM;
-        }
-
-        /* some minor housekeeping - setup the global gendisk structure */
-        error = ps2esdi_geninit();
-        if (error) {
-                printk(KERN_WARNING "PS2ESDI: error initialising"
-                        " device, releasing resources\n");
-                unregister_blkdev(PS2ESDI_MAJOR, "ed");
-                blk_cleanup_queue(ps2esdi_queue);
-                return error;
-        }
-        return 0;
-}                               /* ps2esdi_init */
-
-#ifndef MODULE
-
-module_init(ps2esdi_init);
-
-#else
-
-static int cyl[MAX_HD] = {-1,-1};
-static int head[MAX_HD] = {-1, -1};
-static int sect[MAX_HD] = {-1, -1};
-
-module_param(tp720esdi, bool, 0);
-module_param_array(cyl, int, NULL, 0);
-module_param_array(head, int, NULL, 0);
-module_param_array(sect, int, NULL, 0);
-MODULE_LICENSE("GPL");
-
-int init_module(void) {
-        int drive;
-
-        for(drive = 0; drive < MAX_HD; drive++) {
-                struct ps2esdi_i_struct *info = &ps2esdi_info[drive];
-
-                if (cyl[drive] != -1) {
-                        info->cyl = info->lzone = cyl[drive];
-                        info->wpcom = 0;
-                }
-                if (head[drive] != -1) {
-                        info->head = head[drive];
-                        info->ctl = (head[drive] > 8 ? 8 : 0);
-                }
-                if (sect[drive] != -1) info->sect = sect[drive];
-        }
-        return ps2esdi_init();
-}
-
-void
-cleanup_module(void) {
-        int i;
-        if(ps2esdi_slot) {
-                mca_mark_as_unused(ps2esdi_slot);
-                mca_set_adapter_procfn(ps2esdi_slot, NULL, NULL);
-        }
-        release_region(io_base, 4);
-        free_dma(dma_arb_level);
-        free_irq(PS2ESDI_IRQ, &ps2esdi_gendisk);
-        unregister_blkdev(PS2ESDI_MAJOR, "ed");
-        blk_cleanup_queue(ps2esdi_queue);
-        for (i = 0; i < ps2esdi_drives; i++) {
-                del_gendisk(ps2esdi_gendisk[i]);
-                put_disk(ps2esdi_gendisk[i]);
-        }
-}
-#endif /* MODULE */
-
-/* handles boot time command line parameters */
-void __init tp720_setup(char *str, int *ints)
-{
-        /* no params, just sets the tp720esdi flag if it exists */
-
-        printk("%s: TP 720 ESDI flag set\n", DEVICE_NAME);
-        tp720esdi = 1;
-}
-
-void __init ed_setup(char *str, int *ints)
-{
-        int hdind = 0;
-
-        /* handles 3 parameters only - corresponding to
-           1. Number of cylinders
-           2. Number of heads
-           3. Sectors/track
-         */
-
-        if (ints[0] != 3)
-                return;
-
-        /* print out the information - seen at boot time */
-        printk("%s: ints[0]=%d ints[1]=%d ints[2]=%d ints[3]=%d\n",
-               DEVICE_NAME, ints[0], ints[1], ints[2], ints[3]);
-
-        /* set the index into device specific information table */
-        if (ps2esdi_info[0].head != 0)
-                hdind = 1;
-
-        /* set up all the device information */
-        ps2esdi_info[hdind].head = ints[2];
-        ps2esdi_info[hdind].sect = ints[3];
-        ps2esdi_info[hdind].cyl = ints[1];
-        ps2esdi_info[hdind].wpcom = 0;
-        ps2esdi_info[hdind].lzone = ints[1];
-        ps2esdi_info[hdind].ctl = (ints[2] > 8 ? 8 : 0);
-#if 0                           /* this may be needed for PS2/Mod.80, but it hurts ThinkPad! */
-        ps2esdi_drives = hdind + 1;     /* increment index for the next time */
-#endif
-}                               /* ed_setup */
-
-static int ps2esdi_getinfo(char *buf, int slot, void *d)
-{
-        int len = 0;
-
-        len += sprintf(buf + len, "DMA Arbitration Level: %d\n",
-                       dma_arb_level);
-        len += sprintf(buf + len, "IO Port: %x\n", io_base);
-        len += sprintf(buf + len, "IRQ: 14\n");
-        len += sprintf(buf + len, "Drives: %d\n", ps2esdi_drives);
-
-        return len;
-}
-
-/* ps2 esdi specific initialization - called thru the gendisk chain */
-static int __init ps2esdi_geninit(void)
-{
-        /*
-           The first part contains the initialization code
-           for the ESDI disk subsystem.  All we really do
-           is search for the POS registers of the controller
-           to do some simple setup operations.  First, we
-           must ensure that the controller is installed,
-           enabled, and configured as PRIMARY.  Then we must
-           determine the DMA arbitration level being used by
-           the controller so we can handle data transfer
-           operations properly.  If all of this works, then
-           we will set the INIT_FLAG to a non-zero value.
-         */
-
-        int slot = 0, i, reset_start, reset_end;
-        u_char status;
-        unsigned short adapterID;
-        int error = 0;
-
-        if ((slot = mca_find_adapter(INTG_ESDI_ID, 0)) != MCA_NOTFOUND) {
-                adapterID = INTG_ESDI_ID;
-                printk("%s: integrated ESDI adapter found in slot %d\n",
-                       DEVICE_NAME, slot+1);
-#ifndef MODULE
-                mca_set_adapter_name(slot, "PS/2 Integrated ESDI");
-#endif
-        } else if ((slot = mca_find_adapter(NRML_ESDI_ID, 0)) != -1) {
-                adapterID = NRML_ESDI_ID;
-                printk("%s: normal ESDI adapter found in slot %d\n",
-                       DEVICE_NAME, slot+1);
-                mca_set_adapter_name(slot, "PS/2 ESDI");
-        } else {
-                return -ENODEV;
-        }
-
-        ps2esdi_slot = slot;
-        mca_mark_as_used(slot);
-        mca_set_adapter_procfn(slot, (MCA_ProcFn) ps2esdi_getinfo, NULL);
-
-        /* Found the slot - read the POS register 2 to get the necessary
-           configuration and status information.  POS register 2 has the
-           following information :
-           Bit           Function
-           7             reserved = 0
-           6             arbitration method
-           0 - fairness enabled
-           1 - fairness disabled, linear priority assignment
-           5-2           arbitration level
-           1             alternate address
-           1              alternate address
-           0 - use addresses 0x3510 - 0x3517
-           0             adapter enable
-         */
-
-        status = mca_read_stored_pos(slot, 2);
-        /* is it enabled ? */
-        if (!(status & STATUS_ENABLED)) {
-                printk("%s: ESDI adapter disabled\n", DEVICE_NAME);
-                error = -ENODEV;
-                goto err_out1;
-        }
-        /* try to grab IRQ, and try to grab a slow IRQ if it fails, so we can
-           share with the SCSI driver */
-        if (request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
-                  IRQF_DISABLED | IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
-            && request_irq(PS2ESDI_IRQ, ps2esdi_interrupt_handler,
-                           IRQF_SHARED, "PS/2 ESDI", &ps2esdi_gendisk)
-            ) {
-                printk("%s: Unable to get IRQ %d\n", DEVICE_NAME, PS2ESDI_IRQ);
-                error = -EBUSY;
-                goto err_out1;
-        }
-        if (status & STATUS_ALTERNATE)
-                io_base = ALT_IO_BASE;
-        else
-                io_base = PRIMARY_IO_BASE;
-
-        if (!request_region(io_base, 4, "ed")) {
-                printk(KERN_WARNING"Unable to request region 0x%x\n", io_base);
-                error = -EBUSY;
-                goto err_out2;
-        }
-        /* get the dma arbitration level */
-        dma_arb_level = (status >> 2) & 0xf;
-
-        /* BA */
-        printk("%s: DMA arbitration level : %d\n",
-               DEVICE_NAME, dma_arb_level);
-
-        LITE_ON;
-        current_int_handler = ps2esdi_initial_reset_int_handler;
-        reset_ctrl();
-        reset_status = 0;
-        reset_start = jiffies;
-        while (!reset_status) {
-                init_timer(&esdi_timer);
-                esdi_timer.expires = jiffies + HZ;
-                esdi_timer.data = 0;
-                add_timer(&esdi_timer);
-                sleep_on(&ps2esdi_int);
-        }
-        reset_end = jiffies;
-        LITE_OFF;
-        printk("%s: reset interrupt after %d jiffies,  %u.%02u secs\n",
-               DEVICE_NAME, reset_end - reset_start, (reset_end - reset_start) / HZ,
-               (reset_end - reset_start) % HZ);
-
-
-        /* Integrated ESDI Disk and Controller has only one drive! */
-        if (adapterID == INTG_ESDI_ID) {/* if not "normal" PS2 ESDI adapter */
-                ps2esdi_drives = 1;     /* then we have only one physical disk! */              intg_esdi = 1;
-        }
-
-
-
-        /* finally this part sets up some global data structures etc. */
-
-        ps2esdi_get_device_cfg();
-
-        /* some annoyance in the above routine returns TWO drives?
-         Is something else happining in the background?
-         Regaurdless we fix the # of drives again. AJK */
-        /* Integrated ESDI Disk and Controller has only one drive! */
-        if (adapterID == INTG_ESDI_ID)  /* if not "normal" PS2 ESDI adapter */
-                ps2esdi_drives = 1;     /* Not three or two, ONE DAMNIT! */
-
-        current_int_handler = ps2esdi_normal_interrupt_handler;
-
-        if (request_dma(dma_arb_level, "ed") !=0) {
-                printk(KERN_WARNING "PS2ESDI: Can't request dma-channel %d\n"
-                        ,(int) dma_arb_level);
-                error = -EBUSY;
-                goto err_out3;
-        }
-        blk_queue_max_sectors(ps2esdi_queue, 128);
-
-        error = -ENOMEM;
-        for (i = 0; i < ps2esdi_drives; i++) {
-                struct gendisk *disk = alloc_disk(64);
-                if (!disk)
-                        goto err_out4;
-                disk->major = PS2ESDI_MAJOR;
-                disk->first_minor = i<<6;
-                sprintf(disk->disk_name, "ed%c", 'a'+i);
-                disk->fops = &ps2esdi_fops;
-                ps2esdi_gendisk[i] = disk;
-        }
-
-        for (i = 0; i < ps2esdi_drives; i++) {
-                struct gendisk *disk = ps2esdi_gendisk[i];
-                set_capacity(disk, ps2esdi_info[i].head * ps2esdi_info[i].sect *
-                                ps2esdi_info[i].cyl);
-                disk->queue = ps2esdi_queue;
-                disk->private_data = &ps2esdi_info[i];
-                add_disk(disk);
-        }
-        return 0;
-err_out4:
-        while (i--)
-                put_disk(ps2esdi_gendisk[i]);
-err_out3:
-        release_region(io_base, 4);
-err_out2:
-        free_irq(PS2ESDI_IRQ, &ps2esdi_gendisk);
-err_out1:
-        if(ps2esdi_slot) {
-                mca_mark_as_unused(ps2esdi_slot);
-                mca_set_adapter_procfn(ps2esdi_slot, NULL, NULL);
-        }
-        return error;
-}
-
-static void __init ps2esdi_get_device_cfg(void)
-{
-        u_short cmd_blk[TYPE_0_CMD_BLK_LENGTH];
-
-        /*BA */ printk("%s: Drive 0\n", DEVICE_NAME);
-        current_int_handler = ps2esdi_geometry_int_handler;
-        cmd_blk[0] = CMD_GET_DEV_CONFIG | 0x600;
-        cmd_blk[1] = 0;
-        no_int_yet = TRUE;
-        ps2esdi_out_cmd_blk(cmd_blk);
-        if (no_int_yet)
-                sleep_on(&ps2esdi_int);
-
-        if (ps2esdi_drives > 1) {
-                printk("%s: Drive 1\n", DEVICE_NAME);   /*BA */
-                cmd_blk[0] = CMD_GET_DEV_CONFIG | (1 << 5) | 0x600;
-                cmd_blk[1] = 0;
-                no_int_yet = TRUE;
-                ps2esdi_out_cmd_blk(cmd_blk);
-                if (no_int_yet)
-                        sleep_on(&ps2esdi_int);
-        }                       /* if second physical drive is present */
-        return;
-}
-
-/* strategy routine that handles most of the IO requests */
-static void do_ps2esdi_request(struct request_queue * q)
-{
-        struct request *req;
-        /* since, this routine is called with interrupts cleared - they 
-           must be before it finishes  */
-
-        req = elv_next_request(q);
-        if (!req)
-                return;
-
-#if 0
-        printk("%s:got request. device : %s command : %d  sector : %ld count : %ld, buffer: %p\n",
-               DEVICE_NAME,
-               req->rq_disk->disk_name,
-               req->cmd, req->sector,
-               req->current_nr_sectors, req->buffer);
-#endif
-
-        /* check for above 16Mb dmas */
-        if (isa_virt_to_bus(req->buffer + req->current_nr_sectors * 512) > 16 * MB) {
-                printk("%s: DMA above 16MB not supported\n", DEVICE_NAME);
-                end_request(req, FAIL);
-                return;
-        }
-
-        if (req->sector+req->current_nr_sectors > get_capacity(req->rq_disk)) {
-                printk("Grrr. error. ps2esdi_drives: %d, %llu %llu\n",
-                    ps2esdi_drives, req->sector,
-                    (unsigned long long)get_capacity(req->rq_disk));
-                end_request(req, FAIL);
-                return;
-        }
-
-        switch (rq_data_dir(req)) {
-        case READ:
-                ps2esdi_readwrite(READ, req);
-                break;
-        case WRITE:
-                ps2esdi_readwrite(WRITE, req);
-                break;
-        default:
-                printk("%s: Unknown command\n", req->rq_disk->disk_name);
-                end_request(req, FAIL);
-                break;
-        }               /* handle different commands */
-}                               /* main strategy routine */
-
-/* resets the ESDI adapter */
-static void reset_ctrl(void)
-{
-
-        u_long expire;
-        u_short status;
-
-        /* enable interrupts on the controller */
-        status = inb(ESDI_INTRPT);
-        outb((status & 0xe0) | ATT_EOI, ESDI_ATTN);     /* to be sure we don't have
-                                                           any interrupt pending... */
-        outb_p(CTRL_ENABLE_INTR, ESDI_CONTROL);
-
-        /* read the ESDI status port - if the controller is not busy,
-           simply do a soft reset (fast) - otherwise we'll have to do a
-           hard (slow) reset.  */
-        if (!(inb_p(ESDI_STATUS) & STATUS_BUSY)) {
-                /*BA */ printk("%s: soft reset...\n", DEVICE_NAME);
-                outb_p(CTRL_SOFT_RESET, ESDI_ATTN);
-        }
-        /* soft reset */ 
-        else {
-                /*BA */
-                printk("%s: hard reset...\n", DEVICE_NAME);
-                outb_p(CTRL_HARD_RESET, ESDI_CONTROL);
-                expire = jiffies + 2*HZ;
-                while (time_before(jiffies, expire));
-                outb_p(1, ESDI_CONTROL);
-        }                       /* hard reset */
-
-
-}                               /* reset the controller */
-
-/* called by the strategy routine to handle read and write requests */
-static void ps2esdi_readwrite(int cmd, struct request *req)
-{
-        struct ps2esdi_i_struct *p = req->rq_disk->private_data;
-        unsigned block = req->sector;
-        unsigned count = req->current_nr_sectors;
-        int drive = p - ps2esdi_info;
-        u_short track, head, cylinder, sector;
-        u_short cmd_blk[TYPE_1_CMD_BLK_LENGTH];
-
-        /* do some relevant arithmatic */
-        track = block / p->sect;
-        head = track % p->head;
-        cylinder = track / p->head;
-        sector = block % p->sect;
-
-#if 0
-        printk("%s: cyl=%d head=%d sect=%d\n", DEVICE_NAME, cylinder, head, sector);
-#endif
-        /* call the routine that actually fills out a command block */
-        ps2esdi_fill_cmd_block
-            (cmd_blk,
-             (cmd == READ) ? CMD_READ : CMD_WRITE,
-             cylinder, head, sector, count, drive);
-
-        /* send the command block to the controller */
-        current_req = req;
-        spin_unlock_irq(&ps2esdi_lock);
-        if (ps2esdi_out_cmd_blk(cmd_blk)) {
-                spin_lock_irq(&ps2esdi_lock);
-                printk("%s: Controller failed\n", DEVICE_NAME);
-                if ((++req->errors) >= MAX_RETRIES)
-                        end_request(req, FAIL);
-        }
-        /* check for failure to put out the command block */ 
-        else {
-                spin_lock_irq(&ps2esdi_lock);
-#if 0
-                printk("%s: waiting for xfer\n", DEVICE_NAME);
-#endif
-                /* turn disk lights on */
-                LITE_ON;
-        }
-
-}                               /* ps2esdi_readwrite */
-
-/* fill out the command block */
-static void ps2esdi_fill_cmd_block(u_short * cmd_blk, u_short cmd,
- u_short cyl, u_short head, u_short sector, u_short length, u_char drive)
-{
-
-        cmd_blk[0] = (drive << 5) | cmd;
-        cmd_blk[1] = length;
-        cmd_blk[2] = ((cyl & 0x1f) << 11) | (head << 5) | sector;
-        cmd_blk[3] = (cyl & 0x3E0) >> 5;
-
-}                               /* fill out the command block */
-
-/* write a command block to the controller */
-static int ps2esdi_out_cmd_blk(u_short * cmd_blk)
-{
-
-        int i;
-        unsigned long jif;
-        u_char status;
-
-        /* enable interrupts */
-        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-
-        /* do not write to the controller, if it is busy */
-        for (jif = jiffies + ESDI_STAT_TIMEOUT;
-                time_after(jif, jiffies) &&
-                        (inb(ESDI_STATUS) & STATUS_BUSY); )
-                ;
-
-#if 0
-        printk("%s: i(1)=%ld\n", DEVICE_NAME, jif);
-#endif
-
-        /* if device is still busy - then just time out */
-        if (inb(ESDI_STATUS) & STATUS_BUSY) {
-                printk("%s: ps2esdi_out_cmd timed out (1)\n", DEVICE_NAME);
-                return ERROR;
-        }                       /* timeout ??? */
-        /* Set up the attention register in the controller */
-        outb(((*cmd_blk) & 0xE0) | 1, ESDI_ATTN);
-
-#if 0
-        printk("%s: sending %d words to controller\n", DEVICE_NAME, (((*cmd_blk) >> 14) + 1) << 1);
-#endif
-
-        /* one by one send each word out */
-        for (i = (((*cmd_blk) >> 14) + 1) << 1; i; i--) {
-                status = inb(ESDI_STATUS);
-                for (jif = jiffies + ESDI_STAT_TIMEOUT;
-                     time_after(jif, jiffies) && (status & STATUS_BUSY) &&
-                   (status & STATUS_CMD_INF); status = inb(ESDI_STATUS));
-                if ((status & (STATUS_BUSY | STATUS_CMD_INF)) == STATUS_BUSY) {
-#if 0
-                        printk("%s: sending %04X\n", DEVICE_NAME, *cmd_blk);
-#endif
-                        outw(*cmd_blk++, ESDI_CMD_INT);
-                } else {
-                        printk("%s: ps2esdi_out_cmd timed out while sending command (status=%02X)\n",
-                               DEVICE_NAME, status);
-                        return ERROR;
-                }
-        }                       /* send all words out */
-        return OK;
-}                               /* send out the commands */
-
-
-/* prepare for dma - do all the necessary setup */
-static void ps2esdi_prep_dma(char *buffer, u_short length, u_char dma_xmode)
-{
-        unsigned long flags = claim_dma_lock();
-
-        mca_disable_dma(dma_arb_level);
-
-        mca_set_dma_addr(dma_arb_level, isa_virt_to_bus(buffer));
-
-        mca_set_dma_count(dma_arb_level, length * 512 / 2);
-
-        mca_set_dma_mode(dma_arb_level, dma_xmode);
-
-        mca_enable_dma(dma_arb_level);
-
-        release_dma_lock(flags);
-
-}                               /* prepare for dma */
-
-
-
-static irqreturn_t ps2esdi_interrupt_handler(int irq, void *dev_id)
-{
-        u_int int_ret_code;
-
-        if (inb(ESDI_STATUS) & STATUS_INTR) {
-                int_ret_code = inb(ESDI_INTRPT);
-                if (current_int_handler) {
-                        /* Disable adapter interrupts till processing is finished */
-                        outb(CTRL_DISABLE_INTR, ESDI_CONTROL);
-                        current_int_handler(int_ret_code);
-                } else
-                        printk("%s: help ! No interrupt handler.\n", DEVICE_NAME);
-        } else {
-                return IRQ_NONE;
-        }
-        return IRQ_HANDLED;
-}
-
-static void ps2esdi_initial_reset_int_handler(u_int int_ret_code)
-{
-
-        switch (int_ret_code & 0xf) {
-        case INT_RESET:
-                /*BA */
-                printk("%s: initial reset completed.\n", DEVICE_NAME);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                wake_up(&ps2esdi_int);
-                break;
-        case INT_ATTN_ERROR:
-                printk("%s: Attention error. interrupt status : %02X\n", DEVICE_NAME,
-                       int_ret_code);
-                printk("%s: status: %02x\n", DEVICE_NAME, inb(ESDI_STATUS));
-                break;
-        default:
-                printk("%s: initial reset handler received interrupt: %02X\n",
-                       DEVICE_NAME, int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                break;
-        }
-        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-}
-
-
-static void ps2esdi_geometry_int_handler(u_int int_ret_code)
-{
-        u_int status, drive_num;
-        unsigned long rba;
-        int i;
-
-        drive_num = int_ret_code >> 5;
-        switch (int_ret_code & 0xf) {
-        case INT_CMD_COMPLETE:
-                for (i = ESDI_TIMEOUT; i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--);
-                if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) {
-                        printk("%s: timeout reading status word\n", DEVICE_NAME);
-                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                        break;
-                }
-                status = inw(ESDI_STT_INT);
-                if ((status & 0x1F) == CMD_GET_DEV_CONFIG) {
-#define REPLY_WORDS 5           /* we already read word 0 */
-                        u_short reply[REPLY_WORDS];
-
-                        if (ps2esdi_read_status_words((status >> 8) - 1, REPLY_WORDS, reply)) {
-                                /*BA */
-                                printk("%s: Device Configuration Status for drive %u\n",
-                                       DEVICE_NAME, drive_num);
-
-                                printk("%s: Spares/cyls: %u", DEVICE_NAME, reply[0] >> 8);
-
-                                printk
-                                    ("Config bits: %s%s%s%s%s\n",
-                                     (reply[0] & CONFIG_IS) ? "Invalid Secondary, " : "",
-                                     ((reply[0] & CONFIG_ZD) && !(reply[0] & CONFIG_IS))
-                                 ? "Zero Defect, " : "Defects Present, ",
-                                     (reply[0] & CONFIG_SF) ? "Skewed Format, " : "",
-                                     (reply[0] & CONFIG_FR) ? "Removable, " : "Non-Removable, ",
-                                     (reply[0] & CONFIG_RT) ? "No Retries" : "Retries");
-
-                                rba = reply[1] | ((unsigned long) reply[2] << 16);
-                                printk("%s: Number of RBA's: %lu\n", DEVICE_NAME, rba);
-
-                                printk("%s: Physical number of cylinders: %u, Sectors/Track: %u, Heads: %u\n",
-                                       DEVICE_NAME, reply[3], reply[4] >> 8, reply[4] & 0xff);
-
-                                if (!ps2esdi_info[drive_num].head) {
-                                        ps2esdi_info[drive_num].head = 64;
-                                        ps2esdi_info[drive_num].sect = 32;
-                                        ps2esdi_info[drive_num].cyl = rba / (64 * 32);
-                                        ps2esdi_info[drive_num].wpcom = 0;
-                                        ps2esdi_info[drive_num].lzone = ps2esdi_info[drive_num].cyl;
-                                        ps2esdi_info[drive_num].ctl = 8;
-                                        if (tp720esdi) {        /* store the retrieved parameters */
-                                                ps2esdi_info[0].head = reply[4] & 0Xff;
-                                                ps2esdi_info[0].sect = reply[4] >> 8;
-                                                ps2esdi_info[0].cyl = reply[3];
-                                                ps2esdi_info[0].wpcom = 0;
-                                                ps2esdi_info[0].lzone = reply[3];
-                                        } else {
-                                                if (!intg_esdi)
-                                                        ps2esdi_drives++;
-                                        }
-                                }
-#ifdef OBSOLETE
-                                if (!ps2esdi_info[drive_num].head) {
-                                        ps2esdi_info[drive_num].head = reply[4] & 0Xff;
-                                        ps2esdi_info[drive_num].sect = reply[4] >> 8;
-                                        ps2esdi_info[drive_num].cyl = reply[3];
-                                        ps2esdi_info[drive_num].wpcom = 0;
-                                        ps2esdi_info[drive_num].lzone = reply[3];
-                                        if (tp720esdi) {        /* store the retrieved parameters */
-                                                ps2esdi_info[0].head = reply[4] & 0Xff;
-                                                ps2esdi_info[0].sect = reply[4] >> 8;
-                                                ps2esdi_info[0].cyl = reply[3];
-                                                ps2esdi_info[0].wpcom = 0;
-                                                ps2esdi_info[0].lzone = reply[3];
-                                        } else {
-                                                ps2esdi_drives++;
-                                        }
-                                }
-#endif
-
-                        } else
-                                printk("%s: failed while getting device config\n", DEVICE_NAME);
-#undef REPLY_WORDS
-                } else
-                        printk("%s: command %02X unknown by geometry handler\n",
-                               DEVICE_NAME, status & 0x1f);
-
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                break;
-
-        case INT_ATTN_ERROR:
-                printk("%s: Attention error. interrupt status : %02X\n", DEVICE_NAME,
-                       int_ret_code);
-                printk("%s: Device not available\n", DEVICE_NAME);
-                break;
-        case INT_CMD_ECC:
-        case INT_CMD_RETRY:
-        case INT_CMD_ECC_RETRY:
-        case INT_CMD_WARNING:
-        case INT_CMD_ABORT:
-        case INT_CMD_FAILED:
-        case INT_DMA_ERR:
-        case INT_CMD_BLK_ERR:
-                /*BA */ printk("%s: Whaa. Error occurred...\n", DEVICE_NAME);
-                dump_cmd_complete_status(int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                break;
-        default:
-                printk("%s: Unknown interrupt reason: %02X\n",
-                       DEVICE_NAME, int_ret_code & 0xf);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                break;
-        }
-
-        wake_up(&ps2esdi_int);
-        no_int_yet = FALSE;
-        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-
-}
-
-static void ps2esdi_normal_interrupt_handler(u_int int_ret_code)
-{
-        unsigned long flags;
-        u_int status;
-        u_int ending;
-        int i;
-
-        switch (int_ret_code & 0x0f) {
-        case INT_TRANSFER_REQ:
-                ps2esdi_prep_dma(current_req->buffer,
-                                 current_req->current_nr_sectors,
-                    (rq_data_dir(current_req) == READ)
-                    ? MCA_DMA_MODE_16 | MCA_DMA_MODE_WRITE | MCA_DMA_MODE_XFER
-                    : MCA_DMA_MODE_16 | MCA_DMA_MODE_READ);
-                outb(CTRL_ENABLE_DMA | CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = -1;
-                break;
-
-        case INT_ATTN_ERROR:
-                printk("%s: Attention error. interrupt status : %02X\n", DEVICE_NAME,
-                       int_ret_code);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = FAIL;
-                break;
-
-        case INT_CMD_COMPLETE:
-                for (i = ESDI_TIMEOUT; i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--);
-                if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) {
-                        printk("%s: timeout reading status word\n", DEVICE_NAME);
-                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                        if ((++current_req->errors) >= MAX_RETRIES)
-                                ending = FAIL;
-                        else
-                                ending = -1;
-                        break;
-                }
-                status = inw(ESDI_STT_INT);
-                switch (status & 0x1F) {
-                case (CMD_READ & 0xff):
-                case (CMD_WRITE & 0xff):
-                        LITE_OFF;
-                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                        ending = SUCCES;
-                        break;
-                default:
-                        printk("%s: interrupt for unknown command %02X\n",
-                               DEVICE_NAME, status & 0x1f);
-                        outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                        outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                        ending = -1;
-                        break;
-                }
-                break;
-        case INT_CMD_ECC:
-        case INT_CMD_RETRY:
-        case INT_CMD_ECC_RETRY:
-                LITE_OFF;
-                dump_cmd_complete_status(int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = SUCCES;
-                break;
-        case INT_CMD_WARNING:
-        case INT_CMD_ABORT:
-        case INT_CMD_FAILED:
-        case INT_DMA_ERR:
-                LITE_OFF;
-                dump_cmd_complete_status(int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                if ((++current_req->errors) >= MAX_RETRIES)
-                        ending = FAIL;
-                else
-                        ending = -1;
-                break;
-
-        case INT_CMD_BLK_ERR:
-                dump_cmd_complete_status(int_ret_code);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = FAIL;
-                break;
-
-        case INT_CMD_FORMAT:
-                printk("%s: huh ? Who issued this format command ?\n"
-                       ,DEVICE_NAME);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = -1;
-                break;
-
-        case INT_RESET:
-                /* BA printk("%s: reset completed.\n", DEVICE_NAME) */ ;
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = -1;
-                break;
-
-        default:
-                printk("%s: Unknown interrupt reason: %02X\n",
-                       DEVICE_NAME, int_ret_code & 0xf);
-                outb((int_ret_code & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                ending = -1;
-                break;
-        }
-        if(ending != -1) {
-                spin_lock_irqsave(&ps2esdi_lock, flags);
-                end_request(current_req, ending);
-                current_req = NULL;
-                do_ps2esdi_request(ps2esdi_queue);
-                spin_unlock_irqrestore(&ps2esdi_lock, flags);
-        }
-}                               /* handle interrupts */
-
-
-
-static int ps2esdi_read_status_words(int num_words,
-                                     int max_words,
-                                     u_short * buffer)
-{
-        int i;
-
-        for (; max_words && num_words; max_words--, num_words--, buffer++) {
-                for (i = ESDI_TIMEOUT; i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL); i--);
-                if (!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) {
-                        printk("%s: timeout reading status word\n", DEVICE_NAME);
-                        return FAIL;
-                }
-                *buffer = inw(ESDI_STT_INT);
-        }
-        return SUCCES;
-}
-
-
-
-
-static void dump_cmd_complete_status(u_int int_ret_code)
-{
-#define WAIT_FOR_STATUS \
-  for(i=ESDI_TIMEOUT;i && !(inb(ESDI_STATUS) & STATUS_STAT_AVAIL);i--); \
-    if(!(inb(ESDI_STATUS) & STATUS_STAT_AVAIL)) { \
-    printk("%s: timeout reading status word\n",DEVICE_NAME); \
-    return; \
-    }
-
-        int i, word_count;
-        u_short stat_word;
-        u_long rba;
-
-        printk("%s: Device: %u, interrupt ID: %02X\n",
-               DEVICE_NAME, int_ret_code >> 5,
-               int_ret_code & 0xf);
-
-        WAIT_FOR_STATUS;
-        stat_word = inw(ESDI_STT_INT);
-        word_count = (stat_word >> 8) - 1;
-        printk("%s: %u status words, command: %02X\n", DEVICE_NAME, word_count,
-               stat_word & 0xff);
-
-        if (word_count--) {
-                WAIT_FOR_STATUS;
-                stat_word = inw(ESDI_STT_INT);
-                printk("%s: command status code: %02X, command error code: %02X\n",
-                       DEVICE_NAME, stat_word >> 8, stat_word & 0xff);
-        }
-        if (word_count--) {
-                WAIT_FOR_STATUS;
-                stat_word = inw(ESDI_STT_INT);
-                printk("%s: device error code: %s%s%s%s%s,%02X\n", DEVICE_NAME,
-                       (stat_word & 0x1000) ? "Ready, " : "Not Ready, ",
-                  (stat_word & 0x0800) ? "Selected, " : "Not Selected, ",
-                       (stat_word & 0x0400) ? "Write Fault, " : "",
-                       (stat_word & 0x0200) ? "Track 0, " : "",
-                (stat_word & 0x0100) ? "Seek or command complete, " : "",
-                       stat_word >> 8);
-        }
-        if (word_count--) {
-                WAIT_FOR_STATUS;
-                stat_word = inw(ESDI_STT_INT);
-                printk("%s: Blocks to do: %u", DEVICE_NAME, stat_word);
-        }
-        if (word_count -= 2) {
-                WAIT_FOR_STATUS;
-                rba = inw(ESDI_STT_INT);
-                WAIT_FOR_STATUS;
-                rba |= inw(ESDI_STT_INT) << 16;
-                printk(", Last Cyl: %u Head: %u Sector: %u\n",
-                       (u_short) ((rba & 0x1ff80000) >> 11),
-                 (u_short) ((rba & 0x7E0) >> 5), (u_short) (rba & 0x1f));
-        } else
-                printk("\n");
-
-        if (word_count--) {
-                WAIT_FOR_STATUS;
-                stat_word = inw(ESDI_STT_INT);
-                printk("%s: Blocks required ECC: %u", DEVICE_NAME, stat_word);
-        }
-        printk("\n");
-
-#undef WAIT_FOR_STATUS
-
-}
-
-static int ps2esdi_getgeo(struct block_device *bdev, struct hd_geometry *geo)
-{
-        struct ps2esdi_i_struct *p = bdev->bd_disk->private_data;
-
-        geo->heads = p->head;
-        geo->sectors = p->sect;
-        geo->cylinders = p->cyl;
-        return 0;
-}
-
-static void ps2esdi_reset_timer(unsigned long unused)
-{
-
-        int status;
-
-        status = inb(ESDI_INTRPT);
-        if ((status & 0xf) == INT_RESET) {
-                outb((status & 0xe0) | ATT_EOI, ESDI_ATTN);
-                outb(CTRL_ENABLE_INTR, ESDI_CONTROL);
-                reset_status = 1;
-        }
-        wake_up(&ps2esdi_int);
-}
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index d352dbb4ccf7..141f4dfa0a11 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -35,42 +35,23 @@
 
 # define ATI_PCIGART_PAGE_SIZE          4096    /**< PCI GART page size */
 
-static void *drm_ati_alloc_pcigart_table(int order)
+static int drm_ati_alloc_pcigart_table(struct drm_device *dev,
+                                       struct drm_ati_pcigart_info *gart_info)
 {
-        unsigned long address;
-        struct page *page;
-        int i;
-
-        DRM_DEBUG("%d order\n", order);
-
-        address = __get_free_pages(GFP_KERNEL | __GFP_COMP,
-                                   order);
-        if (address == 0UL) {
-                return NULL;
-        }
-
-        page = virt_to_page(address);
-
-        for (i = 0; i < order; i++, page++)
-                SetPageReserved(page);
+        gart_info->table_handle = drm_pci_alloc(dev, gart_info->table_size,
+                                                PAGE_SIZE,
+                                                gart_info->table_mask);
+        if (gart_info->table_handle == NULL)
+                return -ENOMEM;
 
-        DRM_DEBUG("returning 0x%08lx\n", address);
-        return (void *)address;
+        return 0;
 }
 
-static void drm_ati_free_pcigart_table(void *address, int order)
+static void drm_ati_free_pcigart_table(struct drm_device *dev,
+                                       struct drm_ati_pcigart_info *gart_info)
 {
-        struct page *page;
-        int i;
-        int num_pages = 1 << order;
-        DRM_DEBUG("\n");
-
-        page = virt_to_page((unsigned long)address);
-
-        for (i = 0; i < num_pages; i++, page++)
-                ClearPageReserved(page);
-
-        free_pages((unsigned long)address, order);
+        drm_pci_free(dev, gart_info->table_handle);
+        gart_info->table_handle = NULL;
 }
 
 int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info *gart_info)
@@ -78,8 +59,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
         struct drm_sg_mem *entry = dev->sg;
         unsigned long pages;
         int i;
-        int order;
-        int num_pages, max_pages;
+        int max_pages;
 
         /* we need to support large memory configurations */
         if (!entry) {
@@ -87,15 +67,7 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
                 return 0;
         }
 
-        order = drm_order((gart_info->table_size + (PAGE_SIZE-1)) / PAGE_SIZE);
-        num_pages = 1 << order;
-
         if (gart_info->bus_addr) {
-                if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
-                        pci_unmap_single(dev->pdev, gart_info->bus_addr,
-                                         num_pages * PAGE_SIZE,
-                                         PCI_DMA_TODEVICE);
-                }
 
                 max_pages = (gart_info->table_size / sizeof(u32));
                 pages = (entry->pages <= max_pages)
@@ -112,10 +84,9 @@ int drm_ati_pcigart_cleanup(struct drm_device *dev, struct drm_ati_pcigart_info
                         gart_info->bus_addr = 0;
         }
 
-        if (gart_info->gart_table_location == DRM_ATI_GART_MAIN
-            && gart_info->addr) {
-                drm_ati_free_pcigart_table(gart_info->addr, order);
-                gart_info->addr = NULL;
+        if (gart_info->gart_table_location == DRM_ATI_GART_MAIN &&
+            gart_info->table_handle) {
+                drm_ati_free_pcigart_table(dev, gart_info);
         }
 
         return 1;
@@ -127,11 +98,10 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
         struct drm_sg_mem *entry = dev->sg;
         void *address = NULL;
         unsigned long pages;
-        u32 *pci_gart, page_base, bus_address = 0;
+        u32 *pci_gart, page_base;
+        dma_addr_t bus_address = 0;
         int i, j, ret = 0;
-        int order;
         int max_pages;
-        int num_pages;
 
         if (!entry) {
                 DRM_ERROR("no scatter/gather memory!\n");
@@ -141,36 +111,20 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
         if (gart_info->gart_table_location == DRM_ATI_GART_MAIN) {
                 DRM_DEBUG("PCI: no table in VRAM: using normal RAM\n");
 
-                order = drm_order((gart_info->table_size +
-                                   (PAGE_SIZE-1)) / PAGE_SIZE);
-                num_pages = 1 << order;
-                address = drm_ati_alloc_pcigart_table(order);
-                if (!address) {
+                ret = drm_ati_alloc_pcigart_table(dev, gart_info);
+                if (ret) {
                         DRM_ERROR("cannot allocate PCI GART page!\n");
                         goto done;
                 }
 
-                if (!dev->pdev) {
-                        DRM_ERROR("PCI device unknown!\n");
-                        goto done;
-                }
-
-                bus_address = pci_map_single(dev->pdev, address,
-                                             num_pages * PAGE_SIZE,
-                                             PCI_DMA_TODEVICE);
-                if (bus_address == 0) {
-                        DRM_ERROR("unable to map PCIGART pages!\n");
-                        order = drm_order((gart_info->table_size +
-                                           (PAGE_SIZE-1)) / PAGE_SIZE);
-                        drm_ati_free_pcigart_table(address, order);
-                        address = NULL;
-                        goto done;
-                }
+                address = gart_info->table_handle->vaddr;
+                bus_address = gart_info->table_handle->busaddr;
         } else {
                 address = gart_info->addr;
                 bus_address = gart_info->bus_addr;
-                DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n",
-                          bus_address, (unsigned long)address);
+                DRM_DEBUG("PCI: Gart Table: VRAM %08LX mapped at %08lX\n",
+                          (unsigned long long)bus_address,
+                          (unsigned long)address);
         }
 
         pci_gart = (u32 *) address;
@@ -214,6 +168,12 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
                 }
         }
 
+        if (gart_info->gart_table_location == DRM_ATI_GART_MAIN)
+                dma_sync_single_for_device(&dev->pdev->dev,
+                                           bus_address,
+                                           max_pages * sizeof(u32),
+                                           PCI_DMA_TODEVICE);
+
         ret = 1;
 
 #if defined(__i386__) || defined(__x86_64__)
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h
index a6789f25009b..8ea9dd1717a9 100644
--- a/drivers/char/drm/drmP.h
+++ b/drivers/char/drm/drmP.h
@@ -54,6 +54,7 @@
 #include <linux/pci.h>
 #include <linux/jiffies.h>
 #include <linux/smp_lock.h>     /* For (un)lock_kernel */
+#include <linux/dma-mapping.h>
 #include <linux/mm.h>
 #include <linux/cdev.h>
 #include <linux/mutex.h>
@@ -551,6 +552,8 @@ struct drm_ati_pcigart_info {
         int gart_reg_if;
         void *addr;
         dma_addr_t bus_addr;
+        dma_addr_t table_mask;
+        struct drm_dma_handle *table_handle;
         drm_local_map_t mapping;
         int table_size;
 };
diff --git a/drivers/char/drm/drm_fops.c b/drivers/char/drm/drm_fops.c
index 3992f73299cc..f09d4b5002b0 100644
--- a/drivers/char/drm/drm_fops.c
+++ b/drivers/char/drm/drm_fops.c
@@ -326,6 +326,7 @@ int drm_release(struct inode *inode, struct file *filp)
         struct drm_file *file_priv = filp->private_data;
         struct drm_device *dev = file_priv->head->dev;
         int retcode = 0;
+        unsigned long irqflags;
 
         lock_kernel();
 
@@ -357,9 +358,11 @@ int drm_release(struct inode *inode, struct file *filp)
                          */
 
                         do{
-                                spin_lock(&dev->lock.spinlock);
+                                spin_lock_irqsave(&dev->lock.spinlock,
+                                                  irqflags);
                                 locked = dev->lock.idle_has_lock;
-                                spin_unlock(&dev->lock.spinlock);
+                                spin_unlock_irqrestore(&dev->lock.spinlock,
+                                                       irqflags);
                                 if (locked)
                                         break;
                                 schedule();
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index bea2a7d5b2b2..12dcdd1832f0 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -53,6 +53,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
         DECLARE_WAITQUEUE(entry, current);
         struct drm_lock *lock = data;
         int ret = 0;
+        unsigned long irqflags;
 
         ++file_priv->lock_count;
 
@@ -71,9 +72,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                         return -EINVAL;
 
         add_wait_queue(&dev->lock.lock_queue, &entry);
-        spin_lock(&dev->lock.spinlock);
+        spin_lock_irqsave(&dev->lock.spinlock, irqflags);
         dev->lock.user_waiters++;
-        spin_unlock(&dev->lock.spinlock);
+        spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
         for (;;) {
                 __set_current_state(TASK_INTERRUPTIBLE);
                 if (!dev->lock.hw_lock) {
@@ -95,9 +96,9 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
                         break;
                 }
         }
-        spin_lock(&dev->lock.spinlock);
+        spin_lock_irqsave(&dev->lock.spinlock, irqflags);
         dev->lock.user_waiters--;
-        spin_unlock(&dev->lock.spinlock);
+        spin_unlock_irqrestore(&dev->lock.spinlock, irqflags);
         __set_current_state(TASK_RUNNING);
         remove_wait_queue(&dev->lock.lock_queue, &entry);
 
@@ -198,8 +199,9 @@ int drm_lock_take(struct drm_lock_data *lock_data,
 {
         unsigned int old, new, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         do {
                 old = *lock;
                 if (old & _DRM_LOCK_HELD)
@@ -211,7 +213,7 @@ int drm_lock_take(struct drm_lock_data *lock_data,
                 }
                 prev = cmpxchg(lock, old, new);
         } while (prev != old);
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 
         if (_DRM_LOCKING_CONTEXT(old) == context) {
                 if (old & _DRM_LOCK_HELD) {
@@ -272,15 +274,16 @@ int drm_lock_free(struct drm_lock_data *lock_data, unsigned int context)
 {
         unsigned int old, new, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         if (lock_data->kernel_waiters != 0) {
                 drm_lock_transfer(lock_data, 0);
                 lock_data->idle_has_lock = 1;
-                spin_unlock(&lock_data->spinlock);
+                spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
                 return 1;
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 
         do {
                 old = *lock;
@@ -344,19 +347,20 @@ static int drm_notifier(void *priv)
 void drm_idlelock_take(struct drm_lock_data *lock_data)
 {
         int ret = 0;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         lock_data->kernel_waiters++;
         if (!lock_data->idle_has_lock) {
 
-                spin_unlock(&lock_data->spinlock);
+                spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
                 ret = drm_lock_take(lock_data, DRM_KERNEL_CONTEXT);
-                spin_lock(&lock_data->spinlock);
+                spin_lock_irqsave(&lock_data->spinlock, irqflags);
 
                 if (ret == 1)
                         lock_data->idle_has_lock = 1;
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 }
 EXPORT_SYMBOL(drm_idlelock_take);
 
@@ -364,8 +368,9 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
 {
         unsigned int old, prev;
         volatile unsigned int *lock = &lock_data->hw_lock->lock;
+        unsigned long irqflags;
 
-        spin_lock(&lock_data->spinlock);
+        spin_lock_irqsave(&lock_data->spinlock, irqflags);
         if (--lock_data->kernel_waiters == 0) {
                 if (lock_data->idle_has_lock) {
                         do {
@@ -376,7 +381,7 @@ void drm_idlelock_release(struct drm_lock_data *lock_data)
                         lock_data->idle_has_lock = 0;
                 }
         }
-        spin_unlock(&lock_data->spinlock);
+        spin_unlock_irqrestore(&lock_data->spinlock, irqflags);
 }
 EXPORT_SYMBOL(drm_idlelock_release);
 
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h
index 715b361f0c2b..a6a499f97e22 100644
--- a/drivers/char/drm/drm_pciids.h
+++ b/drivers/char/drm/drm_pciids.h
@@ -205,9 +205,9 @@
         {0x1002, 0x71D6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x71DA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x71DE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7210, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
-        {0x1002, 0x7211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV530|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x7200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x7210, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
+        {0x1002, 0x7211, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RV515|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7240, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7243, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7244, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_R580|RADEON_NEW_MEMMAP}, \
@@ -238,6 +238,7 @@
         {0x1002, 0x7834, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x7835, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS300|RADEON_IS_IGP|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP}, \
         {0x1002, 0x791e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
+        {0x1002, 0x791f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS690|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \
         {0, 0, 0}
 
 #define r128_PCI_IDS \
diff --git a/drivers/char/drm/drm_scatter.c b/drivers/char/drm/drm_scatter.c
index 26d8f675ed5d..b2b0f3d41714 100644
--- a/drivers/char/drm/drm_scatter.c
+++ b/drivers/char/drm/drm_scatter.c
@@ -36,6 +36,15 @@
 
 #define DEBUG_SCATTER 0
 
+static inline void *drm_vmalloc_dma(unsigned long size)
+{
+#if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE)
+        return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL | _PAGE_NO_CACHE);
+#else
+        return vmalloc_32(size);
+#endif
+}
+
 void drm_sg_cleanup(struct drm_sg_mem * entry)
 {
         struct page *page;
@@ -104,7 +113,7 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request)
         }
         memset((void *)entry->busaddr, 0, pages * sizeof(*entry->busaddr));
 
-        entry->virtual = vmalloc_32(pages << PAGE_SHIFT);
+        entry->virtual = drm_vmalloc_dma(pages << PAGE_SHIFT);
         if (!entry->virtual) {
                 drm_free(entry->busaddr,
                          entry->pages * sizeof(*entry->busaddr), DRM_MEM_PAGES);
diff --git a/drivers/char/drm/drm_vm.c b/drivers/char/drm/drm_vm.c
index 3d65c4dcd0c6..945df72a51a9 100644
--- a/drivers/char/drm/drm_vm.c
+++ b/drivers/char/drm/drm_vm.c
@@ -54,13 +54,24 @@ static pgprot_t drm_io_prot(uint32_t map_type, struct vm_area_struct *vma)
         pgprot_val(tmp) |= _PAGE_NO_CACHE;
         if (map_type == _DRM_REGISTERS)
                 pgprot_val(tmp) |= _PAGE_GUARDED;
-#endif
-#if defined(__ia64__)
+#elif defined(__ia64__)
         if (efi_range_is_wc(vma->vm_start, vma->vm_end -
                                     vma->vm_start))
                 tmp = pgprot_writecombine(tmp);
         else
                 tmp = pgprot_noncached(tmp);
+#elif defined(__sparc__)
+        tmp = pgprot_noncached(tmp);
+#endif
+        return tmp;
+}
+
+static pgprot_t drm_dma_prot(uint32_t map_type, struct vm_area_struct *vma)
+{
+        pgprot_t tmp = vm_get_page_prot(vma->vm_flags);
+
+#if defined(__powerpc__) && defined(CONFIG_NOT_COHERENT_CACHE)
+        tmp |= _PAGE_NO_CACHE;
 #endif
         return tmp;
 }
@@ -603,9 +614,6 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                 offset = dev->driver->get_reg_ofs(dev);
                 vma->vm_flags |= VM_IO; /* not in core dump */
                 vma->vm_page_prot = drm_io_prot(map->type, vma);
-#ifdef __sparc__
-                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-#endif
                 if (io_remap_pfn_range(vma, vma->vm_start,
                                        (map->offset + offset) >> PAGE_SHIFT,
                                        vma->vm_end - vma->vm_start,
@@ -624,6 +632,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                     page_to_pfn(virt_to_page(map->handle)),
                     vma->vm_end - vma->vm_start, vma->vm_page_prot))
                         return -EAGAIN;
+                vma->vm_page_prot = drm_dma_prot(map->type, vma);
         /* fall through to _DRM_SHM */
         case _DRM_SHM:
                 vma->vm_ops = &drm_vm_shm_ops;
@@ -631,6 +640,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma)
                 /* Don't let this area swap.  Change when
                    DRM_KERNEL advisory is supported. */
                 vma->vm_flags |= VM_RESERVED;
+                vma->vm_page_prot = drm_dma_prot(map->type, vma);
                 break;
         case _DRM_SCATTER_GATHER:
                 vma->vm_ops = &drm_vm_sg_ops;
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index e9d6663bec73..a043bb12301a 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -804,6 +804,9 @@ void i915_driver_lastclose(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
 
+        if (!dev_priv)
+                return;
+
         if (dev_priv->agp_heap)
                 i915_mem_takedown(&(dev_priv->agp_heap));
 
diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index 892e0a589846..f36adbd3aaf5 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -558,6 +558,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 #if __OS_HAS_AGP
         if (dev_priv->is_pci) {
 #endif
+                dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
                 dev_priv->gart_info.gart_table_location = DRM_ATI_GART_MAIN;
                 dev_priv->gart_info.table_size = R128_PCIGART_TABLE_SIZE;
                 dev_priv->gart_info.addr = NULL;
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index 0f4afc44245c..f535812e4057 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -729,6 +729,47 @@ static void r300_discard_buffer(struct drm_device * dev, struct drm_buf * buf)
         buf->used = 0;
 }
 
+static void r300_cmd_wait(drm_radeon_private_t * dev_priv,
+                          drm_r300_cmd_header_t header)
+{
+        u32 wait_until;
+        RING_LOCALS;
+
+        if (!header.wait.flags)
+                return;
+
+        wait_until = 0;
+
+        switch(header.wait.flags) {
+        case R300_WAIT_2D:
+                wait_until = RADEON_WAIT_2D_IDLE;
+                break;
+        case R300_WAIT_3D:
+                wait_until = RADEON_WAIT_3D_IDLE;
+                break;
+        case R300_NEW_WAIT_2D_3D:
+                wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_3D_IDLE;
+                break;
+        case R300_NEW_WAIT_2D_2D_CLEAN:
+                wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_2D_IDLECLEAN;
+                break;
+        case R300_NEW_WAIT_3D_3D_CLEAN:
+                wait_until = RADEON_WAIT_3D_IDLE|RADEON_WAIT_3D_IDLECLEAN;
+                break;
+        case R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN:
+                wait_until = RADEON_WAIT_2D_IDLE|RADEON_WAIT_2D_IDLECLEAN;
+                wait_until |= RADEON_WAIT_3D_IDLE|RADEON_WAIT_3D_IDLECLEAN;
+                break;
+        default:
+                return;
+        }
+
+        BEGIN_RING(2);
+        OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
+        OUT_RING(wait_until);
+        ADVANCE_RING();
+}
+
 static int r300_scratch(drm_radeon_private_t *dev_priv,
                         drm_radeon_kcmd_buffer_t *cmdbuf,
                         drm_r300_cmd_header_t header)
@@ -909,19 +950,8 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                         break;
 
                 case R300_CMD_WAIT:
-                        /* simple enough, we can do it here */
                         DRM_DEBUG("R300_CMD_WAIT\n");
-                        if (header.wait.flags == 0)
-                                break;  /* nothing to do */
-
-                        {
-                                RING_LOCALS;
-
-                                BEGIN_RING(2);
-                                OUT_RING(CP_PACKET0(RADEON_WAIT_UNTIL, 0));
-                                OUT_RING((header.wait.flags & 0xf) << 14);
-                                ADVANCE_RING();
-                        }
+                        r300_cmd_wait(dev_priv, header);
                         break;
 
                 case R300_CMD_SCRATCH:
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 833abc7e55fb..9072e4a1894e 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1807,6 +1807,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
         } else
 #endif
         {
+                dev_priv->gart_info.table_mask = DMA_BIT_MASK(32);
                 /* if we have an offset set from userspace */
                 if (dev_priv->pcigart_offset_set) {
                         dev_priv->gart_info.bus_addr =
diff --git a/drivers/char/drm/radeon_drm.h b/drivers/char/drm/radeon_drm.h
index 71e5b21fad2c..aab82e121e07 100644
--- a/drivers/char/drm/radeon_drm.h
+++ b/drivers/char/drm/radeon_drm.h
@@ -225,8 +225,20 @@ typedef union {
 #define R300_CMD_WAIT                   7
 #       define R300_WAIT_2D             0x1
 #       define R300_WAIT_3D             0x2
+/* these two defines are DOING IT WRONG - however
+ * we have userspace which relies on using these.
+ * The wait interface is backwards compat new 
+ * code should use the NEW_WAIT defines below
+ * THESE ARE NOT BIT FIELDS
+ */
 #       define R300_WAIT_2D_CLEAN       0x3
 #       define R300_WAIT_3D_CLEAN       0x4
+
+#       define R300_NEW_WAIT_2D_3D      0x3
+#       define R300_NEW_WAIT_2D_2D_CLEAN        0x4
+#       define R300_NEW_WAIT_3D_3D_CLEAN        0x6
+#       define R300_NEW_WAIT_2D_2D_CLEAN_3D_3D_CLEAN    0x8
+
 #define R300_CMD_SCRATCH                8
 
 typedef union {
diff --git a/drivers/char/drm/radeon_mem.c b/drivers/char/drm/radeon_mem.c
index 78b34fa7c89a..4af5286a36fb 100644
--- a/drivers/char/drm/radeon_mem.c
+++ b/drivers/char/drm/radeon_mem.c
@@ -88,7 +88,7 @@ static struct mem_block *alloc_block(struct mem_block *heap, int size,
 
         list_for_each(p, heap) {
                 int start = (p->start + mask) & ~mask;
-                if (p->file_priv == 0 && start + size <= p->start + p->size)
+                if (p->file_priv == NULL && start + size <= p->start + p->size)
                         return split_block(p, start, size, file_priv);
         }
 
@@ -113,7 +113,7 @@ static void free_block(struct mem_block *p)
         /* Assumes a single contiguous range.  Needs a special file_priv in
          * 'heap' to stop it being subsumed.
          */
-        if (p->next->file_priv == 0) {
+        if (p->next->file_priv == NULL) {
                 struct mem_block *q = p->next;
                 p->size += q->size;
                 p->next = q->next;
@@ -121,7 +121,7 @@ static void free_block(struct mem_block *p)
                 drm_free(q, sizeof(*q), DRM_MEM_BUFS);
         }
 
-        if (p->prev->file_priv == 0) {
+        if (p->prev->file_priv == NULL) {
                 struct mem_block *q = p->prev;
                 q->size += p->size;
                 q->next = p->next;
@@ -174,7 +174,7 @@ void radeon_mem_release(struct drm_file *file_priv, struct mem_block *heap)
          * 'heap' to stop it being subsumed.
          */
         list_for_each(p, heap) {
-                while (p->file_priv == 0 && p->next->file_priv == 0) {
+                while (p->file_priv == NULL && p->next->file_priv == NULL) {
                         struct mem_block *q = p->next;
                         p->size += q->size;
                         p->next = q->next;
diff --git a/drivers/char/drm/via_dma.c b/drivers/char/drm/via_dma.c
index 94baec692b57..7a339dba6a69 100644
--- a/drivers/char/drm/via_dma.c
+++ b/drivers/char/drm/via_dma.c
@@ -126,6 +126,8 @@ via_cmdbuf_wait(drm_via_private_t * dev_priv, unsigned int size)
                              hw_addr, cur_addr, next_addr);
                         return -1;
                 }
+                if  ((cur_addr < hw_addr) && (next_addr >= hw_addr))
+                        msleep(1);
         } while ((cur_addr < hw_addr) && (next_addr >= hw_addr));
         return 0;
 }
@@ -416,27 +418,50 @@ static int via_hook_segment(drm_via_private_t * dev_priv,
         int paused, count;
         volatile uint32_t *paused_at = dev_priv->last_pause_ptr;
         uint32_t reader,ptr;
+        uint32_t diff;
 
         paused = 0;
         via_flush_write_combine();
         (void) *(volatile uint32_t *)(via_get_dma(dev_priv) -1);
+
         *paused_at = pause_addr_lo;
         via_flush_write_combine();
         (void) *paused_at;
+
         reader = *(dev_priv->hw_addr_ptr);
         ptr = ((volatile char *)paused_at - dev_priv->dma_ptr) +
                 dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr + 4;
+
         dev_priv->last_pause_ptr = via_get_dma(dev_priv) - 1;
 
-        if ((ptr - reader) <= dev_priv->dma_diff ) {
-                count = 10000000;
-                while (!(paused = (VIA_READ(0x41c) & 0x80000000)) && count--);
+        /*
+         * If there is a possibility that the command reader will 
+         * miss the new pause address and pause on the old one,
+         * In that case we need to program the new start address
+         * using PCI.
+         */
+
+        diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
+        count = 10000000;
+        while(diff == 0 && count--) {
+                paused = (VIA_READ(0x41c) & 0x80000000);
+                if (paused) 
+                        break;
+                reader = *(dev_priv->hw_addr_ptr);
+                diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
         }
 
+        paused = VIA_READ(0x41c) & 0x80000000;
+
         if (paused && !no_pci_fire) {
                 reader = *(dev_priv->hw_addr_ptr);
-                if ((ptr - reader) == dev_priv->dma_diff) {
-
+                diff = (uint32_t) (ptr - reader) - dev_priv->dma_diff;
+                diff &= (dev_priv->dma_high - 1);
+                if (diff != 0 && diff < (dev_priv->dma_high >> 1)) {
+                        DRM_ERROR("Paused at incorrect address. "
+                                  "0x%08x, 0x%08x 0x%08x\n",
+                                  ptr, reader, dev_priv->dma_diff);
+                } else if (diff == 0) {
                         /*
                          * There is a concern that these writes may stall the PCI bus
                          * if the GPU is not idle. However, idling the GPU first
@@ -577,6 +602,7 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
         uint32_t pause_addr_lo, pause_addr_hi;
         uint32_t jump_addr_lo, jump_addr_hi;
         volatile uint32_t *last_pause_ptr;
+        uint32_t dma_low_save1, dma_low_save2;
 
         agp_base = dev_priv->dma_offset + (uint32_t) dev_priv->agpAddr;
         via_align_cmd(dev_priv, HC_HAGPBpID_JUMP, 0, &jump_addr_hi,
@@ -603,8 +629,29 @@ static void via_cmdbuf_jump(drm_via_private_t * dev_priv)
                       &pause_addr_lo, 0);
 
         *last_pause_ptr = pause_addr_lo;
+        dma_low_save1 = dev_priv->dma_low;
 
-        via_hook_segment( dev_priv, jump_addr_hi, jump_addr_lo, 0);
+        /*
+         * Now, set a trap that will pause the regulator if it tries to rerun the old
+         * command buffer. (Which may happen if via_hook_segment detecs a command regulator pause
+         * and reissues the jump command over PCI, while the regulator has already taken the jump
+         * and actually paused at the current buffer end).
+         * There appears to be no other way to detect this condition, since the hw_addr_pointer
+         * does not seem to get updated immediately when a jump occurs.
+         */
+
+        last_pause_ptr =
+                via_align_cmd(dev_priv, HC_HAGPBpID_PAUSE, 0, &pause_addr_hi,
+                              &pause_addr_lo, 0) - 1;
+        via_align_cmd(dev_priv, HC_HAGPBpID_PAUSE, 0, &pause_addr_hi,
+                      &pause_addr_lo, 0);
+        *last_pause_ptr = pause_addr_lo;
+
+        dma_low_save2 = dev_priv->dma_low;
+        dev_priv->dma_low = dma_low_save1;
+        via_hook_segment(dev_priv, jump_addr_hi, jump_addr_lo, 0);
+        dev_priv->dma_low = dma_low_save2;
+        via_hook_segment(dev_priv, pause_addr_hi, pause_addr_lo, 0);
 }
 
 
diff --git a/drivers/char/drm/via_dmablit.c b/drivers/char/drm/via_dmablit.c
index 33c5197b73c4..409e00afdd07 100644
--- a/drivers/char/drm/via_dmablit.c
+++ b/drivers/char/drm/via_dmablit.c
@@ -603,7 +603,7 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
          * (Not a big limitation anyway.)
          */
 
-        if ((xfer->mem_stride - xfer->line_length) >= PAGE_SIZE) {
+        if ((xfer->mem_stride - xfer->line_length) > 2*PAGE_SIZE) {
                 DRM_ERROR("Too large system memory stride. Stride: %d, "
                           "Length: %d\n", xfer->mem_stride, xfer->line_length);
                 return -EINVAL;
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 6bbd4fa50f3b..8d6c2089d2a8 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -9,7 +9,14 @@ config HW_RANDOM
           Hardware Random Number Generator Core infrastructure.
 
           To compile this driver as a module, choose M here: the
-          module will be called rng-core.
+          module will be called rng-core.  This provides a device
+          that's usually called /dev/hw_random, and which exposes one
+          of possibly several hardware random number generators.
+
+          These hardware random number generators do not feed directly
+          into the kernel's random number generator.  That is usually
+          handled by the "rngd" daemon.  Documentation/hw_random.txt
+          has more information.
 
           If unsure, say Y.
 
diff --git a/drivers/char/ip2/i2lib.c b/drivers/char/ip2/i2lib.c
index d6567b32fb5c..9c25320121ef 100644
--- a/drivers/char/ip2/i2lib.c
+++ b/drivers/char/ip2/i2lib.c
@@ -644,12 +644,12 @@ i2QueueCommands(int type, i2ChanStrPtr pCh, int timeout, int nCommands,
                                 // Normal Expected path - We still hold LOCK
                                 break; /* from for()- Enough room: goto proceed */
                         }
-                }
-
-                ip2trace (CHANN, ITRC_QUEUE, 3, 1, totalsize );
+                        ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
+                        WRITE_UNLOCK_IRQRESTORE(lock_var_p, flags);
+                } else
+                        ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
 
-                // Prepare to wait for buffers to empty
-                WRITE_UNLOCK_IRQRESTORE(lock_var_p,flags); 
+                /* Prepare to wait for buffers to empty */
                 serviceOutgoingFifo(pB);        // Dump what we got
 
                 if (timeout == 0) {
@@ -1830,6 +1830,8 @@ i2StripFifo(i2eBordStrPtr pB)
                 default: // Neither packet? should be impossible
                         ip2trace (ITRC_NO_PORT, ITRC_SFIFO, 5, 1,
                                 PTYPE_OF(pB->i2eLeadoffWord) );
+                        WRITE_UNLOCK_IRQRESTORE(&pB->read_fifo_spinlock,
+                                        bflags);
 
                         break;
                 }  // End of switch on type of packets
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 46b2a1cc8b54..0c09409fa45d 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -1183,7 +1183,7 @@ static int copy_from_read_buf(struct tty_struct *tty,
         return retval;
 }
 
-extern ssize_t redirected_tty_write(struct file *, const char *,
+extern ssize_t redirected_tty_write(struct file *, const char __user *,
                                                         size_t, loff_t *);
 
 /**
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c
index 6d0dc5f9b6bb..6a6843a0a674 100644
--- a/drivers/char/nozomi.c
+++ b/drivers/char/nozomi.c
@@ -438,7 +438,7 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start,
                         u32 size_bytes)
 {
         u32 i = 0;
-        const u32 *ptr = (__force u32 *) mem_addr_start;
+        const u32 __iomem *ptr = mem_addr_start;
         u16 *buf16;
 
         if (unlikely(!ptr || !buf))
@@ -448,11 +448,11 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start,
         switch (size_bytes) {
         case 2: /* 2 bytes */
                 buf16 = (u16 *) buf;
-                *buf16 = __le16_to_cpu(readw((void __iomem *)ptr));
+                *buf16 = __le16_to_cpu(readw(ptr));
                 goto out;
                 break;
         case 4: /* 4 bytes */
-                *(buf) = __le32_to_cpu(readl((void __iomem *)ptr));
+                *(buf) = __le32_to_cpu(readl(ptr));
                 goto out;
                 break;
         }
@@ -461,11 +461,11 @@ static void read_mem32(u32 *buf, const void __iomem *mem_addr_start,
                 if (size_bytes - i == 2) {
                         /* Handle 2 bytes in the end */
                         buf16 = (u16 *) buf;
-                        *(buf16) = __le16_to_cpu(readw((void __iomem *)ptr));
+                        *(buf16) = __le16_to_cpu(readw(ptr));
                         i += 2;
                 } else {
                         /* Read 4 bytes */
-                        *(buf) = __le32_to_cpu(readl((void __iomem *)ptr));
+                        *(buf) = __le32_to_cpu(readl(ptr));
                         i += 4;
                 }
                 buf++;
@@ -484,7 +484,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
                         u32 size_bytes)
 {
         u32 i = 0;
-        u32 *ptr = (__force u32 *) mem_addr_start;
+        u32 __iomem *ptr = mem_addr_start;
         const u16 *buf16;
 
         if (unlikely(!ptr || !buf))
@@ -494,7 +494,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
         switch (size_bytes) {
         case 2: /* 2 bytes */
                 buf16 = (const u16 *)buf;
-                writew(__cpu_to_le16(*buf16), (void __iomem *)ptr);
+                writew(__cpu_to_le16(*buf16), ptr);
                 return 2;
                 break;
         case 1: /*
@@ -502,7 +502,7 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
                  * so falling through..
                  */
         case 4: /* 4 bytes */
-                writel(__cpu_to_le32(*buf), (void __iomem *)ptr);
+                writel(__cpu_to_le32(*buf), ptr);
                 return 4;
                 break;
         }
@@ -511,11 +511,11 @@ static u32 write_mem32(void __iomem *mem_addr_start, const u32 *buf,
                 if (size_bytes - i == 2) {
                         /* 2 bytes */
                         buf16 = (const u16 *)buf;
-                        writew(__cpu_to_le16(*buf16), (void __iomem *)ptr);
+                        writew(__cpu_to_le16(*buf16), ptr);
                         i += 2;
                 } else {
                         /* 4 bytes */
-                        writel(__cpu_to_le32(*buf), (void __iomem *)ptr);
+                        writel(__cpu_to_le32(*buf), ptr);
                         i += 4;
                 }
                 buf++;
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c
index 991119c9f473..9b52892a501f 100644
--- a/drivers/char/rio/riotable.c
+++ b/drivers/char/rio/riotable.c
@@ -425,8 +425,10 @@ int RIOApel(struct rio_info *p)
 
                 MapP = &p->RIOConnectTable[Next++];
                 MapP->HostUniqueNum = HostP->UniqueNum;
-                if ((HostP->Flags & RUN_STATE) != RC_RUNNING)
+                if ((HostP->Flags & RUN_STATE) != RC_RUNNING) {
+                        rio_spin_unlock_irqrestore(&HostP->HostLock, flags);
                         continue;
+                }
                 MapP->RtaUniqueNum = 0;
                 MapP->ID = 0;
                 MapP->Flags = SLOT_IN_USE;
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c
index a4f0b1e3e7fa..cfa54361473f 100644
--- a/drivers/char/rio/riotty.c
+++ b/drivers/char/rio/riotty.c
@@ -319,6 +319,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
                         PortP->State |= RIO_WOPEN;
                         rio_spin_unlock_irqrestore(&PortP->portSem, flags);
                         if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
+                                rio_spin_lock_irqsave(&PortP->portSem, flags);
                                 /*
                                  ** ACTION: verify that this is a good thing
                                  ** to do here. -- ???
@@ -334,6 +335,7 @@ int riotopen(struct tty_struct *tty, struct file *filp)
                                 func_exit();
                                 return -EINTR;
                         }
+                        rio_spin_lock_irqsave(&PortP->portSem, flags);
                 }
                 PortP->State &= ~RIO_WOPEN;
         }
@@ -493,6 +495,7 @@ int riotclose(void *ptr)
 
         if (RIOShortCommand(p, PortP, CLOSE, 1, 0) == RIO_FAIL) {
                 RIOPreemptiveCmd(p, PortP, FCLOSE);
+                rio_spin_lock_irqsave(&PortP->portSem, flags);
                 goto close_end;
         }
 
@@ -508,6 +511,7 @@ int riotclose(void *ptr)
 
                         if (p->RIOHalted) {
                                 RIOClearUp(PortP);
+                                rio_spin_lock_irqsave(&PortP->portSem, flags);
                                 goto close_end;
                         }
                         if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 72f289279d8f..f585bc8579e9 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -83,6 +83,7 @@
 #include <linux/pci.h>
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
+#include <asm/unaligned.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
 #include <linux/init.h>
@@ -1312,7 +1313,7 @@ static int rp_tiocmset(struct tty_struct *tty, struct file *file,
         if (clear & TIOCM_DTR)
                 info->channel.TxControl[3] &= ~SET_DTR;
 
-        sOutDW(info->channel.IndexAddr, *(DWord_t *) & (info->channel.TxControl[0]));
+        out32(info->channel.IndexAddr, info->channel.TxControl);
         return 0;
 }
 
@@ -1748,7 +1749,7 @@ static int rp_write(struct tty_struct *tty,
 
         /*  Write remaining data into the port's xmit_buf */
         while (1) {
-                if (info->tty == 0)     /*   Seemingly obligatory check... */
+                if (!info->tty) /*   Seemingly obligatory check... */
                         goto end;
 
                 c = min(count, min(XMIT_BUF_SIZE - info->xmit_cnt - 1, XMIT_BUF_SIZE - info->xmit_head));
@@ -2798,7 +2799,7 @@ static int sReadAiopNumChan(WordIO_t io)
         static Byte_t R[4] = { 0x00, 0x00, 0x34, 0x12 };
 
         /* write to chan 0 SRAM */
-        sOutDW((DWordIO_t) io + _INDX_ADDR, *((DWord_t *) & R[0]));
+        out32((DWordIO_t) io + _INDX_ADDR, R);
         sOutW(io + _INDX_ADDR, 0);      /* read from SRAM, chan 0 */
         x = sInW(io + _INDX_DATA);
         sOutW(io + _INDX_ADDR, 0x4000); /* read from SRAM, chan 4 */
@@ -2864,7 +2865,7 @@ static int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
                 R[1] = RData[i + 1] + 0x10 * ChanNum;
                 R[2] = RData[i + 2];
                 R[3] = RData[i + 3];
-                sOutDW(ChP->IndexAddr, *((DWord_t *) & R[0]));
+                out32(ChP->IndexAddr, R);
         }
 
         ChR = ChP->R;
@@ -2887,43 +2888,43 @@ static int sInitChan(CONTROLLER_T * CtlP, CHANNEL_T * ChP, int AiopNum,
         ChP->BaudDiv[1] = (Byte_t) ((ChOff + _BAUD) >> 8);
         ChP->BaudDiv[2] = (Byte_t) brd9600;
         ChP->BaudDiv[3] = (Byte_t) (brd9600 >> 8);
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->BaudDiv[0]);
+        out32(ChP->IndexAddr, ChP->BaudDiv);
 
         ChP->TxControl[0] = (Byte_t) (ChOff + _TX_CTRL);
         ChP->TxControl[1] = (Byte_t) ((ChOff + _TX_CTRL) >> 8);
         ChP->TxControl[2] = 0;
         ChP->TxControl[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxControl[0]);
+        out32(ChP->IndexAddr, ChP->TxControl);
 
         ChP->RxControl[0] = (Byte_t) (ChOff + _RX_CTRL);
         ChP->RxControl[1] = (Byte_t) ((ChOff + _RX_CTRL) >> 8);
         ChP->RxControl[2] = 0;
         ChP->RxControl[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->RxControl[0]);
+        out32(ChP->IndexAddr, ChP->RxControl);
 
         ChP->TxEnables[0] = (Byte_t) (ChOff + _TX_ENBLS);
         ChP->TxEnables[1] = (Byte_t) ((ChOff + _TX_ENBLS) >> 8);
         ChP->TxEnables[2] = 0;
         ChP->TxEnables[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxEnables[0]);
+        out32(ChP->IndexAddr, ChP->TxEnables);
 
         ChP->TxCompare[0] = (Byte_t) (ChOff + _TXCMP1);
         ChP->TxCompare[1] = (Byte_t) ((ChOff + _TXCMP1) >> 8);
         ChP->TxCompare[2] = 0;
         ChP->TxCompare[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxCompare[0]);
+        out32(ChP->IndexAddr, ChP->TxCompare);
 
         ChP->TxReplace1[0] = (Byte_t) (ChOff + _TXREP1B1);
         ChP->TxReplace1[1] = (Byte_t) ((ChOff + _TXREP1B1) >> 8);
         ChP->TxReplace1[2] = 0;
         ChP->TxReplace1[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxReplace1[0]);
+        out32(ChP->IndexAddr, ChP->TxReplace1);
 
         ChP->TxReplace2[0] = (Byte_t) (ChOff + _TXREP2);
         ChP->TxReplace2[1] = (Byte_t) ((ChOff + _TXREP2) >> 8);
         ChP->TxReplace2[2] = 0;
         ChP->TxReplace2[3] = 0;
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxReplace2[0]);
+        out32(ChP->IndexAddr, ChP->TxReplace2);
 
         ChP->TxFIFOPtrs = ChOff + _TXF_OUTP;
         ChP->TxFIFO = ChOff + _TX_FIFO;
@@ -2979,7 +2980,7 @@ static void sStopRxProcessor(CHANNEL_T * ChP)
         R[1] = ChP->R[1];
         R[2] = 0x0a;
         R[3] = ChP->R[3];
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & R[0]);
+        out32(ChP->IndexAddr, R);
 }
 
 /***************************************************************************
@@ -3094,13 +3095,13 @@ static int sWriteTxPrioByte(CHANNEL_T * ChP, Byte_t Data)
                 *WordPtr = ChP->TxPrioBuf;      /* data byte address */
 
                 DWBuf[2] = Data;        /* data byte value */
-                sOutDW(IndexAddr, *((DWord_t *) (&DWBuf[0])));  /* write it out */
+                out32(IndexAddr, DWBuf);        /* write it out */
 
                 *WordPtr = ChP->TxPrioCnt;      /* Tx priority count address */
 
                 DWBuf[2] = PRI_PEND + 1;        /* indicate 1 byte pending */
                 DWBuf[3] = 0;   /* priority buffer pointer */
-                sOutDW(IndexAddr, *((DWord_t *) (&DWBuf[0])));  /* write it out */
+                out32(IndexAddr, DWBuf);        /* write it out */
         } else {                /* write it to Tx FIFO */
 
                 sWriteTxByte(sGetTxRxDataIO(ChP), Data);
@@ -3147,11 +3148,11 @@ static void sEnInterrupts(CHANNEL_T * ChP, Word_t Flags)
         ChP->RxControl[2] |=
             ((Byte_t) Flags & (RXINT_EN | SRCINT_EN | MCINT_EN));
 
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->RxControl[0]);
+        out32(ChP->IndexAddr, ChP->RxControl);
 
         ChP->TxControl[2] |= ((Byte_t) Flags & TXINT_EN);
 
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxControl[0]);
+        out32(ChP->IndexAddr, ChP->TxControl);
 
         if (Flags & CHANINT_EN) {
                 Mask = sInB(ChP->IntMask) | sBitMapSetTbl[ChP->ChanNum];
@@ -3190,9 +3191,9 @@ static void sDisInterrupts(CHANNEL_T * ChP, Word_t Flags)
 
         ChP->RxControl[2] &=
             ~((Byte_t) Flags & (RXINT_EN | SRCINT_EN | MCINT_EN));
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->RxControl[0]);
+        out32(ChP->IndexAddr, ChP->RxControl);
         ChP->TxControl[2] &= ~((Byte_t) Flags & TXINT_EN);
-        sOutDW(ChP->IndexAddr, *(DWord_t *) & ChP->TxControl[0]);
+        out32(ChP->IndexAddr, ChP->TxControl);
 
         if (Flags & CHANINT_EN) {
                 Mask = sInB(ChP->IntMask) & sBitMapClrTbl[ChP->ChanNum];
diff --git a/drivers/char/rocket_int.h b/drivers/char/rocket_int.h
index f3a75791b811..b01d38125a8f 100644
--- a/drivers/char/rocket_int.h
+++ b/drivers/char/rocket_int.h
@@ -26,7 +26,6 @@ typedef unsigned int ByteIO_t;
 typedef unsigned int Word_t;
 typedef unsigned int WordIO_t;
 
-typedef unsigned long DWord_t;
 typedef unsigned int DWordIO_t;
 
 /*
@@ -38,7 +37,6 @@ typedef unsigned int DWordIO_t;
  * instruction.
  */
 
-#ifdef ROCKET_DEBUG_IO
 static inline void sOutB(unsigned short port, unsigned char value)
 {
 #ifdef ROCKET_DEBUG_IO
@@ -55,12 +53,13 @@ static inline void sOutW(unsigned short port, unsigned short value)
         outw_p(value, port);
 }
 
-static inline void sOutDW(unsigned short port, unsigned long value)
+static inline void out32(unsigned short port, Byte_t *p)
 {
+        u32 value = le32_to_cpu(get_unaligned((__le32 *)p));
 #ifdef ROCKET_DEBUG_IO
-        printk(KERN_DEBUG "sOutDW(%x, %lx)...\n", port, value);
+        printk(KERN_DEBUG "out32(%x, %lx)...\n", port, value);
 #endif
-        outl_p(cpu_to_le32(value), port);
+        outl_p(value, port);
 }
 
 static inline unsigned char sInB(unsigned short port)
@@ -73,14 +72,6 @@ static inline unsigned short sInW(unsigned short port)
         return inw_p(port);
 }
 
-#else                           /* !ROCKET_DEBUG_IO */
-#define sOutB(a, b) outb_p(b, a)
-#define sOutW(a, b) outw_p(b, a)
-#define sOutDW(port, value) outl_p(cpu_to_le32(value), port)
-#define sInB(a) (inb_p(a))
-#define sInW(a) (inw_p(a))
-#endif                          /* ROCKET_DEBUG_IO */
-
 /* This is used to move arrays of bytes so byte swapping isn't appropriate. */
 #define sOutStrW(port, addr, count) if (count) outsw(port, addr, count)
 #define sInStrW(port, addr, count) if (count) insw(port, addr, count)
@@ -390,7 +381,7 @@ Call:     sClrBreak(ChP)
 #define sClrBreak(ChP) \
 do { \
    (ChP)->TxControl[3] &= ~SETBREAK; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -402,7 +393,7 @@ Call:     sClrDTR(ChP)
 #define sClrDTR(ChP) \
 do { \
    (ChP)->TxControl[3] &= ~SET_DTR; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -415,7 +406,7 @@ Call:     sClrRTS(ChP)
 do { \
    if ((ChP)->rtsToggle) break; \
    (ChP)->TxControl[3] &= ~SET_RTS; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -489,7 +480,7 @@ Call:     sDisCTSFlowCtl(ChP)
 #define sDisCTSFlowCtl(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~CTSFC_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -501,7 +492,7 @@ Call:     sDisIXANY(ChP)
 #define sDisIXANY(ChP) \
 do { \
    (ChP)->R[0x0e] = 0x86; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x0c]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x0c]); \
 } while (0)
 
 /***************************************************************************
@@ -515,7 +506,7 @@ Comments: Function sSetParity() can be used in place of functions sEnParity(),
 #define sDisParity(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~PARITY_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -527,7 +518,7 @@ Call:     sDisRTSToggle(ChP)
 #define sDisRTSToggle(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~RTSTOG_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
    (ChP)->rtsToggle = 0; \
 } while (0)
 
@@ -540,7 +531,7 @@ Call:     sDisRxFIFO(ChP)
 #define sDisRxFIFO(ChP) \
 do { \
    (ChP)->R[0x32] = 0x0a; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x30]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x30]); \
 } while (0)
 
 /***************************************************************************
@@ -567,7 +558,7 @@ Call:     sDisTransmit(ChP)
 #define sDisTransmit(ChP) \
 do { \
    (ChP)->TxControl[3] &= ~TX_ENABLE; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -579,7 +570,7 @@ Call:     sDisTxSoftFlowCtl(ChP)
 #define sDisTxSoftFlowCtl(ChP) \
 do { \
    (ChP)->R[0x06] = 0x8a; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x04]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
 } while (0)
 
 /***************************************************************************
@@ -604,7 +595,7 @@ Call:     sEnCTSFlowCtl(ChP)
 #define sEnCTSFlowCtl(ChP) \
 do { \
    (ChP)->TxControl[2] |= CTSFC_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -616,7 +607,7 @@ Call:     sEnIXANY(ChP)
 #define sEnIXANY(ChP) \
 do { \
    (ChP)->R[0x0e] = 0x21; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x0c]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x0c]); \
 } while (0)
 
 /***************************************************************************
@@ -633,7 +624,7 @@ Warnings: Before enabling parity odd or even parity should be chosen using
 #define sEnParity(ChP) \
 do { \
    (ChP)->TxControl[2] |= PARITY_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -647,10 +638,10 @@ Comments: This function will disable RTS flow control and clear the RTS
 #define sEnRTSToggle(ChP) \
 do { \
    (ChP)->RxControl[2] &= ~RTSFC_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->RxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->RxControl); \
    (ChP)->TxControl[2] |= RTSTOG_EN; \
    (ChP)->TxControl[3] &= ~SET_RTS; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
    (ChP)->rtsToggle = 1; \
 } while (0)
 
@@ -663,7 +654,7 @@ Call:     sEnRxFIFO(ChP)
 #define sEnRxFIFO(ChP) \
 do { \
    (ChP)->R[0x32] = 0x08; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x30]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x30]); \
 } while (0)
 
 /***************************************************************************
@@ -684,7 +675,7 @@ Warnings: This function must be called after valid microcode has been
 #define sEnRxProcessor(ChP) \
 do { \
    (ChP)->RxControl[2] |= RXPROC_EN; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->RxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->RxControl); \
 } while (0)
 
 /***************************************************************************
@@ -708,7 +699,7 @@ Call:     sEnTransmit(ChP)
 #define sEnTransmit(ChP) \
 do { \
    (ChP)->TxControl[3] |= TX_ENABLE; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -720,7 +711,7 @@ Call:     sEnTxSoftFlowCtl(ChP)
 #define sEnTxSoftFlowCtl(ChP) \
 do { \
    (ChP)->R[0x06] = 0xc5; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x04]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
 } while (0)
 
 /***************************************************************************
@@ -927,7 +918,7 @@ Call:     sSendBreak(ChP)
 #define sSendBreak(ChP) \
 do { \
    (ChP)->TxControl[3] |= SETBREAK; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -941,7 +932,7 @@ Call:     sSetBaud(ChP,Divisor)
 do { \
    (ChP)->BaudDiv[2] = (Byte_t)(DIVISOR); \
    (ChP)->BaudDiv[3] = (Byte_t)((DIVISOR) >> 8); \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->BaudDiv[0]); \
+   out32((ChP)->IndexAddr,(ChP)->BaudDiv); \
 } while (0)
 
 /***************************************************************************
@@ -953,7 +944,7 @@ Call:     sSetData7(ChP)
 #define sSetData7(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~DATA8BIT; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -965,7 +956,7 @@ Call:     sSetData8(ChP)
 #define sSetData8(ChP) \
 do { \
    (ChP)->TxControl[2] |= DATA8BIT; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -977,7 +968,7 @@ Call:     sSetDTR(ChP)
 #define sSetDTR(ChP) \
 do { \
    (ChP)->TxControl[3] |= SET_DTR; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -994,7 +985,7 @@ Warnings: This function has no effect unless parity is enabled with function
 #define sSetEvenParity(ChP) \
 do { \
    (ChP)->TxControl[2] |= EVEN_PAR; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1011,7 +1002,7 @@ Warnings: This function has no effect unless parity is enabled with function
 #define sSetOddParity(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~EVEN_PAR; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1024,7 +1015,7 @@ Call:     sSetRTS(ChP)
 do { \
    if ((ChP)->rtsToggle) break; \
    (ChP)->TxControl[3] |= SET_RTS; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1050,7 +1041,7 @@ Comments: An interrupt will be generated when the trigger level is reached
 do { \
    (ChP)->RxControl[2] &= ~TRIG_MASK; \
    (ChP)->RxControl[2] |= LEVEL; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->RxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->RxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1062,7 +1053,7 @@ Call:     sSetStop1(ChP)
 #define sSetStop1(ChP) \
 do { \
    (ChP)->TxControl[2] &= ~STOP2; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1074,7 +1065,7 @@ Call:     sSetStop2(ChP)
 #define sSetStop2(ChP) \
 do { \
    (ChP)->TxControl[2] |= STOP2; \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->TxControl[0]); \
+   out32((ChP)->IndexAddr,(ChP)->TxControl); \
 } while (0)
 
 /***************************************************************************
@@ -1087,7 +1078,7 @@ Call:     sSetTxXOFFChar(ChP,Ch)
 #define sSetTxXOFFChar(ChP,CH) \
 do { \
    (ChP)->R[0x07] = (CH); \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x04]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x04]); \
 } while (0)
 
 /***************************************************************************
@@ -1100,7 +1091,7 @@ Call:     sSetTxXONChar(ChP,Ch)
 #define sSetTxXONChar(ChP,CH) \
 do { \
    (ChP)->R[0x0b] = (CH); \
-   sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0x08]); \
+   out32((ChP)->IndexAddr,&(ChP)->R[0x08]); \
 } while (0)
 
 /***************************************************************************
@@ -1113,7 +1104,7 @@ Comments: This function is used to start a Rx processor after it was
           will restart both the Rx processor and software input flow control.
 
 */
-#define sStartRxProcessor(ChP) sOutDW((ChP)->IndexAddr,*(DWord_t *)&(ChP)->R[0])
+#define sStartRxProcessor(ChP) out32((ChP)->IndexAddr,&(ChP)->R[0])
 
 /***************************************************************************
 Function: sWriteTxByte
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index d73663a52324..fc555a90bb21 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -67,7 +67,7 @@ static void cpuidle_idle_call(void)
         /* enter the state and update stats */
         dev->last_residency = target_state->enter(dev, target_state);
         dev->last_state = target_state;
-        target_state->time += dev->last_residency;
+        target_state->time += (unsigned long long)dev->last_residency;
         target_state->usage++;
 
         /* give the governor an opportunity to reflect on the outcome */
@@ -224,7 +224,7 @@ static void poll_idle_init(struct cpuidle_device *dev)
         state->exit_latency = 0;
         state->target_residency = 0;
         state->power_usage = -1;
-        state->flags = CPUIDLE_FLAG_POLL | CPUIDLE_FLAG_TIME_VALID;
+        state->flags = CPUIDLE_FLAG_POLL;
         state->enter = poll_idle;
 }
 #else
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index 69102ca05685..e949618b9be0 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -218,6 +218,12 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
         return sprintf(buf, "%u\n", state->_name);\
 }
 
+#define define_show_state_ull_function(_name) \
+static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
+{ \
+        return sprintf(buf, "%llu\n", state->_name);\
+}
+
 #define define_show_state_str_function(_name) \
 static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
 { \
@@ -228,8 +234,8 @@ static ssize_t show_state_##_name(struct cpuidle_state *state, char *buf) \
 
 define_show_state_function(exit_latency)
 define_show_state_function(power_usage)
-define_show_state_function(usage)
-define_show_state_function(time)
+define_show_state_ull_function(usage)
+define_show_state_ull_function(time)
 define_show_state_str_function(name)
 define_show_state_str_function(desc)
 
diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
index 3110bf7014f7..81f3f950cd7d 100644
--- a/drivers/crypto/hifn_795x.c
+++ b/drivers/crypto/hifn_795x.c
@@ -392,8 +392,8 @@ static atomic_t hifn_dev_number;
 
 struct hifn_desc
 {
-        volatile u32            l;
-        volatile u32            p;
+        volatile __le32         l;
+        volatile __le32         p;
 };
 
 struct hifn_dma {
@@ -481,10 +481,10 @@ struct hifn_device
 
 struct hifn_base_command
 {
-        volatile u16            masks;
-        volatile u16            session_num;
-        volatile u16            total_source_count;
-        volatile u16            total_dest_count;
+        volatile __le16         masks;
+        volatile __le16         session_num;
+        volatile __le16         total_source_count;
+        volatile __le16         total_dest_count;
 };
 
 #define HIFN_BASE_CMD_COMP              0x0100  /* enable compression engine */
@@ -504,10 +504,10 @@ struct hifn_base_command
  */
 struct hifn_crypt_command
 {
-        volatile u16            masks;
-        volatile u16            header_skip;
-        volatile u16            source_count;
-        volatile u16            reserved;
+        volatile __le16                 masks;
+        volatile __le16                 header_skip;
+        volatile __le16                 source_count;
+        volatile __le16                 reserved;
 };
 
 #define HIFN_CRYPT_CMD_ALG_MASK         0x0003          /* algorithm: */
@@ -670,7 +670,7 @@ static inline u32 hifn_read_0(struct hifn_device *dev, u32 reg)
 {
         u32 ret;
 
-        ret = readl((char *)(dev->bar[0]) + reg);
+        ret = readl(dev->bar[0] + reg);
 
         return ret;
 }
@@ -679,19 +679,19 @@ static inline u32 hifn_read_1(struct hifn_device *dev, u32 reg)
 {
         u32 ret;
 
-        ret = readl((char *)(dev->bar[1]) + reg);
+        ret = readl(dev->bar[1] + reg);
 
         return ret;
 }
 
 static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)
 {
-        writel(val, (char *)(dev->bar[0]) + reg);
+        writel(val, dev->bar[0] + reg);
 }
 
 static inline void hifn_write_1(struct hifn_device *dev, u32 reg, u32 val)
 {
-        writel(val, (char *)(dev->bar[1]) + reg);
+        writel(val, dev->bar[1] + reg);
 }
 
 static void hifn_wait_puc(struct hifn_device *dev)
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index ad2f938597e2..72692309398a 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -123,6 +123,11 @@ static dma_addr_t get_ndar(struct fsl_dma_chan *fsl_chan)
         return DMA_IN(fsl_chan, &fsl_chan->reg_base->ndar, 64);
 }
 
+static u32 get_bcr(struct fsl_dma_chan *fsl_chan)
+{
+        return DMA_IN(fsl_chan, &fsl_chan->reg_base->bcr, 32);
+}
+
 static int dma_is_idle(struct fsl_dma_chan *fsl_chan)
 {
         u32 sr = get_sr(fsl_chan);
@@ -426,6 +431,9 @@ fsl_dma_prep_interrupt(struct dma_chan *chan)
         new->async_tx.cookie = -EBUSY;
         new->async_tx.ack = 0;
 
+        /* Insert the link descriptor to the LD ring */
+        list_add_tail(&new->node, &new->async_tx.tx_list);
+
         /* Set End-of-link to the last link descriptor of new list*/
         set_ld_eol(fsl_chan, new);
 
@@ -701,6 +709,23 @@ static irqreturn_t fsl_dma_chan_do_interrupt(int irq, void *data)
         if (stat & FSL_DMA_SR_TE)
                 dev_err(fsl_chan->dev, "Transfer Error!\n");
 
+        /* Programming Error
+         * The DMA_INTERRUPT async_tx is a NULL transfer, which will
+         * triger a PE interrupt.
+         */
+        if (stat & FSL_DMA_SR_PE) {
+                dev_dbg(fsl_chan->dev, "event: Programming Error INT\n");
+                if (get_bcr(fsl_chan) == 0) {
+                        /* BCR register is 0, this is a DMA_INTERRUPT async_tx.
+                         * Now, update the completed cookie, and continue the
+                         * next uncompleted transfer.
+                         */
+                        fsl_dma_update_completed_cookie(fsl_chan);
+                        fsl_chan_xfer_ld_queue(fsl_chan);
+                }
+                stat &= ~FSL_DMA_SR_PE;
+        }
+
         /* If the link descriptor segment transfer finishes,
          * we will recycle the used descriptor.
          */
@@ -841,6 +866,11 @@ static int fsl_dma_self_test(struct fsl_dma_chan *fsl_chan)
         tx3 = fsl_dma_prep_memcpy(chan, dma_dest, dma_src, test_size / 4, 0);
         async_tx_ack(tx3);
 
+        /* Interrupt tx test */
+        tx1 = fsl_dma_prep_interrupt(chan);
+        async_tx_ack(tx1);
+        cookie = fsl_dma_tx_submit(tx1);
+
         /* Test exchanging the prepared tx sort */
         cookie = fsl_dma_tx_submit(tx3);
         cookie = fsl_dma_tx_submit(tx2);
diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
index ba78c42121ba..6faf07ba0d0e 100644
--- a/drivers/dma/fsldma.h
+++ b/drivers/dma/fsldma.h
@@ -40,6 +40,7 @@
 #define FSL_DMA_MR_EOTIE        0x00000080
 
 #define FSL_DMA_SR_CH           0x00000020
+#define FSL_DMA_SR_PE           0x00000010
 #define FSL_DMA_SR_CB           0x00000004
 #define FSL_DMA_SR_TE           0x00000080
 #define FSL_DMA_SR_EOSI         0x00000002
@@ -74,12 +75,15 @@
 #define FSL_DMA_DGSR_EOSI       0x02
 #define FSL_DMA_DGSR_EOLSI      0x01
 
+typedef u64 __bitwise v64;
+typedef u32 __bitwise v32;
+
 struct fsl_dma_ld_hw {
-        u64 __bitwise   src_addr;
-        u64 __bitwise   dst_addr;
-        u64 __bitwise   next_ln_addr;
-        u32 __bitwise   count;
-        u32 __bitwise   reserve;
+        v64 src_addr;
+        v64 dst_addr;
+        v64 next_ln_addr;
+        v32 count;
+        v32 reserve;
 } __attribute__((aligned(32)));
 
 struct fsl_desc_sw {
@@ -91,13 +95,13 @@ struct fsl_desc_sw {
 } __attribute__((aligned(32)));
 
 struct fsl_dma_chan_regs {
-        u32 __bitwise   mr;     /* 0x00 - Mode Register */
-        u32 __bitwise   sr;     /* 0x04 - Status Register */
-        u64 __bitwise   cdar;   /* 0x08 - Current descriptor address register */
-        u64 __bitwise   sar;    /* 0x10 - Source Address Register */
-        u64 __bitwise   dar;    /* 0x18 - Destination Address Register */
-        u32 __bitwise   bcr;    /* 0x20 - Byte Count Register */
-        u64 __bitwise   ndar;   /* 0x24 - Next Descriptor Address Register */
+        u32 mr; /* 0x00 - Mode Register */
+        u32 sr; /* 0x04 - Status Register */
+        u64 cdar;       /* 0x08 - Current descriptor address register */
+        u64 sar;        /* 0x10 - Source Address Register */
+        u64 dar;        /* 0x18 - Destination Address Register */
+        u32 bcr;        /* 0x20 - Byte Count Register */
+        u64 ndar;       /* 0x24 - Next Descriptor Address Register */
 };
 
 struct fsl_dma_chan;
@@ -150,25 +154,27 @@ struct fsl_dma_chan {
 #ifndef __powerpc64__
 static u64 in_be64(const u64 __iomem *addr)
 {
-        return ((u64)in_be32((u32 *)addr) << 32) | (in_be32((u32 *)addr + 1));
+        return ((u64)in_be32((u32 __iomem *)addr) << 32) |
+                (in_be32((u32 __iomem *)addr + 1));
 }
 
 static void out_be64(u64 __iomem *addr, u64 val)
 {
-        out_be32((u32 *)addr, val >> 32);
-        out_be32((u32 *)addr + 1, (u32)val);
+        out_be32((u32 __iomem *)addr, val >> 32);
+        out_be32((u32 __iomem *)addr + 1, (u32)val);
 }
 
 /* There is no asm instructions for 64 bits reverse loads and stores */
 static u64 in_le64(const u64 __iomem *addr)
 {
-        return ((u64)in_le32((u32 *)addr + 1) << 32) | (in_le32((u32 *)addr));
+        return ((u64)in_le32((u32 __iomem *)addr + 1) << 32) |
+                (in_le32((u32 __iomem *)addr));
 }
 
 static void out_le64(u64 __iomem *addr, u64 val)
 {
-        out_le32((u32 *)addr + 1, val >> 32);
-        out_le32((u32 *)addr, (u32)val);
+        out_le32((u32 __iomem *)addr + 1, val >> 32);
+        out_le32((u32 __iomem *)addr, (u32)val);
 }
 #endif
 
@@ -181,9 +187,11 @@ static void out_le64(u64 __iomem *addr, u64 val)
 
 #define DMA_TO_CPU(fsl_chan, d, width)                                  \
                 (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ?           \
-                        be##width##_to_cpu(d) : le##width##_to_cpu(d))
+                        be##width##_to_cpu((__force __be##width)(v##width)d) : \
+                        le##width##_to_cpu((__force __le##width)(v##width)d))
 #define CPU_TO_DMA(fsl_chan, c, width)                                  \
                 (((fsl_chan)->feature & FSL_DMA_BIG_ENDIAN) ?           \
-                        cpu_to_be##width(c) : cpu_to_le##width(c))
+                        (__force v##width)cpu_to_be##width(c) :         \
+                        (__force v##width)cpu_to_le##width(c))
 
 #endif  /* __DMA_FSLDMA_H */
diff --git a/drivers/dma/ioat_dca.c b/drivers/dma/ioat_dca.c
index 0fa8a98051a8..9e922760b7ff 100644
--- a/drivers/dma/ioat_dca.c
+++ b/drivers/dma/ioat_dca.c
@@ -98,7 +98,7 @@ struct ioat_dca_slot {
 
 struct ioat_dca_priv {
         void __iomem            *iobase;
-        void                    *dca_base;
+        void __iomem            *dca_base;
         int                      max_requesters;
         int                      requester_count;
         u8                       tag_map[IOAT_TAG_MAP_LEN];
@@ -338,7 +338,7 @@ static struct dca_ops ioat2_dca_ops = {
         .get_tag                = ioat2_dca_get_tag,
 };
 
-static int ioat2_dca_count_dca_slots(void *iobase, u16 dca_offset)
+static int ioat2_dca_count_dca_slots(void __iomem *iobase, u16 dca_offset)
 {
         int slots = 0;
         u32 req;
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 996d61f0d460..ca6d51efd8bb 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -401,7 +401,8 @@ static void ar_context_tasklet(unsigned long data)
 
         if (d->res_count == 0) {
                 size_t size, rest, offset;
-                dma_addr_t buffer_bus;
+                dma_addr_t start_bus;
+                void *start;
 
                 /*
                  * This descriptor is finished and we may have a
@@ -410,9 +411,9 @@ static void ar_context_tasklet(unsigned long data)
                  */
 
                 offset = offsetof(struct ar_buffer, data);
-                buffer_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
+                start = buffer = ab;
+                start_bus = le32_to_cpu(ab->descriptor.data_address) - offset;
 
-                buffer = ab;
                 ab = ab->next;
                 d = &ab->descriptor;
                 size = buffer + PAGE_SIZE - ctx->pointer;
@@ -427,7 +428,7 @@ static void ar_context_tasklet(unsigned long data)
                         buffer = handle_ar_packet(ctx, buffer);
 
                 dma_free_coherent(ohci->card.device, PAGE_SIZE,
-                                  buffer, buffer_bus);
+                                  start, start_bus);
                 ar_context_add_page(ctx);
         } else {
                 buffer = ctx->pointer;
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 99529e59a0b1..e6f1bda38940 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -736,6 +736,12 @@ fw_core_handle_response(struct fw_card *card, struct fw_packet *p)
                 break;
         }
 
+        /*
+         * The response handler may be executed while the request handler
+         * is still pending.  Cancel the request handler.
+         */
+        card->driver->cancel_packet(card, &t->packet);
+
         t->callback(card, rcode, data, data_length, t->callback_data);
 }
 EXPORT_SYMBOL(fw_core_handle_response);
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index d73a768e176e..f0b00ec1e47e 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -968,7 +968,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
                 size--;
         }
 
-        /* dump the report descriptor */
+        /* dump the report */
         dbg_hid("report %d (size %u) = ", n, size);
         for (i = 0; i < size; i++)
                 dbg_hid_line(" %02x", data[i]);
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 5a38fb27d69f..c3eb3f13e2ca 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -98,18 +98,16 @@ struct hidinput_key_translation {
 
 static struct hidinput_key_translation apple_fn_keys[] = {
         { KEY_BACKSPACE, KEY_DELETE },
-        { KEY_F1,       KEY_BRIGHTNESSDOWN,     APPLE_FLAG_FKEY },
-        { KEY_F2,       KEY_BRIGHTNESSUP,       APPLE_FLAG_FKEY },
-        { KEY_F3,       KEY_CYCLEWINDOWS,       APPLE_FLAG_FKEY }, /* Exposé */
-        { KEY_F4,       KEY_FN_F4,              APPLE_FLAG_FKEY }, /* Dashboard */
-        { KEY_F5,       KEY_FN_F5 },
-        { KEY_F6,       KEY_FN_F6 },
-        { KEY_F7,       KEY_BACK,               APPLE_FLAG_FKEY },
-        { KEY_F8,       KEY_PLAYPAUSE,          APPLE_FLAG_FKEY },
-        { KEY_F9,       KEY_FORWARD,            APPLE_FLAG_FKEY },
-        { KEY_F10,      KEY_MUTE,               APPLE_FLAG_FKEY },
-        { KEY_F11,      KEY_VOLUMEDOWN,         APPLE_FLAG_FKEY },
-        { KEY_F12,      KEY_VOLUMEUP,           APPLE_FLAG_FKEY },
+        { KEY_F1,       KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
+        { KEY_F2,       KEY_BRIGHTNESSUP,   APPLE_FLAG_FKEY },
+        { KEY_F3,       KEY_FN_F5,          APPLE_FLAG_FKEY }, /* Exposé */
+        { KEY_F4,       KEY_FN_F4,          APPLE_FLAG_FKEY }, /* Dashboard */
+        { KEY_F7,       KEY_PREVIOUSSONG,   APPLE_FLAG_FKEY },
+        { KEY_F8,       KEY_PLAYPAUSE,      APPLE_FLAG_FKEY },
+        { KEY_F9,       KEY_NEXTSONG,       APPLE_FLAG_FKEY },
+        { KEY_F10,      KEY_MUTE,           APPLE_FLAG_FKEY },
+        { KEY_F11,      KEY_VOLUMEDOWN,     APPLE_FLAG_FKEY },
+        { KEY_F12,      KEY_VOLUMEUP,       APPLE_FLAG_FKEY },
         { KEY_UP,       KEY_PAGEUP },
         { KEY_DOWN,     KEY_PAGEDOWN },
         { KEY_LEFT,     KEY_HOME },
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index b38e559b7a46..d95979f0e028 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -278,7 +278,7 @@ static int hid_submit_ctrl(struct hid_device *hid)
                 usbhid->urbctrl->pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);
                 maxpacket = usb_maxpacket(hid_to_usb_dev(hid), usbhid->urbctrl->pipe, 0);
                 if (maxpacket > 0) {
-                        padlen = (len + maxpacket - 1) / maxpacket;
+                        padlen = DIV_ROUND_UP(len, maxpacket);
                         padlen *= maxpacket;
                         if (padlen > usbhid->bufsize)
                                 padlen = usbhid->bufsize;
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index e6d05f6b1c1c..e29a057cbea2 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -345,6 +345,9 @@
 #define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
 #define USB_DEVICE_ID_N_S_HARMONY       0xc359
 
+#define USB_VENDOR_ID_NATSU             0x08b7
+#define USB_DEVICE_ID_NATSU_GAMEPAD     0x0001
+
 #define USB_VENDOR_ID_NEC               0x073e
 #define USB_DEVICE_ID_NEC_USB_GAME_PAD  0x0301
 
@@ -426,6 +429,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
         { USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING, HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },
+        { USB_VENDOR_ID_NATSU, USB_DEVICE_ID_NATSU_GAMEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_NEC, USB_DEVICE_ID_NEC_USB_GAME_PAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_RUMBLEPAD, HID_QUIRK_BADPAD },
         { USB_VENDOR_ID_TOPMAX, USB_DEVICE_ID_TOPMAX_COBRAPAD, HID_QUIRK_BADPAD },
@@ -624,7 +628,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_JIS, HID_QUIRK_APPLE_HAS_FN },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ANSI, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE | HID_QUIRK_APPLE_ISO_KEYBOARD },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_HF_JIS, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI, HID_QUIRK_APPLE_HAS_FN },
         { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO, HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_APPLE_ISO_KEYBOARD },
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 368879ff5d8c..4dc76bc45c9d 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -337,8 +337,9 @@ config SENSORS_IBMPEX
         help
           If you say yes here you get support for the temperature and
           power sensors in various IBM System X servers that support
-          PowerExecutive.  So far this includes the x3550, x3650, x3655,
-          x3755, and certain HS20 blades.
+          PowerExecutive.  So far this includes the x3350, x3550, x3650,
+          x3655, and x3755; the x3800, x3850, and x3950 models that have
+          PCI Express; and some of the HS2x, LS2x, and QS2x blades.
 
           This driver can also be built as a module.  If so, the module
           will be called ibmpex.
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c
index 9c9cdb0685e4..4e9b19c6732f 100644
--- a/drivers/hwmon/ibmpex.c
+++ b/drivers/hwmon/ibmpex.c
@@ -327,10 +327,14 @@ static int is_temp_sensor(const char *sensor_id, int len)
         return 0;
 }
 
-static int power_sensor_multiplier(const char *sensor_id, int len)
+static int power_sensor_multiplier(struct ibmpex_bmc_data *data,
+                                   const char *sensor_id, int len)
 {
         int i;
 
+        if (data->sensor_major == 2)
+                return 1000000;
+
         for (i = PEX_SENSOR_TYPE_LEN; i < len - 1; i++)
                 if (!memcmp(&sensor_id[i], watt_sensor_sig, PEX_MULT_LEN))
                         return 1000000;
@@ -398,14 +402,15 @@ static int ibmpex_find_sensors(struct ibmpex_bmc_data *data)
                         num_power++;
                         sensor_counter = num_power;
                         data->sensors[i].multiplier =
-                                power_sensor_multiplier(data->rx_msg_data,
-                                                     data->rx_msg_len);
+                                power_sensor_multiplier(data,
+                                                        data->rx_msg_data,
+                                                        data->rx_msg_len);
                 } else if (is_temp_sensor(data->rx_msg_data,
                                           data->rx_msg_len)) {
                         sensor_type = TEMP_SENSOR;
                         num_temp++;
                         sensor_counter = num_temp;
-                        data->sensors[i].multiplier = 1;
+                        data->sensors[i].multiplier = 1000;
                 } else
                         continue;
 
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 5c85670e2d16..f942ecdd47c8 100644
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -1367,7 +1367,8 @@ w83781d_isa_probe(struct platform_device *pdev)
 
         /* Reserve the ISA region */
         res = platform_get_resource(pdev, IORESOURCE_IO, 0);
-        if (!request_region(res->start, W83781D_EXTENT, "w83781d")) {
+        if (!request_region(res->start + W83781D_ADDR_REG_OFFSET, 2,
+                            "w83781d")) {
                 err = -EBUSY;
                 goto exit;
         }
@@ -1415,7 +1416,7 @@ w83781d_isa_probe(struct platform_device *pdev)
         device_remove_file(&pdev->dev, &dev_attr_name);
         kfree(data);
  exit_release_region:
-        release_region(res->start, W83781D_EXTENT);
+        release_region(res->start + W83781D_ADDR_REG_OFFSET, 2);
  exit:
         return err;
 }
@@ -1429,7 +1430,7 @@ w83781d_isa_remove(struct platform_device *pdev)
         sysfs_remove_group(&pdev->dev.kobj, &w83781d_group);
         sysfs_remove_group(&pdev->dev.kobj, &w83781d_group_opt);
         device_remove_file(&pdev->dev, &dev_attr_name);
-        release_region(data->client.addr, W83781D_EXTENT);
+        release_region(data->client.addr + W83781D_ADDR_REG_OFFSET, 2);
         kfree(data);
 
         return 0;
@@ -1797,8 +1798,17 @@ w83781d_isa_found(unsigned short address)
 {
         int val, save, found = 0;
 
-        if (!request_region(address, W83781D_EXTENT, "w83781d"))
+        /* We have to request the region in two parts because some
+           boards declare base+4 to base+7 as a PNP device */
+        if (!request_region(address, 4, "w83781d")) {
+                pr_debug("w83781d: Failed to request low part of region\n");
                 return 0;
+        }
+        if (!request_region(address + 4, 4, "w83781d")) {
+                pr_debug("w83781d: Failed to request high part of region\n");
+                release_region(address, 4);
+                return 0;
+        }
 
 #define REALLY_SLOW_IO
         /* We need the timeouts for at least some W83781D-like
@@ -1871,7 +1881,8 @@ w83781d_isa_found(unsigned short address)
                         val == 0x30 ? "W83782D" : "W83781D", (int)address);
 
  release:
-        release_region(address, W83781D_EXTENT);
+        release_region(address + 4, 4);
+        release_region(address, 4);
         return found;
 }
 
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 476b0bb72d6c..5fa9c3c67e0c 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -100,7 +100,7 @@ config I2C_AU1550
 
 config I2C_BLACKFIN_TWI
         tristate "Blackfin TWI I2C support"
-        depends on BF534 || BF536 || BF537 || BF54x
+        depends on BF534 || BF536 || BF537
         help
           This is the TWI I2C device driver for Blackfin 534/536/537/54x.
           This driver can also be built as a module.  If so, the module
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index da6639707ea3..7ba31770d773 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -128,6 +128,8 @@ struct omap_i2c_dev {
         size_t                  buf_len;
         struct i2c_adapter      adapter;
         unsigned                rev1:1;
+        unsigned                idle:1;
+        u16                     iestate;        /* Saved interrupt register */
 };
 
 static inline void omap_i2c_write_reg(struct omap_i2c_dev *i2c_dev,
@@ -174,18 +176,30 @@ static void omap_i2c_put_clocks(struct omap_i2c_dev *dev)
         }
 }
 
-static void omap_i2c_enable_clocks(struct omap_i2c_dev *dev)
+static void omap_i2c_unidle(struct omap_i2c_dev *dev)
 {
         if (dev->iclk != NULL)
                 clk_enable(dev->iclk);
         clk_enable(dev->fclk);
+        if (dev->iestate)
+                omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, dev->iestate);
+        dev->idle = 0;
 }
 
-static void omap_i2c_disable_clocks(struct omap_i2c_dev *dev)
+static void omap_i2c_idle(struct omap_i2c_dev *dev)
 {
+        u16 iv;
+
+        dev->idle = 1;
+        dev->iestate = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
+        omap_i2c_write_reg(dev, OMAP_I2C_IE_REG, 0);
+        if (dev->rev1)
+                iv = omap_i2c_read_reg(dev, OMAP_I2C_IV_REG);   /* Read clears */
+        else
+                omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, dev->iestate);
+        clk_disable(dev->fclk);
         if (dev->iclk != NULL)
                 clk_disable(dev->iclk);
-        clk_disable(dev->fclk);
 }
 
 static int omap_i2c_init(struct omap_i2c_dev *dev)
@@ -360,7 +374,7 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
         int i;
         int r;
 
-        omap_i2c_enable_clocks(dev);
+        omap_i2c_unidle(dev);
 
         if ((r = omap_i2c_wait_for_bb(dev)) < 0)
                 goto out;
@@ -374,7 +388,7 @@ omap_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
         if (r == 0)
                 r = num;
 out:
-        omap_i2c_disable_clocks(dev);
+        omap_i2c_idle(dev);
         return r;
 }
 
@@ -403,6 +417,9 @@ omap_i2c_rev1_isr(int this_irq, void *dev_id)
         struct omap_i2c_dev *dev = dev_id;
         u16 iv, w;
 
+        if (dev->idle)
+                return IRQ_NONE;
+
         iv = omap_i2c_read_reg(dev, OMAP_I2C_IV_REG);
         switch (iv) {
         case 0x00:      /* None */
@@ -457,6 +474,9 @@ omap_i2c_isr(int this_irq, void *dev_id)
         u16 stat, w;
         int count = 0;
 
+        if (dev->idle)
+                return IRQ_NONE;
+
         bits = omap_i2c_read_reg(dev, OMAP_I2C_IE_REG);
         while ((stat = (omap_i2c_read_reg(dev, OMAP_I2C_STAT_REG))) & bits) {
                 dev_dbg(dev->dev, "IRQ (ISR = 0x%04x)\n", stat);
@@ -575,7 +595,7 @@ omap_i2c_probe(struct platform_device *pdev)
         if ((r = omap_i2c_get_clocks(dev)) != 0)
                 goto err_free_mem;
 
-        omap_i2c_enable_clocks(dev);
+        omap_i2c_unidle(dev);
 
         if (cpu_is_omap15xx())
                 dev->rev1 = omap_i2c_read_reg(dev, OMAP_I2C_REV_REG) < 0x20;
@@ -610,7 +630,7 @@ omap_i2c_probe(struct platform_device *pdev)
                 goto err_free_irq;
         }
 
-        omap_i2c_disable_clocks(dev);
+        omap_i2c_idle(dev);
 
         return 0;
 
@@ -618,7 +638,7 @@ err_free_irq:
         free_irq(dev->irq, dev);
 err_unuse_clocks:
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
-        omap_i2c_disable_clocks(dev);
+        omap_i2c_idle(dev);
         omap_i2c_put_clocks(dev);
 err_free_mem:
         platform_set_drvdata(pdev, NULL);
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index fd84b2a36338..8b645c6b2cb5 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -489,8 +489,8 @@ EXPORT_SYMBOL(i2c_add_adapter);
  * Context: can sleep
  *
  * This routine is used to declare an I2C adapter when its bus number
- * matters.  Example: for I2C adapters from system-on-chip CPUs, or
- * otherwise built in to the system's mainboard, and where i2c_board_info
+ * matters.  For example, use it for I2C adapters from system-on-chip CPUs,
+ * or otherwise built in to the system's mainboard, and where i2c_board_info
  * is used to properly configure I2C devices.
  *
  * If no devices have pre-been declared for this bus, then be sure to
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 43a70e91363e..be9ff7334c52 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -46,3 +46,5 @@ static int __init ide_arm_init(void)
 }
 
 module_init(ide_arm_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index e79bf8f9b7db..c8ffbaf29a88 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -1067,3 +1067,5 @@ static void cris_dma_start(ide_drive_t *drive)
 }
 
 module_init(init_e100_ide);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 520aec075700..4108ec4ffa7f 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -110,6 +110,7 @@ static int __init h8300_ide_init(void)
         ide_init_port_data(hwif, index);
         ide_init_port_hw(hwif, &hw);
         hwif_setup(hwif);
+        hwif->host_flags = IDE_HFLAG_NO_IO_32BIT;
         printk(KERN_INFO "ide%d: H8/300 generic IDE interface\n", index);
 
         idx[0] = index;
@@ -125,3 +126,5 @@ out_busy:
 }
 
 module_init(h8300_ide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index c419266234a7..e77cee0e5d65 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -595,6 +595,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)
 
         /*
          * FIXME:
+         * - change master/slave IDENTIFY order
          * - force bit13 (80c cable present) check also for !ivb devices
          *   (unless the slave device is pre-ATA3)
          */
@@ -657,7 +658,7 @@ int ide_driveid_update(ide_drive_t *drive)
                 local_irq_restore(flags);
                 return 0;
         }
-        ata_input_data(drive, id, SECTOR_WORDS);
+        hwif->ata_input_data(drive, id, SECTOR_WORDS);
         (void)ide_read_status(drive);   /* clear drive IRQ */
         local_irq_enable();
         local_irq_restore(flags);
diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 29e2c9719c30..7031a8dcf692 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -122,7 +122,6 @@ static struct ide_pio_info {
         const char      *name;
         int             pio;
 } ide_pio_blacklist [] = {
-/*      { "Conner Peripherals 1275MB - CFS1275A", 4 }, */
         { "Conner Peripherals 540MB - CFS540A", 3 },
 
         { "WDC AC2700",  3 },
@@ -138,10 +137,8 @@ static struct ide_pio_info {
         { "WDC AC1170",  1 },
         { "WDC AC1210",  1 },
         { "WDC AC280",   0 },
-/*      { "WDC AC21000", 4 }, */
         { "WDC AC31000", 3 },
         { "WDC AC31200", 3 },
-/*      { "WDC AC31600", 4 }, */
 
         { "Maxtor 7131 AT", 1 },
         { "Maxtor 7171 AT", 1 },
@@ -155,13 +152,6 @@ static struct ide_pio_info {
         { "SAMSUNG SHD-3122A", 1 },
         { "SAMSUNG SHD-3172A", 1 },
 
-/*      { "ST51080A", 4 },
- *      { "ST51270A", 4 },
- *      { "ST31220A", 4 },
- *      { "ST31640A", 4 },
- *      { "ST32140A", 4 },
- *      { "ST3780A",  4 },
- */
         { "ST5660A",  3 },
         { "ST3660A",  3 },
         { "ST3630A",  3 },
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index b163b2e52212..c14bb5380c25 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -86,3 +86,5 @@ static void __exit pnpide_exit(void)
 
 module_init(pnpide_init);
 module_exit(pnpide_exit);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 194ecb0049eb..47a114927c31 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -774,9 +774,10 @@ static int ide_probe_port(ide_hwif_t *hwif)
                 printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);
 
         /*
-         * Need to probe slave device first to make it release PDIAG-.
+         * Second drive should only exist if first drive was found,
+         * but a lot of cdrom drives are configured as single slaves.
          */
-        for (unit = MAX_DRIVES - 1; unit >= 0; unit--) {
+        for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 ide_drive_t *drive = &hwif->drives[unit];
                 drive->dn = (hwif->channel ? 2 : 0) + unit;
                 (void) probe_for_drive(drive);
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 43e0e0557776..0598ecfd5f37 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -3765,11 +3765,6 @@ static int ide_tape_probe(ide_drive_t *drive)
         g->fops = &idetape_block_ops;
         ide_register_region(g);
 
-        printk(KERN_WARNING "It is possible that this driver does not have any"
-                " users anymore and, as a result, it will be REMOVED soon."
-                " Please notify Bart <bzolnier@gmail.com> or Boris"
-                " <petkovbb@gmail.com> in case you still need it.\n");
-
         return 0;
 
 out_free_tape:
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 0518a2e948cf..4c86a8d84b4c 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -423,6 +423,25 @@ void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
 }
 
 /*
+ * We got an interrupt on a task_in case, but no errors and no DRQ.
+ *
+ * It might be a spurious irq (shared irq), but it might be a
+ * command that had no output.
+ */
+static ide_startstop_t task_in_unexpected(ide_drive_t *drive, struct request *rq, u8 stat)
+{
+        /* Command all done? */
+        if (OK_STAT(stat, READY_STAT, BUSY_STAT)) {
+                task_end_request(drive, rq, stat);
+                return ide_stopped;
+        }
+
+        /* Assume it was a spurious irq */
+        ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
+        return ide_started;
+}
+
+/*
  * Handler for command with PIO data-in phase (Read/Read Multiple).
  */
 static ide_startstop_t task_in_intr(ide_drive_t *drive)
@@ -431,18 +450,17 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)
         struct request *rq = HWGROUP(drive)->rq;
         u8 stat = ide_read_status(drive);
 
-        /* new way for dealing with premature shared PCI interrupts */
-        if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {
-                if (stat & (ERR_STAT | DRQ_STAT))
-                        return task_error(drive, rq, __FUNCTION__, stat);
-                /* No data yet, so wait for another IRQ. */
-                ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
-                return ide_started;
-        }
+        /* Error? */
+        if (stat & ERR_STAT)
+                return task_error(drive, rq, __FUNCTION__, stat);
+
+        /* Didn't want any data? Odd. */
+        if (!(stat & DRQ_STAT))
+                return task_in_unexpected(drive, rq, stat);
 
         ide_pio_datablock(drive, rq, 0);
 
-        /* If it was the last datablock check status and finish transfer. */
+        /* Are we done? Check status and finish transfer. */
         if (!hwif->nleft) {
                 stat = wait_drive_not_busy(drive);
                 if (!OK_STAT(stat, 0, BAD_STAT))
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9976f9d627d4..fc69fe2e3ec0 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1258,7 +1258,7 @@ static int __init ide_setup(char *s)
                 drive = &hwif->drives[unit];
                 if (strncmp(s + 4, "ide-", 4) == 0) {
                         strlcpy(drive->driver_req, s + 4, sizeof(drive->driver_req));
-                        goto done;
+                        goto obsolete_option;
                 }
                 switch (match_parm(&s[3], hd_words, vals, 3)) {
                         case -1: /* "none" */
@@ -1290,13 +1290,13 @@ static int __init ide_setup(char *s)
                                 goto done;
                         case -12: /* "remap" */
                                 drive->remap_0_to_1 = 1;
-                                goto done;
+                                goto obsolete_option;
                         case -13: /* "remap63" */
                                 drive->sect0 = 63;
-                                goto done;
+                                goto obsolete_option;
                         case -14: /* "scsi" */
                                 drive->scsi = 1;
-                                goto done;
+                                goto obsolete_option;
                         case 3: /* cyl,head,sect */
                                 drive->media    = ide_disk;
                                 drive->ready_stat = READY_STAT;
@@ -1370,32 +1370,32 @@ static int __init ide_setup(char *s)
 #ifdef CONFIG_BLK_DEV_ALI14XX
                         case -17: /* "ali14xx" */
                                 probe_ali14xx = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_UMC8672
                         case -16: /* "umc8672" */
                                 probe_umc8672 = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_DTC2278
                         case -15: /* "dtc2278" */
                                 probe_dtc2278 = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_CMD640
                         case -14: /* "cmd640_vlb" */
                                 cmd640_vlb = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_HT6560B
                         case -13: /* "ht6560b" */
                                 probe_ht6560b = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_QD65XX
                         case -12: /* "qd65xx" */
                                 probe_qd65xx = 1;
-                                goto done;
+                                goto obsolete_option;
 #endif
 #ifdef CONFIG_BLK_DEV_4DRIVES
                         case -11: /* "four" drives on one set of ports */
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 50ffa871d5e9..fdd3791e465f 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -241,3 +241,5 @@ fail_base2:
 }
 
 module_init(buddha_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 8949ce71bddc..e950afa5939c 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -93,3 +93,5 @@ static int __init falconide_init(void)
 }
 
 module_init(falconide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index b7d81090d5da..e3b4638cc883 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -195,3 +195,5 @@ found:
 }
 
 module_init(gayle_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 9a79098d9eb4..eaf5dbe58bc2 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -137,3 +137,5 @@ static int __init macide_init(void)
 }
 
 module_init(macide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 1381b91bc316..2da28759686e 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -153,3 +153,5 @@ static int __init q40ide_init(void)
 }
 
 module_init(q40ide_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index ec667982809c..29fbc5ead03b 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -881,3 +881,5 @@ module_param_named(probe_vlb, cmd640_vlb, bool, 0);
 MODULE_PARM_DESC(probe_vlb, "probe for VLB version of CMD640 chipset");
 
 module_init(cmd640x_init);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 38fbfb8d5445..ebaba01c7551 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -853,3 +853,5 @@ static int __init mpc8xx_ide_probe(void)
 }
 
 module_init(mpc8xx_ide_probe);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 78c9eeb85634..d9ca52e6cdab 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1771,3 +1771,5 @@ static int __devinit pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
 
 module_init(pmac_ide_probe);
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index a58ad8a470f9..781ea5950373 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -154,7 +154,7 @@ static void addr_send_arp(struct sockaddr_in *dst_in)
 {
         struct rtable *rt;
         struct flowi fl;
-        u32 dst_ip = dst_in->sin_addr.s_addr;
+        __be32 dst_ip = dst_in->sin_addr.s_addr;
 
         memset(&fl, 0, sizeof fl);
         fl.nl_u.ip4_u.daddr = dst_ip;
@@ -169,8 +169,8 @@ static int addr_resolve_remote(struct sockaddr_in *src_in,
                                struct sockaddr_in *dst_in,
                                struct rdma_dev_addr *addr)
 {
-        u32 src_ip = src_in->sin_addr.s_addr;
-        u32 dst_ip = dst_in->sin_addr.s_addr;
+        __be32 src_ip = src_in->sin_addr.s_addr;
+        __be32 dst_ip = dst_in->sin_addr.s_addr;
         struct flowi fl;
         struct rtable *rt;
         struct neighbour *neigh;
@@ -257,7 +257,7 @@ static int addr_resolve_local(struct sockaddr_in *src_in,
                               struct rdma_dev_addr *addr)
 {
         struct net_device *dev;
-        u32 src_ip = src_in->sin_addr.s_addr;
+        __be32 src_ip = src_in->sin_addr.s_addr;
         __be32 dst_ip = dst_in->sin_addr.s_addr;
         int ret;
 
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index 4df405157086..faa7ce318a6d 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -393,7 +393,7 @@ static int cm_alloc_id(struct cm_id_private *cm_id_priv)
                 spin_unlock_irqrestore(&cm.lock, flags);
         } while( (ret == -EAGAIN) && idr_pre_get(&cm.local_id_table, GFP_KERNEL) );
 
-        cm_id_priv->id.local_id = (__force __be32) (id ^ cm.random_id_operand);
+        cm_id_priv->id.local_id = (__force __be32)id ^ cm.random_id_operand;
         return ret;
 }
 
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index 34507daaf9b6..d81c156a22b4 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -168,15 +168,15 @@ struct cma_work {
 union cma_ip_addr {
         struct in6_addr ip6;
         struct {
-                __u32 pad[3];
-                __u32 addr;
+                __be32 pad[3];
+                __be32 addr;
         } ip4;
 };
 
 struct cma_hdr {
         u8 cma_version;
         u8 ip_version;  /* IP version: 7:4 */
-        __u16 port;
+        __be16 port;
         union cma_ip_addr src_addr;
         union cma_ip_addr dst_addr;
 };
@@ -186,8 +186,8 @@ struct sdp_hh {
         u8 sdp_version; /* Major version: 7:4 */
         u8 ip_version;  /* IP version: 7:4 */
         u8 sdp_specific1[10];
-        __u16 port;
-        __u16 sdp_specific2;
+        __be16 port;
+        __be16 sdp_specific2;
         union cma_ip_addr src_addr;
         union cma_ip_addr dst_addr;
 };
@@ -663,7 +663,7 @@ static inline int cma_any_port(struct sockaddr *addr)
 }
 
 static int cma_get_net_info(void *hdr, enum rdma_port_space ps,
-                            u8 *ip_ver, __u16 *port,
+                            u8 *ip_ver, __be16 *port,
                             union cma_ip_addr **src, union cma_ip_addr **dst)
 {
         switch (ps) {
@@ -695,7 +695,7 @@ static int cma_get_net_info(void *hdr, enum rdma_port_space ps,
 
 static void cma_save_net_info(struct rdma_addr *addr,
                               struct rdma_addr *listen_addr,
-                              u8 ip_ver, __u16 port,
+                              u8 ip_ver, __be16 port,
                               union cma_ip_addr *src, union cma_ip_addr *dst)
 {
         struct sockaddr_in *listen4, *ip4;
@@ -996,7 +996,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
         struct rdma_cm_id *id;
         struct rdma_route *rt;
         union cma_ip_addr *src, *dst;
-        __u16 port;
+        __be16 port;
         u8 ip_ver;
 
         if (cma_get_net_info(ib_event->private_data, listen_id->ps,
@@ -1043,7 +1043,7 @@ static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,
         struct rdma_id_private *id_priv;
         struct rdma_cm_id *id;
         union cma_ip_addr *src, *dst;
-        __u16 port;
+        __be16 port;
         u8 ip_ver;
         int ret;
 
@@ -1165,7 +1165,7 @@ static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,
 {
         struct cma_hdr *cma_data, *cma_mask;
         struct sdp_hh *sdp_data, *sdp_mask;
-        __u32 ip4_addr;
+        __be32 ip4_addr;
         struct in6_addr ip6_addr;
 
         memset(compare, 0, sizeof *compare);
@@ -1181,12 +1181,12 @@ static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,
                         sdp_set_ip_ver(sdp_data, 4);
                         sdp_set_ip_ver(sdp_mask, 0xF);
                         sdp_data->dst_addr.ip4.addr = ip4_addr;
-                        sdp_mask->dst_addr.ip4.addr = ~0;
+                        sdp_mask->dst_addr.ip4.addr = htonl(~0);
                 } else {
                         cma_set_ip_ver(cma_data, 4);
                         cma_set_ip_ver(cma_mask, 0xF);
                         cma_data->dst_addr.ip4.addr = ip4_addr;
-                        cma_mask->dst_addr.ip4.addr = ~0;
+                        cma_mask->dst_addr.ip4.addr = htonl(~0);
                 }
                 break;
         case AF_INET6:
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 320f2b6ddee6..99f2f2a46bf7 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -1745,7 +1745,7 @@ int iwch_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
 
         /* bind QP to EP and move to RTS */
         attrs.mpa_attr = ep->mpa_attr;
-        attrs.max_ird = ep->ord;
+        attrs.max_ird = ep->ird;
         attrs.max_ord = ep->ord;
         attrs.llp_stream_handle = ep;
         attrs.next_state = IWCH_QP_STATE_RTS;
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 39adb267fb15..0bef878e0f65 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -40,6 +40,7 @@
 #include <linux/tcp.h>
 #include <linux/init.h>
 #include <linux/if_arp.h>
+#include <linux/if_vlan.h>
 #include <linux/notifier.h>
 #include <linux/net.h>
 #include <linux/types.h>
@@ -1072,7 +1073,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
         ts = current_kernel_time();
         cm_node->tcp_cntxt.loc_seq_num = htonl(ts.tv_nsec);
         cm_node->tcp_cntxt.mss = nesvnic->max_frame_size - sizeof(struct iphdr) -
-                        sizeof(struct tcphdr) - ETH_HLEN;
+                        sizeof(struct tcphdr) - ETH_HLEN - VLAN_HLEN;
         cm_node->tcp_cntxt.rcv_nxt = 0;
         /* get a unique session ID , add thread_id to an upcounter to handle race */
         atomic_inc(&cm_core->node_cnt);
diff --git a/drivers/input/apm-power.c b/drivers/input/apm-power.c
index c36d110b349a..7d61a9660806 100644
--- a/drivers/input/apm-power.c
+++ b/drivers/input/apm-power.c
@@ -63,8 +63,6 @@ static int apmpower_connect(struct input_handler *handler,
         handle->handler = handler;
         handle->name = "apm-power";
 
-        handler->private = handle;
-
         error = input_register_handle(handle);
         if (error) {
                 printk(KERN_ERR
@@ -87,11 +85,10 @@ static int apmpower_connect(struct input_handler *handler,
         return 0;
 }
 
-static void apmpower_disconnect(struct input_handle *handler)
+static void apmpower_disconnect(struct input_handle *handle)
 {
-        struct input_handle *handle = handler->private;
-
         input_close_device(handle);
+        input_unregister_handle(handle);
         kfree(handle);
 }
 
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 0727b0a12557..b32984bc516f 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -124,6 +124,7 @@ static void evdev_free(struct device *dev)
 {
         struct evdev *evdev = container_of(dev, struct evdev, dev);
 
+        input_put_device(evdev->handle.dev);
         kfree(evdev);
 }
 
@@ -893,7 +894,7 @@ static int evdev_connect(struct input_handler *handler, struct input_dev *dev,
         evdev->exist = 1;
         evdev->minor = minor;
 
-        evdev->handle.dev = dev;
+        evdev->handle.dev = input_get_device(dev);
         evdev->handle.name = evdev->name;
         evdev->handle.handler = handler;
         evdev->handle.private = evdev;
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 22b2789ef58a..65d7077a75a1 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -171,6 +171,7 @@ static void joydev_free(struct device *dev)
 {
         struct joydev *joydev = container_of(dev, struct joydev, dev);
 
+        input_put_device(joydev->handle.dev);
         kfree(joydev);
 }
 
@@ -750,7 +751,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
         joydev->minor = minor;
 
         joydev->exist = 1;
-        joydev->handle.dev = dev;
+        joydev->handle.dev = input_get_device(dev);
         joydev->handle.name = joydev->name;
         joydev->handle.handler = handler;
         joydev->handle.private = joydev;
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 6224c2fb3b65..4e651c11c1da 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -50,9 +50,9 @@
 #define KPKDI           0x0048
 
 /* bit definitions */
-#define KPC_MKRN(n)     ((((n) & 0x7) - 1) << 26) /* matrix key row number */
-#define KPC_MKCN(n)     ((((n) & 0x7) - 1) << 23) /* matrix key column number */
-#define KPC_DKN(n)      ((((n) & 0x7) - 1) << 6)  /* direct key number */
+#define KPC_MKRN(n)     ((((n) - 1) & 0x7) << 26) /* matrix key row number */
+#define KPC_MKCN(n)     ((((n) - 1) & 0x7) << 23) /* matrix key column number */
+#define KPC_DKN(n)      ((((n) - 1) & 0x7) << 6)  /* direct key number */
 
 #define KPC_AS          (0x1 << 30)  /* Automatic Scan bit */
 #define KPC_ASACT       (0x1 << 29)  /* Automatic Scan on Activity */
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 4833b1a82623..5511ef006a66 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -1,7 +1,7 @@
 /*
  *  Cobalt button interface driver.
  *
- *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2007-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <linux/init.h>
 #include <linux/input-polldev.h>
@@ -55,7 +55,7 @@ static void handle_buttons(struct input_polled_dev *dev)
         status = ~readl(bdev->reg) >> 24;
 
         for (i = 0; i < ARRAY_SIZE(bdev->keymap); i++) {
-                if (status & (1UL << i)) {
+                if (status & (1U << i)) {
                         if (++bdev->count[i] == BUTTONS_COUNT_THRESHOLD) {
                                 input_event(input, EV_MSC, MSC_SCAN, i);
                                 input_report_key(input, bdev->keymap[i], 1);
@@ -97,16 +97,16 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
         input->name = "Cobalt buttons";
         input->phys = "cobalt/input0";
         input->id.bustype = BUS_HOST;
-        input->cdev.dev = &pdev->dev;
+        input->dev.parent = &pdev->dev;
 
-        input->keycode = pdev->keymap;
-        input->keycodemax = ARRAY_SIZE(pdev->keymap);
+        input->keycode = bdev->keymap;
+        input->keycodemax = ARRAY_SIZE(bdev->keymap);
         input->keycodesize = sizeof(unsigned short);
 
         input_set_capability(input, EV_MSC, MSC_SCAN);
         __set_bit(EV_KEY, input->evbit);
-        for (i = 0; i < ARRAY_SIZE(buttons_map); i++)
-                __set_bit(input->keycode[i], input->keybit);
+        for (i = 0; i < ARRAY_SIZE(cobalt_map); i++)
+                __set_bit(bdev->keymap[i], input->keybit);
         __clear_bit(KEY_RESERVED, input->keybit);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index d2ade7443b7d..798d84c44d03 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -25,6 +25,7 @@
 MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("ixp4xx beeper driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ixp4xx-beeper");
 
 static DEFINE_SPINLOCK(beep_lock);
 
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index b346a3b418ea..385e32bcf6a6 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -116,8 +116,8 @@ static void alps_process_packet(struct psmouse *psmouse)
         }
 
         if (priv->i->flags & ALPS_FW_BK_1) {
-                back = packet[2] & 4;
-                forward = packet[0] & 0x10;
+                back = packet[0] & 0x10;
+                forward = packet[2] & 4;
         }
 
         if (priv->i->flags & ALPS_FW_BK_2) {
@@ -483,6 +483,7 @@ int alps_init(struct psmouse *psmouse)
         dev2->id.vendor  = 0x0002;
         dev2->id.product = PSMOUSE_ALPS;
         dev2->id.version = 0x0000;
+        dev2->dev.parent = &psmouse->ps2dev.serio->dev;
 
         dev2->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
         dev2->relbit[BIT_WORD(REL_X)] |= BIT_MASK(REL_X) | BIT_MASK(REL_Y);
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index bbbe5e81adc1..b989748598ae 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -414,6 +414,7 @@ static void mousedev_free(struct device *dev)
 {
         struct mousedev *mousedev = container_of(dev, struct mousedev, dev);
 
+        input_put_device(mousedev->handle.dev);
         kfree(mousedev);
 }
 
@@ -865,7 +866,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev,
 
         mousedev->minor = minor;
         mousedev->exist = 1;
-        mousedev->handle.dev = dev;
+        mousedev->handle.dev = input_get_device(dev);
         mousedev->handle.name = mousedev->name;
         mousedev->handle.handler = handler;
         mousedev->handle.private = mousedev;
diff --git a/drivers/input/serio/i8042-snirm.h b/drivers/input/serio/i8042-snirm.h
new file mode 100644
index 000000000000..409a9341143d
--- /dev/null
+++ b/drivers/input/serio/i8042-snirm.h
@@ -0,0 +1,75 @@
+#ifndef _I8042_SNIRM_H
+#define _I8042_SNIRM_H
+
+#include <asm/sni.h>
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+/*
+ * Names.
+ */
+
+#define I8042_KBD_PHYS_DESC "onboard/serio0"
+#define I8042_AUX_PHYS_DESC "onboard/serio1"
+#define I8042_MUX_PHYS_DESC "onboard/serio%d"
+
+/*
+ * IRQs.
+ */
+static int i8042_kbd_irq;
+static int i8042_aux_irq;
+#define I8042_KBD_IRQ i8042_kbd_irq
+#define I8042_AUX_IRQ i8042_aux_irq
+
+static void __iomem *kbd_iobase;
+
+#define I8042_COMMAND_REG       (kbd_iobase + 0x64UL)
+#define I8042_DATA_REG          (kbd_iobase + 0x60UL)
+
+static inline int i8042_read_data(void)
+{
+        return readb(kbd_iobase + 0x60UL);
+}
+
+static inline int i8042_read_status(void)
+{
+        return readb(kbd_iobase + 0x64UL);
+}
+
+static inline void i8042_write_data(int val)
+{
+        writeb(val, kbd_iobase + 0x60UL);
+}
+
+static inline void i8042_write_command(int val)
+{
+        writeb(val, kbd_iobase + 0x64UL);
+}
+static inline int i8042_platform_init(void)
+{
+        /* RM200 is strange ... */
+        if (sni_brd_type == SNI_BRD_RM200) {
+                kbd_iobase = ioremap(0x16000000, 4);
+                i8042_kbd_irq = 33;
+                i8042_aux_irq = 44;
+        } else {
+                kbd_iobase = ioremap(0x14000000, 4);
+                i8042_kbd_irq = 1;
+                i8042_aux_irq = 12;
+        }
+        if (!kbd_iobase)
+                return -ENOMEM;
+
+        return 0;
+}
+
+static inline void i8042_platform_exit(void)
+{
+
+}
+
+#endif /* _I8042_SNIRM_H */
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 662e84482c26..60931aceb828 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -277,6 +277,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                         DMI_MATCH(DMI_PRODUCT_NAME, "M636/A737 platform"),
                 },
         },
+        {
+                .ident = "Lenovo 3000 n100",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "3000 N100"),
+                },
+        },
         { }
 };
 
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 2763394869d2..65a74cfc187b 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -1151,7 +1151,6 @@ static int __devinit i8042_setup_kbd(void)
 static int __devinit i8042_probe(struct platform_device *dev)
 {
         int error;
-        char param;
 
         error = i8042_controller_selftest();
         if (error)
@@ -1174,7 +1173,7 @@ static int __devinit i8042_probe(struct platform_device *dev)
         }
 #ifdef CONFIG_X86
         if (i8042_dritek) {
-                param = 0x90;
+                char param = 0x90;
                 error = i8042_command(&param, 0x1059);
                 if (error)
                         goto out_fail;
diff --git a/drivers/input/serio/i8042.h b/drivers/input/serio/i8042.h
index c972e5d03a3f..cbc1beb66574 100644
--- a/drivers/input/serio/i8042.h
+++ b/drivers/input/serio/i8042.h
@@ -18,6 +18,8 @@
 #include "i8042-jazzio.h"
 #elif defined(CONFIG_SGI_HAS_I8042)
 #include "i8042-ip22io.h"
+#elif defined(CONFIG_SNI_RM)
+#include "i8042-snirm.h"
 #elif defined(CONFIG_PPC)
 #include "i8042-ppcio.h"
 #elif defined(CONFIG_SPARC)
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index 6542edb6f76e..acf9830698cb 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -11,7 +11,7 @@
  *  Copyright (c) 2000 Daniel Egger             <egger@suse.de>
  *  Copyright (c) 2001 Frederic Lepied          <flepied@mandrakesoft.com>
  *  Copyright (c) 2004 Panagiotis Issaris       <panagiotis.issaris@mech.kuleuven.ac.be>
- *  Copyright (c) 2002-2007 Ping Cheng          <pingc@wacom.com>
+ *  Copyright (c) 2002-2008 Ping Cheng          <pingc@wacom.com>
  *
  *  ChangeLog:
  *      v0.1 (vp)  - Initial release
@@ -65,6 +65,7 @@
  *                 - and wacom_wac.c deals with Wacom specific code
  *                 - Support Intuos3 4x6
  *      v1.47 (pc) - Added support for Bamboo
+ *      v1.48 (pc) - Added support for Bamboo1, BambooFun, and Cintiq 12WX
  */
 
 /*
@@ -85,7 +86,7 @@
 /*
  * Version Information
  */
-#define DRIVER_VERSION "v1.47"
+#define DRIVER_VERSION "v1.48"
 #define DRIVER_AUTHOR "Vojtech Pavlik <vojtech@ucw.cz>"
 #define DRIVER_DESC "USB Wacom Graphire and Wacom Intuos tablet driver"
 #define DRIVER_LICENSE "GPL"
@@ -125,6 +126,7 @@ extern void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac
 extern void input_dev_pl(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_pt(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern void input_dev_mo(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
+extern void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac);
 extern __u16 wacom_le16_to_cpu(unsigned char *data);
 extern __u16 wacom_be16_to_cpu(unsigned char *data);
 extern struct wacom_features * get_wacom_feature(const struct usb_device_id *id);
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index d64b1ea136b3..41caaef8e2d7 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -171,6 +171,7 @@ void input_dev_i3s(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_0) |
                 BIT_MASK(BTN_1) | BIT_MASK(BTN_2) | BIT_MASK(BTN_3);
         input_set_abs_params(input_dev, ABS_RX, 0, 4096, 0, 0);
+        input_set_abs_params(input_dev, ABS_Z, -900, 899, 0, 0);
 }
 
 void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
@@ -180,6 +181,11 @@ void input_dev_i3(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
         input_set_abs_params(input_dev, ABS_RY, 0, 4096, 0, 0);
 }
 
+void input_dev_bee(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
+{
+        input_dev->keybit[BIT_WORD(BTN_LEFT)] |= BIT_MASK(BTN_8) | BIT_MASK(BTN_9);
+}
+
 void input_dev_i(struct input_dev *input_dev, struct wacom_wac *wacom_wac)
 {
         input_dev->evbit[0] |= BIT_MASK(EV_MSC) | BIT_MASK(EV_REL);
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c
index fc03ba256f4c..ffe33842143f 100644
--- a/drivers/input/tablet/wacom_wac.c
+++ b/drivers/input/tablet/wacom_wac.c
@@ -163,7 +163,9 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
         }
 
         id = STYLUS_DEVICE_ID;
-        if (data[1] & 0x80) { /* in prox */
+        if ((data[1] & 0x80) && ((data[1] & 0x07) || data[2] || data[3] || data[4]
+                        || data[5] || data[6] || (data[7] & 0x07))) {
+                /* in prox and not a pad data */
 
                 switch ((data[1] >> 5) & 3) {
 
@@ -233,7 +235,6 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                 if (data[7] & 0xf8) {
                         wacom_input_sync(wcombo); /* sync last event */
                         wacom->id[1] = 1;
-                        wacom->serial[1] = (data[7] & 0xf8);
                         wacom_report_key(wcombo, BTN_0, (data[7] & 0x40));
                         wacom_report_key(wcombo, BTN_4, (data[7] & 0x80));
                         rw = ((data[7] & 0x18) >> 3) - ((data[7] & 0x20) >> 3);
@@ -252,10 +253,9 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
                 }
                 break;
             case WACOM_MO:
-                if ((data[7] & 0xf8) || (data[8] & 0x80)) {
+                if ((data[7] & 0xf8) || (data[8] & 0xff)) {
                         wacom_input_sync(wcombo); /* sync last event */
                         wacom->id[1] = 1;
-                        wacom->serial[1] = (data[7] & 0xf8);
                         wacom_report_key(wcombo, BTN_0, (data[7] & 0x08));
                         wacom_report_key(wcombo, BTN_1, (data[7] & 0x20));
                         wacom_report_key(wcombo, BTN_4, (data[7] & 0x10));
@@ -434,10 +434,12 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                 wacom_report_key(wcombo, BTN_5, (data[6] & 0x02));
                 wacom_report_key(wcombo, BTN_6, (data[6] & 0x04));
                 wacom_report_key(wcombo, BTN_7, (data[6] & 0x08));
+                wacom_report_key(wcombo, BTN_8, (data[5] & 0x10));
+                wacom_report_key(wcombo, BTN_9, (data[6] & 0x10));
                 wacom_report_abs(wcombo, ABS_RX, ((data[1] & 0x1f) << 8) | data[2]);
                 wacom_report_abs(wcombo, ABS_RY, ((data[3] & 0x1f) << 8) | data[4]);
 
-                if((data[5] & 0x0f) | (data[6] & 0x0f) | (data[1] & 0x1f) |
+                if ((data[5] & 0x1f) | (data[6] & 0x1f) | (data[1] & 0x1f) |
                         data[2] | (data[3] & 0x1f) | data[4])
                         wacom_report_key(wcombo, wacom->tool[1], 1);
                 else
@@ -481,13 +483,11 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
                 if (data[1] & 0x02) {
                         /* Rotation packet */
                         if (wacom->features->type >= INTUOS3S) {
-                                /* I3 marker pen rotation reported as wheel
-                                 * due to valuator limitation
-                                 */
+                                /* I3 marker pen rotation */
                                 t = (data[6] << 3) | ((data[7] >> 5) & 7);
                                 t = (data[7] & 0x20) ? ((t > 900) ? ((t-1) / 2 - 1350) :
                                         ((t-1) / 2 + 450)) : (450 - t / 2) ;
-                                wacom_report_abs(wcombo, ABS_WHEEL, t);
+                                wacom_report_abs(wcombo, ABS_Z, t);
                         } else {
                                 /* 4D mouse rotation packet */
                                 t = (data[6] << 3) | ((data[7] >> 5) & 7);
@@ -558,6 +558,7 @@ int wacom_wac_irq(struct wacom_wac *wacom_wac, void *wcombo)
                 case INTUOS3:
                 case INTUOS3L:
                 case CINTIQ:
+                case WACOM_BEE:
                         return (wacom_intuos_irq(wacom_wac, wcombo));
                         break;
                 default:
@@ -577,6 +578,8 @@ void wacom_init_input_dev(struct input_dev *input_dev, struct wacom_wac *wacom_w
                 case GRAPHIRE:
                         input_dev_g(input_dev, wacom_wac);
                         break;
+                case WACOM_BEE:
+                        input_dev_bee(input_dev, wacom_wac);
                 case INTUOS3:
                 case INTUOS3L:
                 case CINTIQ:
@@ -607,12 +610,15 @@ 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 BambooFun 4x5", 9,  14760,  9225,  511, 63, WACOM_MO },
+        { "Wacom BambooFun 6x8", 9,  21648, 13530,  511, 63, WACOM_MO },
         { "Wacom Volito",        8,   5104,  3712,  511, 63, GRAPHIRE },
         { "Wacom PenStation2",   8,   3250,  2320,  255, 63, GRAPHIRE },
         { "Wacom Volito2 4x5",   8,   5104,  3712,  511, 63, GRAPHIRE },
         { "Wacom Volito2 2x3",   8,   3248,  2320,  511, 63, GRAPHIRE },
-        { "Wacom PenPartner2",   8,   3250,  2320,  255, 63, GRAPHIRE },
+        { "Wacom PenPartner2",   8,   3250,  2320,  511, 63, GRAPHIRE },
         { "Wacom Bamboo",        9,  14760,  9225,  511, 63, WACOM_MO },
+        { "Wacom Bamboo1",       8,   5104,  3712,  511, 63, GRAPHIRE },
         { "Wacom Intuos 4x5",   10,  12700, 10600, 1023, 31, INTUOS },
         { "Wacom Intuos 6x8",   10,  20320, 16240, 1023, 31, INTUOS },
         { "Wacom Intuos 9x12",  10,  30480, 24060, 1023, 31, INTUOS },
@@ -643,6 +649,7 @@ static struct wacom_features wacom_features[] = {
         { "Wacom Intuos3 6x11",  10, 54204, 31750, 1023, 63, INTUOS3 },
         { "Wacom Intuos3 4x6",   10, 31496, 19685, 1023, 63, INTUOS3S },
         { "Wacom Cintiq 21UX",   10, 87200, 65600, 1023, 63, CINTIQ },
+        { "Wacom Cintiq 12WX",   10, 53020, 33440, 1023, 63, WACOM_BEE },
         { "Wacom Intuos2 6x8",   10, 20320, 16240, 1023, 31, INTUOS },
         { }
 };
@@ -656,12 +663,15 @@ static struct usb_device_id wacom_ids[] = {
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x14) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x15) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x16) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x17) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x18) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x60) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x61) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x62) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x63) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x64) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x65) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x69) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x20) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x21) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x22) },
@@ -692,6 +702,7 @@ static struct usb_device_id wacom_ids[] = {
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB5) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xB7) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x3F) },
+        { USB_DEVICE(USB_VENDOR_ID_WACOM, 0xC6) },
         { USB_DEVICE(USB_VENDOR_ID_WACOM, 0x47) },
         { }
 };
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index a302e229bb8a..3342bc05847d 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -25,6 +25,7 @@ enum {
         INTUOS3,
         INTUOS3L,
         CINTIQ,
+        WACOM_BEE,
         WACOM_MO,
         MAX_TYPE
 };
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 58934a40f5ce..57a1c28bf122 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -213,7 +213,7 @@ static int ads7846_read12_ser(struct device *dev, unsigned command)
         struct ads7846          *ts = dev_get_drvdata(dev);
         struct ser_req          *req = kzalloc(sizeof *req, GFP_KERNEL);
         int                     status;
-        int                     sample;
+        int                     uninitialized_var(sample);
         int                     use_internal;
 
         if (!req)
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index 6c0a9c4761ee..4c0b05852cb6 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -49,13 +49,13 @@ static void gpio_led_set(struct led_classdev *led_cdev,
         if (led_dat->active_low)
                 level = !level;
 
-        /* setting GPIOs with I2C/etc requires a preemptible task context */
+        /* Setting GPIOs with I2C/etc requires a task context, and we don't
+         * seem to have a reliable way to know if we're already in one; so
+         * let's just assume the worst.
+         */
         if (led_dat->can_sleep) {
-                if (preempt_count()) {
-                        led_dat->new_level = level;
-                        schedule_work(&led_dat->work);
-                } else
-                        gpio_set_value_cansleep(led_dat->gpio, level);
+                led_dat->new_level = level;
+                schedule_work(&led_dat->work);
         } else
                 gpio_set_value(led_dat->gpio, level);
 }
@@ -79,6 +79,10 @@ static int gpio_led_probe(struct platform_device *pdev)
                 cur_led = &pdata->leds[i];
                 led_dat = &leds_data[i];
 
+                ret = gpio_request(cur_led->gpio, cur_led->name);
+                if (ret < 0)
+                        goto err;
+
                 led_dat->cdev.name = cur_led->name;
                 led_dat->cdev.default_trigger = cur_led->default_trigger;
                 led_dat->gpio = cur_led->gpio;
@@ -87,10 +91,6 @@ static int gpio_led_probe(struct platform_device *pdev)
                 led_dat->cdev.brightness_set = gpio_led_set;
                 led_dat->cdev.brightness = LED_OFF;
 
-                ret = gpio_request(led_dat->gpio, led_dat->cdev.name);
-                if (ret < 0)
-                        goto err;
-
                 gpio_direction_output(led_dat->gpio, led_dat->active_low);
 
                 INIT_WORK(&led_dat->work, gpio_led_work);
diff --git a/drivers/lguest/Makefile b/drivers/lguest/Makefile
index 5e8272d296d8..7d463c26124f 100644
--- a/drivers/lguest/Makefile
+++ b/drivers/lguest/Makefile
@@ -19,3 +19,11 @@ Beer:
         @for f in Preparation Guest Drivers Launcher Host Switcher Mastery; do echo "{==- $$f -==}"; make -s $$f; done; echo "{==-==}"
 Preparation Preparation! Guest Drivers Launcher Host Switcher Mastery:
         @sh ../../Documentation/lguest/extract $(PREFIX) `find ../../* -name '*.[chS]' -wholename '*lguest*'`
+Puppy:
+        @clear
+        @printf "      __  \n (___()'\`;\n /,    /\`\n \\\\\\\"--\\\\\\   \n"
+        @sleep 2; clear; printf "\n\n   Sit!\n\n"; sleep 1; clear
+        @printf "    __    \n   ()'\`;  \n   /\\|\` \n  /  |  \n(/_)_|_   \n"
+        @sleep 2; clear; printf "\n\n  Stand!\n\n"; sleep 1; clear
+        @printf "    __    \n   ()'\`;  \n   /\\|\` \n  /._.= \n /| /     \n(_\_)_    \n"
+        @sleep 2; clear; printf "\n\n  Good puppy!\n\n"; sleep 1; clear
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
index c632c08cbbdc..5eea4356d703 100644
--- a/drivers/lguest/core.c
+++ b/drivers/lguest/core.c
@@ -1,8 +1,6 @@
 /*P:400 This contains run_guest() which actually calls into the Host<->Guest
  * Switcher and analyzes the return, such as determining if the Guest wants the
- * Host to do something.  This file also contains useful helper routines, and a
- * couple of non-obvious setup and teardown pieces which were implemented after
- * days of debugging pain. :*/
+ * Host to do something.  This file also contains useful helper routines. :*/
 #include <linux/module.h>
 #include <linux/stringify.h>
 #include <linux/stddef.h>
@@ -49,8 +47,8 @@ static __init int map_switcher(void)
          * easy.
          */
 
-        /* We allocate an array of "struct page"s.  map_vm_area() wants the
-         * pages in this form, rather than just an array of pointers. */
+        /* We allocate an array of struct page pointers.  map_vm_area() wants
+         * this, rather than just an array of pages. */
         switcher_page = kmalloc(sizeof(switcher_page[0])*TOTAL_SWITCHER_PAGES,
                                 GFP_KERNEL);
         if (!switcher_page) {
@@ -172,7 +170,7 @@ void __lgread(struct lg_cpu *cpu, void *b, unsigned long addr, unsigned bytes)
         }
 }
 
-/* This is the write (copy into guest) version. */
+/* This is the write (copy into Guest) version. */
 void __lgwrite(struct lg_cpu *cpu, unsigned long addr, const void *b,
                unsigned bytes)
 {
@@ -209,9 +207,9 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)
                 if (cpu->break_out)
                         return -EAGAIN;
 
-                /* Check if there are any interrupts which can be delivered
-                 * now: if so, this sets up the hander to be executed when we
-                 * next run the Guest. */
+                /* Check if there are any interrupts which can be delivered now:
+                 * if so, this sets up the hander to be executed when we next
+                 * run the Guest. */
                 maybe_do_interrupt(cpu);
 
                 /* All long-lived kernel loops need to check with this horrible
@@ -246,8 +244,10 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user)
                 lguest_arch_handle_trap(cpu);
         }
 
+        /* Special case: Guest is 'dead' but wants a reboot. */
         if (cpu->lg->dead == ERR_PTR(-ERESTART))
                 return -ERESTART;
+
         /* The Guest is dead => "No such file or directory" */
         return -ENOENT;
 }
diff --git a/drivers/lguest/hypercalls.c b/drivers/lguest/hypercalls.c
index 0f2cb4fd7c69..54d66f05fefa 100644
--- a/drivers/lguest/hypercalls.c
+++ b/drivers/lguest/hypercalls.c
@@ -29,7 +29,7 @@
 #include "lg.h"
 
 /*H:120 This is the core hypercall routine: where the Guest gets what it wants.
- * Or gets killed.  Or, in the case of LHCALL_CRASH, both. */
+ * Or gets killed.  Or, in the case of LHCALL_SHUTDOWN, both. */
 static void do_hcall(struct lg_cpu *cpu, struct hcall_args *args)
 {
         switch (args->arg0) {
@@ -190,6 +190,13 @@ static void initialize(struct lg_cpu *cpu)
          * pagetable. */
         guest_pagetable_clear_all(cpu);
 }
+/*:*/
+
+/*M:013 If a Guest reads from a page (so creates a mapping) that it has never
+ * written to, and then the Launcher writes to it (ie. the output of a virtual
+ * device), the Guest will still see the old page.  In practice, this never
+ * happens: why would the Guest read a page which it has never written to?  But
+ * a similar scenario might one day bite us, so it's worth mentioning. :*/
 
 /*H:100
  * Hypercalls
@@ -227,7 +234,7 @@ void do_hypercalls(struct lg_cpu *cpu)
                  * However, if we are signalled or the Guest sends I/O to the
                  * Launcher, the run_guest() loop will exit without running the
                  * Guest.  When it comes back it would try to re-run the
-                 * hypercall. */
+                 * hypercall.  Finding that bug sucked. */
                 cpu->hcall = NULL;
         }
 }
diff --git a/drivers/lguest/interrupts_and_traps.c b/drivers/lguest/interrupts_and_traps.c
index 32e97c1858e5..0414ddf87587 100644
--- a/drivers/lguest/interrupts_and_traps.c
+++ b/drivers/lguest/interrupts_and_traps.c
@@ -144,7 +144,6 @@ void maybe_do_interrupt(struct lg_cpu *cpu)
         if (copy_from_user(&blk, cpu->lg->lguest_data->blocked_interrupts,
                            sizeof(blk)))
                 return;
-
         bitmap_andnot(blk, cpu->irqs_pending, blk, LGUEST_IRQS);
 
         /* Find the first interrupt. */
@@ -237,9 +236,9 @@ void free_interrupts(void)
                 clear_bit(syscall_vector, used_vectors);
 }
 
-/*H:220 Now we've got the routines to deliver interrupts, delivering traps
- * like page fault is easy.  The only trick is that Intel decided that some
- * traps should have error codes: */
+/*H:220 Now we've got the routines to deliver interrupts, delivering traps like
+ * page fault is easy.  The only trick is that Intel decided that some traps
+ * should have error codes: */
 static int has_err(unsigned int trap)
 {
         return (trap == 8 || (trap >= 10 && trap <= 14) || trap == 17);
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c
index 1b2ec0bf5eb1..2bc9bf7e88e5 100644
--- a/drivers/lguest/lguest_device.c
+++ b/drivers/lguest/lguest_device.c
@@ -1,10 +1,10 @@
 /*P:050 Lguest guests use a very simple method to describe devices.  It's a
- * series of device descriptors contained just above the top of normal
+ * series of device descriptors contained just above the top of normal Guest
  * memory.
  *
  * We use the standard "virtio" device infrastructure, which provides us with a
  * console, a network and a block driver.  Each one expects some configuration
- * information and a "virtqueue" mechanism to send and receive data. :*/
+ * information and a "virtqueue" or two to send and receive data. :*/
 #include <linux/init.h>
 #include <linux/bootmem.h>
 #include <linux/lguest_launcher.h>
@@ -53,7 +53,7 @@ struct lguest_device {
  * Device configurations
  *
  * The configuration information for a device consists of one or more
- * virtqueues, a feature bitmaks, and some configuration bytes.  The
+ * virtqueues, a feature bitmap, and some configuration bytes.  The
  * configuration bytes don't really matter to us: the Launcher sets them up, and
  * the driver will look at them during setup.
  *
@@ -179,7 +179,7 @@ struct lguest_vq_info
 };
 
 /* When the virtio_ring code wants to prod the Host, it calls us here and we
- * make a hypercall.  We hand the page number of the virtqueue so the Host
+ * make a hypercall.  We hand the physical address of the virtqueue so the Host
  * knows which virtqueue we're talking about. */
 static void lg_notify(struct virtqueue *vq)
 {
@@ -199,7 +199,8 @@ static void lg_notify(struct virtqueue *vq)
  * allocate its own pages and tell the Host where they are, but for lguest it's
  * simpler for the Host to simply tell us where the pages are.
  *
- * So we provide devices with a "find virtqueue and set it up" function. */
+ * So we provide drivers with a "find the Nth virtqueue and set it up"
+ * function. */
 static struct virtqueue *lg_find_vq(struct virtio_device *vdev,
                                     unsigned index,
                                     void (*callback)(struct virtqueue *vq))
diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
index 2221485b0773..645e6e040bfb 100644
--- a/drivers/lguest/lguest_user.c
+++ b/drivers/lguest/lguest_user.c
@@ -73,7 +73,7 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
         if (current != cpu->tsk)
                 return -EPERM;
 
-        /* If the guest is already dead, we indicate why */
+        /* If the Guest is already dead, we indicate why */
         if (lg->dead) {
                 size_t len;
 
@@ -88,7 +88,7 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
                 return len;
         }
 
-        /* If we returned from read() last time because the Guest notified,
+        /* If we returned from read() last time because the Guest sent I/O,
          * clear the flag. */
         if (cpu->pending_notify)
                 cpu->pending_notify = 0;
@@ -97,14 +97,20 @@ static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
         return run_guest(cpu, (unsigned long __user *)user);
 }
 
+/*L:025 This actually initializes a CPU.  For the moment, a Guest is only
+ * uniprocessor, so "id" is always 0. */
 static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip)
 {
+        /* We have a limited number the number of CPUs in the lguest struct. */
         if (id >= NR_CPUS)
                 return -EINVAL;
 
+        /* Set up this CPU's id, and pointer back to the lguest struct. */
         cpu->id = id;
         cpu->lg = container_of((cpu - id), struct lguest, cpus[0]);
         cpu->lg->nr_cpus++;
+
+        /* Each CPU has a timer it can set. */
         init_clockdev(cpu);
 
         /* We need a complete page for the Guest registers: they are accessible
@@ -120,11 +126,11 @@ static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip)
          * address. */
         lguest_arch_setup_regs(cpu, start_ip);
 
-        /* Initialize the queue for the waker to wait on */
+        /* Initialize the queue for the Waker to wait on */
         init_waitqueue_head(&cpu->break_wq);
 
         /* We keep a pointer to the Launcher task (ie. current task) for when
-         * other Guests want to wake this one (inter-Guest I/O). */
+         * other Guests want to wake this one (eg. console input). */
         cpu->tsk = current;
 
         /* We need to keep a pointer to the Launcher's memory map, because if
@@ -136,6 +142,7 @@ static int lg_cpu_start(struct lg_cpu *cpu, unsigned id, unsigned long start_ip)
          * when the same Guest runs on the same CPU twice. */
         cpu->last_pages = NULL;
 
+        /* No error == success. */
         return 0;
 }
 
@@ -182,17 +189,16 @@ static int initialize(struct file *file, const unsigned long __user *input)
         }
 
         /* Populate the easy fields of our "struct lguest" */
-        lg->mem_base = (void __user *)(long)args[0];
+        lg->mem_base = (void __user *)args[0];
         lg->pfn_limit = args[1];
 
-        /* This is the first cpu */
+        /* This is the first cpu (cpu 0) and it will start booting at args[3] */
         err = lg_cpu_start(&lg->cpus[0], 0, args[3]);
         if (err)
                 goto release_guest;
 
         /* Initialize the Guest's shadow page tables, using the toplevel
-         * address the Launcher gave us.  This allocates memory, so can
-         * fail. */
+         * address the Launcher gave us.  This allocates memory, so can fail. */
         err = init_guest_pagetable(lg, args[2]);
         if (err)
                 goto free_regs;
@@ -218,11 +224,16 @@ unlock:
 /*L:010 The first operation the Launcher does must be a write.  All writes
  * start with an unsigned long number: for the first write this must be
  * LHREQ_INITIALIZE to set up the Guest.  After that the Launcher can use
- * writes of other values to send interrupts. */
+ * writes of other values to send interrupts.
+ *
+ * Note that we overload the "offset" in the /dev/lguest file to indicate what
+ * CPU number we're dealing with.  Currently this is always 0, since we only
+ * support uniprocessor Guests, but you can see the beginnings of SMP support
+ * here. */
 static ssize_t write(struct file *file, const char __user *in,
                      size_t size, loff_t *off)
 {
-        /* Once the guest is initialized, we hold the "struct lguest" in the
+        /* Once the Guest is initialized, we hold the "struct lguest" in the
          * file private data. */
         struct lguest *lg = file->private_data;
         const unsigned long __user *input = (const unsigned long __user *)in;
@@ -230,6 +241,7 @@ static ssize_t write(struct file *file, const char __user *in,
         struct lg_cpu *uninitialized_var(cpu);
         unsigned int cpu_id = *off;
 
+        /* The first value tells us what this request is. */
         if (get_user(req, input) != 0)
                 return -EFAULT;
         input++;
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index a7f64a9d67e0..d93500f24fbb 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -2,8 +2,8 @@
  * previous encounters.  It's functional, and as neat as it can be in the
  * circumstances, but be wary, for these things are subtle and break easily.
  * The Guest provides a virtual to physical mapping, but we can neither trust
- * it nor use it: we verify and convert it here to point the hardware to the
- * actual Guest pages when running the Guest. :*/
+ * it nor use it: we verify and convert it here then point the CPU to the
+ * converted Guest pages when running the Guest. :*/
 
 /* Copyright (C) Rusty Russell IBM Corporation 2006.
  * GPL v2 and any later version */
@@ -106,6 +106,11 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr)
         BUG_ON(!(pgd_flags(gpgd) & _PAGE_PRESENT));
         return gpage + ((vaddr>>PAGE_SHIFT) % PTRS_PER_PTE) * sizeof(pte_t);
 }
+/*:*/
+
+/*M:014 get_pfn is slow; it takes the mmap sem and calls get_user_pages.  We
+ * could probably try to grab batches of pages here as an optimization
+ * (ie. pre-faulting). :*/
 
 /*H:350 This routine takes a page number given by the Guest and converts it to
  * an actual, physical page number.  It can fail for several reasons: the
@@ -113,8 +118,8 @@ static unsigned long gpte_addr(pgd_t gpgd, unsigned long vaddr)
  * and the page is read-only, or the write flag was set and the page was
  * shared so had to be copied, but we ran out of memory.
  *
- * This holds a reference to the page, so release_pte() is careful to
- * put that back. */
+ * This holds a reference to the page, so release_pte() is careful to put that
+ * back. */
 static unsigned long get_pfn(unsigned long virtpfn, int write)
 {
         struct page *page;
@@ -532,13 +537,13 @@ static void do_set_pte(struct lg_cpu *cpu, int idx,
  * all processes.  So when the page table above that address changes, we update
  * all the page tables, not just the current one.  This is rare.
  *
- * The benefit is that when we have to track a new page table, we can copy keep
- * all the kernel mappings.  This speeds up context switch immensely. */
+ * The benefit is that when we have to track a new page table, we can keep all
+ * the kernel mappings.  This speeds up context switch immensely. */
 void guest_set_pte(struct lg_cpu *cpu,
                    unsigned long gpgdir, unsigned long vaddr, pte_t gpte)
 {
-        /* Kernel mappings must be changed on all top levels.  Slow, but
-         * doesn't happen often. */
+        /* Kernel mappings must be changed on all top levels.  Slow, but doesn't
+         * happen often. */
         if (vaddr >= cpu->lg->kernel_address) {
                 unsigned int i;
                 for (i = 0; i < ARRAY_SIZE(cpu->lg->pgdirs); i++)
@@ -704,12 +709,11 @@ static __init void populate_switcher_pte_page(unsigned int cpu,
 /* We've made it through the page table code.  Perhaps our tired brains are
  * still processing the details, or perhaps we're simply glad it's over.
  *
- * If nothing else, note that all this complexity in juggling shadow page
- * tables in sync with the Guest's page tables is for one reason: for most
- * Guests this page table dance determines how bad performance will be.  This
- * is why Xen uses exotic direct Guest pagetable manipulation, and why both
- * Intel and AMD have implemented shadow page table support directly into
- * hardware.
+ * If nothing else, note that all this complexity in juggling shadow page tables
+ * in sync with the Guest's page tables is for one reason: for most Guests this
+ * page table dance determines how bad performance will be.  This is why Xen
+ * uses exotic direct Guest pagetable manipulation, and why both Intel and AMD
+ * have implemented shadow page table support directly into hardware.
  *
  * There is just one file remaining in the Host. */
 
diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
index 635187812d52..5126d5d9ea0e 100644
--- a/drivers/lguest/x86/core.c
+++ b/drivers/lguest/x86/core.c
@@ -17,6 +17,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
+/*P:450 This file contains the x86-specific lguest code.  It used to be all
+ * mixed in with drivers/lguest/core.c but several foolhardy code slashers
+ * wrestled most of the dependencies out to here in preparation for porting
+ * lguest to other architectures (see what I mean by foolhardy?).
+ *
+ * This also contains a couple of non-obvious setup and teardown pieces which
+ * were implemented after days of debugging pain. :*/
 #include <linux/kernel.h>
 #include <linux/start_kernel.h>
 #include <linux/string.h>
@@ -157,6 +164,8 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages)
  * also simplify copy_in_guest_info().  Note that we'd still need to restore
  * things when we exit to Launcher userspace, but that's fairly easy.
  *
+ * We could also try using this hooks for PGE, but that might be too expensive.
+ *
  * The hooks were designed for KVM, but we can also put them to good use. :*/
 
 /*H:040 This is the i386-specific code to setup and run the Guest.  Interrupts
@@ -182,7 +191,7 @@ void lguest_arch_run_guest(struct lg_cpu *cpu)
          * was doing. */
         run_guest_once(cpu, lguest_pages(raw_smp_processor_id()));
 
-        /* Note that the "regs" pointer contains two extra entries which are
+        /* Note that the "regs" structure contains two extra entries which are
          * not really registers: a trap number which says what interrupt or
          * trap made the switcher code come back, and an error code which some
          * traps set.  */
@@ -293,11 +302,10 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
                 break;
         case 14: /* We've intercepted a Page Fault. */
                 /* The Guest accessed a virtual address that wasn't mapped.
-                 * This happens a lot: we don't actually set up most of the
-                 * page tables for the Guest at all when we start: as it runs
-                 * it asks for more and more, and we set them up as
-                 * required. In this case, we don't even tell the Guest that
-                 * the fault happened.
+                 * This happens a lot: we don't actually set up most of the page
+                 * tables for the Guest at all when we start: as it runs it asks
+                 * for more and more, and we set them up as required. In this
+                 * case, we don't even tell the Guest that the fault happened.
                  *
                  * The errcode tells whether this was a read or a write, and
                  * whether kernel or userspace code. */
@@ -342,7 +350,7 @@ void lguest_arch_handle_trap(struct lg_cpu *cpu)
         if (!deliver_trap(cpu, cpu->regs->trapnum))
                 /* If the Guest doesn't have a handler (either it hasn't
                  * registered any yet, or it's one of the faults we don't let
-                 * it handle), it dies with a cryptic error message. */
+                 * it handle), it dies with this cryptic error message. */
                 kill_guest(cpu, "unhandled trap %li at %#lx (%#lx)",
                            cpu->regs->trapnum, cpu->regs->eip,
                            cpu->regs->trapnum == 14 ? cpu->arch.last_pagefault
@@ -375,8 +383,8 @@ void __init lguest_arch_host_init(void)
          * The only exception is the interrupt handlers in switcher.S: their
          * addresses are placed in a table (default_idt_entries), so we need to
          * update the table with the new addresses.  switcher_offset() is a
-         * convenience function which returns the distance between the builtin
-         * switcher code and the high-mapped copy we just made. */
+         * convenience function which returns the distance between the
+         * compiled-in switcher code and the high-mapped copy we just made. */
         for (i = 0; i < IDT_ENTRIES; i++)
                 default_idt_entries[i] += switcher_offset();
 
@@ -416,7 +424,7 @@ void __init lguest_arch_host_init(void)
                 state->guest_gdt_desc.address = (long)&state->guest_gdt;
 
                 /* We know where we want the stack to be when the Guest enters
-                 * the switcher: in pages->regs.  The stack grows upwards, so
+                 * the Switcher: in pages->regs.  The stack grows upwards, so
                  * we start it at the end of that structure. */
                 state->guest_tss.sp0 = (long)(&pages->regs + 1);
                 /* And this is the GDT entry to use for the stack: we keep a
@@ -513,8 +521,8 @@ int lguest_arch_init_hypercalls(struct lg_cpu *cpu)
 {
         u32 tsc_speed;
 
-        /* The pointer to the Guest's "struct lguest_data" is the only
-         * argument.  We check that address now. */
+        /* The pointer to the Guest's "struct lguest_data" is the only argument.
+         * We check that address now. */
         if (!lguest_address_ok(cpu->lg, cpu->hcall->arg1,
                                sizeof(*cpu->lg->lguest_data)))
                 return -EFAULT;
@@ -546,6 +554,7 @@ int lguest_arch_init_hypercalls(struct lg_cpu *cpu)
 
         return 0;
 }
+/*:*/
 
 /*L:030 lguest_arch_setup_regs()
  *
diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
index 0af8baaa0d4a..3fc15318a80f 100644
--- a/drivers/lguest/x86/switcher_32.S
+++ b/drivers/lguest/x86/switcher_32.S
@@ -1,6 +1,6 @@
-/*P:900 This is the Switcher: code which sits at 0xFFC00000 to do the low-level
- * Guest<->Host switch.  It is as simple as it can be made, but it's naturally
- * very specific to x86.
+/*P:900 This is the Switcher: code which sits at 0xFFC00000 astride both the
+ * Host and Guest to do the low-level Guest<->Host switch.  It is as simple as
+ * it can be made, but it's naturally very specific to x86.
  *
  * You have now completed Preparation.  If this has whet your appetite; if you
  * are feeling invigorated and refreshed then the next, more challenging stage
@@ -189,7 +189,7 @@ ENTRY(switch_to_guest)
         // Interrupts are turned back on: we are Guest.
         iret
 
-// We treat two paths to switch back to the Host
+// We tread two paths to switch back to the Host
 // Yet both must save Guest state and restore Host
 // So we put the routine in a macro.
 #define SWITCH_TO_HOST                                                  \
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index b04f98df94ea..835def11419d 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2003 Christophe Saout <christophe@saout.de>
  * Copyright (C) 2004 Clemens Fruhwirth <clemens@endorphin.org>
- * Copyright (C) 2006-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2006-2008 Red Hat, Inc. All rights reserved.
  *
  * This file is released under the GPL.
  */
@@ -93,6 +93,8 @@ struct crypt_config {
 
         struct workqueue_struct *io_queue;
         struct workqueue_struct *crypt_queue;
+        wait_queue_head_t writeq;
+
         /*
          * crypto related data
          */
@@ -331,14 +333,7 @@ static void crypt_convert_init(struct crypt_config *cc,
         ctx->idx_out = bio_out ? bio_out->bi_idx : 0;
         ctx->sector = sector + cc->iv_offset;
         init_completion(&ctx->restart);
-        /*
-         * Crypto operation can be asynchronous,
-         * ctx->pending is increased after request submission.
-         * We need to ensure that we don't call the crypt finish
-         * operation before pending got incremented
-         * (dependent on crypt submission return code).
-         */
-        atomic_set(&ctx->pending, 2);
+        atomic_set(&ctx->pending, 1);
 }
 
 static int crypt_convert_block(struct crypt_config *cc,
@@ -411,43 +406,42 @@ static void crypt_alloc_req(struct crypt_config *cc,
 static int crypt_convert(struct crypt_config *cc,
                          struct convert_context *ctx)
 {
-        int r = 0;
+        int r;
 
         while(ctx->idx_in < ctx->bio_in->bi_vcnt &&
               ctx->idx_out < ctx->bio_out->bi_vcnt) {
 
                 crypt_alloc_req(cc, ctx);
 
+                atomic_inc(&ctx->pending);
+
                 r = crypt_convert_block(cc, ctx, cc->req);
 
                 switch (r) {
+                /* async */
                 case -EBUSY:
                         wait_for_completion(&ctx->restart);
                         INIT_COMPLETION(ctx->restart);
                         /* fall through*/
                 case -EINPROGRESS:
-                        atomic_inc(&ctx->pending);
                         cc->req = NULL;
-                        r = 0;
-                        /* fall through*/
+                        ctx->sector++;
+                        continue;
+
+                /* sync */
                 case 0:
+                        atomic_dec(&ctx->pending);
                         ctx->sector++;
                         continue;
-                }
 
-                break;
+                /* error */
+                default:
+                        atomic_dec(&ctx->pending);
+                        return r;
+                }
         }
 
-        /*
-         * If there are pending crypto operation run async
-         * code. Otherwise process return code synchronously.
-         * The step of 2 ensures that async finish doesn't
-         * call crypto finish too early.
-         */
-        if (atomic_sub_return(2, &ctx->pending))
-                return -EINPROGRESS;
-
-        return r;
+        return 0;
 }
 
 static void dm_crypt_bio_destructor(struct bio *bio)
@@ -624,8 +618,10 @@ static void kcryptd_io_read(struct dm_crypt_io *io)
 static void kcryptd_io_write(struct dm_crypt_io *io)
 {
         struct bio *clone = io->ctx.bio_out;
+        struct crypt_config *cc = io->target->private;
 
         generic_make_request(clone);
+        wake_up(&cc->writeq);
 }
 
 static void kcryptd_io(struct work_struct *work)
@@ -698,7 +694,8 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)
 
                 r = crypt_convert(cc, &io->ctx);
 
-                if (r != -EINPROGRESS) {
+                if (atomic_dec_and_test(&io->ctx.pending)) {
+                        /* processed, no running async crypto  */
                         kcryptd_crypt_write_io_submit(io, r, 0);
                         if (unlikely(r < 0))
                                 return;
@@ -706,8 +703,12 @@ static void kcryptd_crypt_write_convert_loop(struct dm_crypt_io *io)
                         atomic_inc(&io->pending);
 
                 /* out of memory -> run queues */
-                if (unlikely(remaining))
+                if (unlikely(remaining)) {
+                        /* wait for async crypto then reinitialize pending */
+                        wait_event(cc->writeq, !atomic_read(&io->ctx.pending));
+                        atomic_set(&io->ctx.pending, 1);
                         congestion_wait(WRITE, HZ/100);
+                }
         }
 }
 
@@ -746,7 +747,7 @@ static void kcryptd_crypt_read_convert(struct dm_crypt_io *io)
 
         r = crypt_convert(cc, &io->ctx);
 
-        if (r != -EINPROGRESS)
+        if (atomic_dec_and_test(&io->ctx.pending))
                 kcryptd_crypt_read_done(io, r);
 
         crypt_dec_pending(io);
@@ -1047,6 +1048,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad_crypt_queue;
         }
 
+        init_waitqueue_head(&cc->writeq);
         ti->private = cc;
         return 0;
 
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c
index b8e342fe7586..8f25f628ef16 100644
--- a/drivers/md/dm-io.c
+++ b/drivers/md/dm-io.c
@@ -114,7 +114,7 @@ static void dec_count(struct io *io, unsigned int region, int error)
                         wake_up_process(io->sleeper);
 
                 else {
-                        int r = io->error;
+                        unsigned long r = io->error;
                         io_notify_fn fn = io->callback;
                         void *context = io->context;
 
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 51605870f898..762cb086bb7f 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -753,7 +753,7 @@ out:
  * are in the no-sync state.  We have to recover these by
  * recopying from the default mirror to all the others.
  *---------------------------------------------------------------*/
-static void recovery_complete(int read_err, unsigned int write_err,
+static void recovery_complete(int read_err, unsigned long write_err,
                               void *context)
 {
         struct region *reg = (struct region *)context;
@@ -767,7 +767,7 @@ static void recovery_complete(int read_err, unsigned int write_err,
         }
 
         if (write_err) {
-                DMERR_LIMIT("Write error during recovery (error = 0x%x)",
+                DMERR_LIMIT("Write error during recovery (error = 0x%lx)",
                             write_err);
                 /*
                  * Bits correspond to devices (excluding default mirror).
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index ae24eab8cd81..4dc8a43c034b 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -804,7 +804,7 @@ static void commit_callback(void *context, int success)
  * Called when the copy I/O has finished.  kcopyd actually runs
  * this code so don't block.
  */
-static void copy_callback(int read_err, unsigned int write_err, void *context)
+static void copy_callback(int read_err, unsigned long write_err, void *context)
 {
         struct dm_snap_pending_exception *pe = context;
         struct dm_snapshot *s = pe->snap;
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index f3831f31223e..e76b52ade690 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -169,7 +169,7 @@ struct kcopyd_job {
          * Error state of the job.
          */
         int read_err;
-        unsigned int write_err;
+        unsigned long write_err;
 
         /*
          * Either READ or WRITE
@@ -293,7 +293,7 @@ static int run_complete_job(struct kcopyd_job *job)
 {
         void *context = job->context;
         int read_err = job->read_err;
-        unsigned int write_err = job->write_err;
+        unsigned long write_err = job->write_err;
         kcopyd_notify_fn fn = job->fn;
         struct kcopyd_client *kc = job->kc;
 
@@ -396,7 +396,7 @@ static int process_jobs(struct list_head *jobs, int (*fn) (struct kcopyd_job *))
                 if (r < 0) {
                         /* error this rogue job */
                         if (job->rw == WRITE)
-                                job->write_err = (unsigned int) -1;
+                                job->write_err = (unsigned long) -1L;
                         else
                                 job->read_err = 1;
                         push(&_complete_jobs, job);
@@ -448,8 +448,8 @@ static void dispatch_job(struct kcopyd_job *job)
 }
 
 #define SUB_JOB_SIZE 128
-static void segment_complete(int read_err,
-                             unsigned int write_err, void *context)
+static void segment_complete(int read_err, unsigned long write_err,
+                             void *context)
 {
         /* FIXME: tidy this function */
         sector_t progress = 0;
diff --git a/drivers/md/kcopyd.h b/drivers/md/kcopyd.h
index 4621ea055c0e..4845f2a0c676 100644
--- a/drivers/md/kcopyd.h
+++ b/drivers/md/kcopyd.h
@@ -32,8 +32,8 @@ void kcopyd_client_destroy(struct kcopyd_client *kc);
  * read_err is a boolean,
  * write_err is a bitset, with 1 bit for each destination region
  */
-typedef void (*kcopyd_notify_fn)(int read_err,
-                                 unsigned int write_err, void *context);
+typedef void (*kcopyd_notify_fn)(int read_err, unsigned long write_err,
+                                 void *context);
 
 int kcopyd_copy(struct kcopyd_client *kc, struct io_region *from,
                 unsigned int num_dests, struct io_region *dests,
diff --git a/drivers/md/md.c b/drivers/md/md.c
index ccbbf63727cc..61ccbd2683fa 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -1864,17 +1864,6 @@ static struct rdev_sysfs_entry rdev_state =
 __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
 
 static ssize_t
-super_show(mdk_rdev_t *rdev, char *page)
-{
-        if (rdev->sb_loaded && rdev->sb_size) {
-                memcpy(page, page_address(rdev->sb_page), rdev->sb_size);
-                return rdev->sb_size;
-        } else
-                return 0;
-}
-static struct rdev_sysfs_entry rdev_super = __ATTR_RO(super);
-
-static ssize_t
 errors_show(mdk_rdev_t *rdev, char *page)
 {
         return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
@@ -2060,7 +2049,6 @@ __ATTR(size, S_IRUGO|S_IWUSR, rdev_size_show, rdev_size_store);
 
 static struct attribute *rdev_default_attrs[] = {
         &rdev_state.attr,
-        &rdev_super.attr,
         &rdev_errors.attr,
         &rdev_slot.attr,
         &rdev_offset.attr,
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 2d6f1a51359c..c574cf5efb5c 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1143,7 +1143,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
                         rdev = conf->disks[i].rdev;
                         printk(KERN_INFO "raid5:%s: read error corrected (%lu sectors at %llu on %s)\n",
                                mdname(conf->mddev), STRIPE_SECTORS,
-                               (unsigned long long)sh->sector + rdev->data_offset,
+                               (unsigned long long)(sh->sector + rdev->data_offset),
                                bdevname(rdev->bdev, b));
                         clear_bit(R5_ReadError, &sh->dev[i].flags);
                         clear_bit(R5_ReWrite, &sh->dev[i].flags);
@@ -1160,13 +1160,13 @@ static void raid5_end_read_request(struct bio * bi, int error)
                 if (conf->mddev->degraded)
                         printk(KERN_WARNING "raid5:%s: read error not correctable (sector %llu on %s).\n",
                                mdname(conf->mddev),
-                               (unsigned long long)sh->sector + rdev->data_offset,
+                               (unsigned long long)(sh->sector + rdev->data_offset),
                                bdn);
                 else if (test_bit(R5_ReWrite, &sh->dev[i].flags))
                         /* Oh, no!!! */
                         printk(KERN_WARNING "raid5:%s: read error NOT corrected!! (sector %llu on %s).\n",
                                mdname(conf->mddev),
-                               (unsigned long long)sh->sector + rdev->data_offset,
+                               (unsigned long long)(sh->sector + rdev->data_offset),
                                bdn);
                 else if (atomic_read(&rdev->read_errors)
                          > conf->max_nr_stripes)
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 168a8d3a5e55..7707b8c7394b 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -306,25 +306,22 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id)
                 return IRQ_NONE;
         }
 
-        if( 0 != (dev->ext)) {
-                if( 0 != (dev->ext->irq_mask & isr )) {
-                        if( 0 != dev->ext->irq_func ) {
+        if (dev->ext) {
+                if (dev->ext->irq_mask & isr) {
+                        if (dev->ext->irq_func)
                                 dev->ext->irq_func(dev, &isr);
-                        }
                         isr &= ~dev->ext->irq_mask;
                 }
         }
         if (0 != (isr & (MASK_27))) {
                 DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
-                if( 0 != dev->vv_data && 0 != dev->vv_callback) {
+                if (dev->vv_data && dev->vv_callback)
                         dev->vv_callback(dev,isr);
-                }
                 isr &= ~MASK_27;
         }
         if (0 != (isr & (MASK_28))) {
-                if( 0 != dev->vv_data && 0 != dev->vv_callback) {
+                if (dev->vv_data && dev->vv_callback)
                         dev->vv_callback(dev,isr);
-                }
                 isr &= ~MASK_28;
         }
         if (0 != (isr & (MASK_16|MASK_17))) {
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index f0703d8bc3e8..171afe7da6b6 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -272,7 +272,7 @@ static int fops_open(struct inode *inode, struct file *file)
 
         result = 0;
 out:
-        if( fh != 0 && result != 0 ) {
+        if (fh && result != 0) {
                 kfree(fh);
                 file->private_data = NULL;
         }
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c
index ed3f8268ed11..4c8b62e2c035 100644
--- a/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/drivers/media/dvb/dvb-core/dvb_net.c
@@ -784,8 +784,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len,
 {
         struct net_device *dev = feed->priv;
 
-        if (buffer2 != 0)
-                printk(KERN_WARNING "buffer2 not 0: %p.\n", buffer2);
+        if (buffer2)
+                printk(KERN_WARNING "buffer2 not NULL: %p.\n", buffer2);
         if (buffer1_len > 32768)
                 printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len);
         /* printk("TS callback: %u bytes, %u TS cells @ %p.\n",
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index 21935bf7059e..302cc67407c3 100644
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -478,9 +478,9 @@ static int opera1_xilinx_load_firmware(struct usb_device *dev,
                                 err("could not restart the USB controller CPU.");
                                 ret = -EINVAL;
                         }
-                        kfree(p);
                 }
         }
+        kfree(p);
         if (fw) {
                 release_firmware(fw);
         }
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 34e317ced5a3..57b9e3adc8f0 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -587,6 +587,8 @@ static struct video_device cadet_radio=
         .vidioc_s_input     = vidioc_s_input,
 };
 
+#ifdef CONFIG_PNP
+
 static struct pnp_device_id cadet_pnp_devices[] = {
         /* ADS Cadet AM/FM Radio Card */
         {.id = "MSM0c24", .driver_data = 0},
@@ -621,6 +623,10 @@ static struct pnp_driver cadet_pnp_driver = {
         .remove         = NULL,
 };
 
+#else
+static struct pnp_driver cadet_pnp_driver;
+#endif
+
 static int cadet_probe(void)
 {
         static int iovals[8]={0x330,0x332,0x334,0x336,0x338,0x33a,0x33c,0x33e};
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 37072a21d8c9..1832966f53f3 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -305,7 +305,7 @@ comment "MPEG video encoders"
 
 config VIDEO_CX2341X
         tristate "Conexant CX2341x MPEG encoders"
-        depends on VIDEO_V4L2 && EXPERIMENTAL
+        depends on VIDEO_V4L2 && EXPERIMENTAL && VIDEO_V4L2_COMMON
         ---help---
           Support for the Conexant CX23416 MPEG encoders
           and CX23415 MPEG encoder/decoders.
@@ -382,7 +382,7 @@ endmenu # encoder / decoder chips
 
 config VIDEO_VIVI
         tristate "Virtual Video Driver"
-        depends on VIDEO_V4L2 && !SPARC32 && !SPARC64
+        depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64
         select VIDEOBUF_VMALLOC
         default n
         ---help---
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c
index cbab53fc6243..fea2e723e34b 100644
--- a/drivers/media/video/adv7170.c
+++ b/drivers/media/video/adv7170.c
@@ -408,7 +408,7 @@ adv7170_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
index 0d0c554bfdf7..10d4d89623f1 100644
--- a/drivers/media/video/adv7175.c
+++ b/drivers/media/video/adv7175.c
@@ -426,7 +426,7 @@ adv7175_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
index 12d1b9248be5..e663cc045c41 100644
--- a/drivers/media/video/bt819.c
+++ b/drivers/media/video/bt819.c
@@ -524,7 +524,7 @@ bt819_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
index e1028a76c042..7dee2e3235ad 100644
--- a/drivers/media/video/bt856.c
+++ b/drivers/media/video/bt856.c
@@ -311,7 +311,7 @@ bt856_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 5404fcc5276d..fcf8f2d208a8 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1990,7 +1990,7 @@ static int bttv_g_frequency(struct file *file, void *priv,
         if (0 != err)
                 return err;
 
-        f->type = V4L2_TUNER_ANALOG_TV;
+        f->type = btv->radio_user ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV;
         f->frequency = btv->freq;
 
         return 0;
@@ -2009,7 +2009,8 @@ static int bttv_s_frequency(struct file *file, void *priv,
 
         if (unlikely(f->tuner != 0))
                 return -EINVAL;
-        if (unlikely(f->type != V4L2_TUNER_ANALOG_TV))
+        if (unlikely(f->type != (btv->radio_user
+                ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV)))
                 return -EINVAL;
         mutex_lock(&btv->lock);
         btv->freq = f->frequency;
@@ -3389,7 +3390,6 @@ static struct video_device bttv_video_template =
         .vidiocgmbuf                    = vidiocgmbuf,
 #endif
         .vidioc_g_crop                  = bttv_g_crop,
-        .vidioc_g_crop                  = bttv_g_crop,
         .vidioc_s_crop                  = bttv_s_crop,
         .vidioc_g_fbuf                  = bttv_g_fbuf,
         .vidioc_s_fbuf                  = bttv_s_fbuf,
@@ -3416,6 +3416,7 @@ static int radio_open(struct inode *inode, struct file *file)
 {
         int minor = iminor(inode);
         struct bttv *btv = NULL;
+        struct bttv_fh *fh;
         unsigned int i;
 
         dprintk("bttv: open minor=%d\n",minor);
@@ -3430,12 +3431,19 @@ static int radio_open(struct inode *inode, struct file *file)
                 return -ENODEV;
 
         dprintk("bttv%d: open called (radio)\n",btv->c.nr);
+
+        /* allocate per filehandle data */
+        fh = kmalloc(sizeof(*fh), GFP_KERNEL);
+        if (NULL == fh)
+                return -ENOMEM;
+        file->private_data = fh;
+        *fh = btv->init;
+        v4l2_prio_open(&btv->prio, &fh->prio);
+
         mutex_lock(&btv->lock);
 
         btv->radio_user++;
 
-        file->private_data = btv;
-
         bttv_call_i2c_clients(btv,AUDC_SET_RADIO,NULL);
         audio_input(btv,TVAUDIO_INPUT_RADIO);
 
@@ -3445,7 +3453,8 @@ static int radio_open(struct inode *inode, struct file *file)
 
 static int radio_release(struct inode *inode, struct file *file)
 {
-        struct bttv *btv = file->private_data;
+        struct bttv_fh *fh = file->private_data;
+        struct bttv *btv = fh->btv;
         struct rds_command cmd;
 
         btv->radio_user--;
@@ -3509,8 +3518,12 @@ static int radio_enum_input(struct file *file, void *priv,
 static int radio_g_audio(struct file *file, void *priv,
                                         struct v4l2_audio *a)
 {
+        if (a->index != 0)
+                return -EINVAL;
+
         memset(a, 0, sizeof(*a));
         strcpy(a->name, "Radio");
+
         return 0;
 }
 
@@ -3570,7 +3583,8 @@ static int radio_g_input(struct file *filp, void *priv, unsigned int *i)
 static ssize_t radio_read(struct file *file, char __user *data,
                          size_t count, loff_t *ppos)
 {
-        struct bttv    *btv = file->private_data;
+        struct bttv_fh *fh = file->private_data;
+        struct bttv *btv = fh->btv;
         struct rds_command cmd;
         cmd.block_count = count/3;
         cmd.buffer = data;
@@ -3584,7 +3598,8 @@ static ssize_t radio_read(struct file *file, char __user *data,
 
 static unsigned int radio_poll(struct file *file, poll_table *wait)
 {
-        struct bttv    *btv = file->private_data;
+        struct bttv_fh *fh = file->private_data;
+        struct bttv *btv = fh->btv;
         struct rds_command cmd;
         cmd.instance = file;
         cmd.event_list = wait;
@@ -3600,6 +3615,7 @@ static const struct file_operations radio_fops =
         .open     = radio_open,
         .read     = radio_read,
         .release  = radio_release,
+        .compat_ioctl   = v4l_compat_ioctl32,
         .ioctl    = video_ioctl2,
         .llseek   = no_llseek,
         .poll     = radio_poll,
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 2d414dad5c31..dfa269838e01 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -232,6 +232,7 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
         case 78631: /* WinTV-HVR1800 (PCIe, OEM, No IR, No FM, Dual channel ATSC and MPEG2 HW Encoder */
         case 79001: /* WinTV-HVR1250 (PCIe, Retail, IR, full height, ATSC and Basic analog */
         case 79101: /* WinTV-HVR1250 (PCIe, Retail, IR, half height, ATSC and Basic analog */
+        case 79561: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */
         case 79571: /* WinTV-HVR1250 (PCIe, OEM, No IR, full height, ATSC and Basic analog */
         case 79671: /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, ATSC and Basic analog */
                 break;
@@ -347,10 +348,13 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
+                if (dev->i2c_bus[0].i2c_rc == 0)
+                        hauppauge_eeprom(dev, eeprom+0x80);
+                break;
         case CX23885_BOARD_HAUPPAUGE_HVR1800:
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
                 if (dev->i2c_bus[0].i2c_rc == 0)
-                        hauppauge_eeprom(dev, eeprom+0x80);
+                        hauppauge_eeprom(dev, eeprom+0xc0);
                 break;
         }
 
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index 8e40c7bcc06d..7f10b273598f 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -56,137 +56,6 @@ LIST_HEAD(cx23885_devlist);
 
 #define NO_SYNC_LINE (-1U)
 
-/*
- * CX23885 Assumptions
- * 1 line = 16 bytes of CDT
- * cmds size = 80
- * cdt size = 16 * linesize
- * iqsize = 64
- * maxlines = 6
- *
- * Address Space:
- * 0x00000000 0x00008fff FIFO clusters
- * 0x00010000 0x000104af Channel Management Data Structures
- * 0x000104b0 0x000104ff Free
- * 0x00010500 0x000108bf 15 channels * iqsize
- * 0x000108c0 0x000108ff Free
- * 0x00010900 0x00010e9f IQ's + Cluster Descriptor Tables
- *                       15 channels * (iqsize + (maxlines * linesize))
- * 0x00010ea0 0x00010xxx Free
- */
-
-static struct sram_channel cx23885_sram_channels[] = {
-        [SRAM_CH01] = {
-                .name           = "VID A",
-                .cmds_start     = 0x10000,
-                .ctrl_start     = 0x105b0,
-                .cdt            = 0x107b0,
-                .fifo_start     = 0x40,
-                .fifo_size      = 0x2800,
-                .ptr1_reg       = DMA1_PTR1,
-                .ptr2_reg       = DMA1_PTR2,
-                .cnt1_reg       = DMA1_CNT1,
-                .cnt2_reg       = DMA1_CNT2,
-                .jumponly       = 1,
-        },
-        [SRAM_CH02] = {
-                .name           = "ch2",
-                .cmds_start     = 0x0,
-                .ctrl_start     = 0x0,
-                .cdt            = 0x0,
-                .fifo_start     = 0x0,
-                .fifo_size      = 0x0,
-                .ptr1_reg       = DMA2_PTR1,
-                .ptr2_reg       = DMA2_PTR2,
-                .cnt1_reg       = DMA2_CNT1,
-                .cnt2_reg       = DMA2_CNT2,
-        },
-        [SRAM_CH03] = {
-                .name           = "TS1 B",
-                .cmds_start     = 0x100A0,
-                .ctrl_start     = 0x10630,
-                .cdt            = 0x10870,
-                .fifo_start     = 0x5000,
-                .fifo_size      = 0x1000,
-                .ptr1_reg       = DMA3_PTR1,
-                .ptr2_reg       = DMA3_PTR2,
-                .cnt1_reg       = DMA3_CNT1,
-                .cnt2_reg       = DMA3_CNT2,
-        },
-        [SRAM_CH04] = {
-                .name           = "ch4",
-                .cmds_start     = 0x0,
-                .ctrl_start     = 0x0,
-                .cdt            = 0x0,
-                .fifo_start     = 0x0,
-                .fifo_size      = 0x0,
-                .ptr1_reg       = DMA4_PTR1,
-                .ptr2_reg       = DMA4_PTR2,
-                .cnt1_reg       = DMA4_CNT1,
-                .cnt2_reg       = DMA4_CNT2,
-        },
-        [SRAM_CH05] = {
-                .name           = "ch5",
-                .cmds_start     = 0x0,
-                .ctrl_start     = 0x0,
-                .cdt            = 0x0,
-                .fifo_start     = 0x0,
-                .fifo_size      = 0x0,
-                .ptr1_reg       = DMA5_PTR1,
-                .ptr2_reg       = DMA5_PTR2,
-                .cnt1_reg       = DMA5_CNT1,
-                .cnt2_reg       = DMA5_CNT2,
-        },
-        [SRAM_CH06] = {
-                .name           = "TS2 C",
-                .cmds_start     = 0x10140,
-                .ctrl_start     = 0x10680,
-                .cdt            = 0x108d0,
-                .fifo_start     = 0x6000,
-                .fifo_size      = 0x1000,
-                .ptr1_reg       = DMA5_PTR1,
-                .ptr2_reg       = DMA5_PTR2,
-                .cnt1_reg       = DMA5_CNT1,
-                .cnt2_reg       = DMA5_CNT2,
-        },
-        [SRAM_CH07] = {
-                .name           = "ch7",
-                .cmds_start     = 0x0,
-                .ctrl_start     = 0x0,
-                .cdt            = 0x0,
-                .fifo_start     = 0x0,
-                .fifo_size      = 0x0,
-                .ptr1_reg       = DMA6_PTR1,
-                .ptr2_reg       = DMA6_PTR2,
-                .cnt1_reg       = DMA6_CNT1,
-                .cnt2_reg       = DMA6_CNT2,
-        },
-        [SRAM_CH08] = {
-                .name           = "ch8",
-                .cmds_start     = 0x0,
-                .ctrl_start     = 0x0,
-                .cdt            = 0x0,
-                .fifo_start     = 0x0,
-                .fifo_size      = 0x0,
-                .ptr1_reg       = DMA7_PTR1,
-                .ptr2_reg       = DMA7_PTR2,
-                .cnt1_reg       = DMA7_CNT1,
-                .cnt2_reg       = DMA7_CNT2,
-        },
-        [SRAM_CH09] = {
-                .name           = "ch9",
-                .cmds_start     = 0x0,
-                .ctrl_start     = 0x0,
-                .cdt            = 0x0,
-                .fifo_start     = 0x0,
-                .fifo_size      = 0x0,
-                .ptr1_reg       = DMA8_PTR1,
-                .ptr2_reg       = DMA8_PTR2,
-                .cnt1_reg       = DMA8_CNT1,
-                .cnt2_reg       = DMA8_CNT2,
-        },
-};
-
 /* FIXME, these allocations will change when
  * analog arrives. The be reviewed.
  * CX23887 Assumptions
@@ -754,6 +623,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         atomic_inc(&dev->refcount);
 
         dev->nr = cx23885_devcount++;
+        dev->sram_channels = cx23887_sram_channels;
         sprintf(dev->name, "cx23885[%d]", dev->nr);
 
         mutex_lock(&devlist);
@@ -763,13 +633,11 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
         /* Configure the internal memory */
         if(dev->pci->device == 0x8880) {
                 dev->bridge = CX23885_BRIDGE_887;
-                dev->sram_channels = cx23887_sram_channels;
                 /* Apply a sensible clock frequency for the PCIe bridge */
                 dev->clk_freq = 25000000;
         } else
         if(dev->pci->device == 0x8852) {
                 dev->bridge = CX23885_BRIDGE_885;
-                dev->sram_channels = cx23885_sram_channels;
                 /* Apply a sensible clock frequency for the PCIe bridge */
                 dev->clk_freq = 28000000;
         } else
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index e6b7f518c56e..8c9a8adf52de 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -2196,6 +2196,11 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
         cx88_reset(core);
         cx88_card_setup_pre_i2c(core);
         cx88_i2c_init(core, pci);
+
+        /* load tuner module, if needed */
+        if (TUNER_ABSENT != core->board.tuner_type)
+                request_module("tuner");
+
         cx88_call_i2c_clients (core, TUNER_SET_STANDBY, NULL);
         cx88_card_setup(core);
         cx88_ir_init(core, pci);
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 7f1931aed207..227179620d13 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1826,8 +1826,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         cx_set(MO_PCI_INTMSK, core->pci_irqmask);
 
         /* load and configure helper modules */
-        if (TUNER_ABSENT != core->board.tuner_type)
-                request_module("tuner");
 
         if (core->board.audio_chip == AUDIO_CHIP_WM8775)
                 request_module("wm8775");
diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c
index 566e479e2629..9ceb6b2f3949 100644
--- a/drivers/media/video/dpc7146.c
+++ b/drivers/media/video/dpc7146.c
@@ -131,7 +131,7 @@ static int dpc_probe(struct saa7146_dev* dev)
         device_for_each_child(&dpc->i2c_adapter.dev, dpc, dpc_check_clients);
 
         /* check if all devices are present */
-        if( 0 == dpc->saa7111a ) {
+        if (!dpc->saa7111a) {
                 DEB_D(("dpc_v4l2.o: dpc_attach failed for this device.\n"));
                 i2c_del_adapter(&dpc->i2c_adapter);
                 kfree(dpc);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 7d1537cab867..c1caaa855b99 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -267,7 +267,7 @@ static int em28xx_write_ac97(struct em28xx *dev, u8 reg, u8 *val)
         for (i = 0; i < 10; i++) {
                 if ((ret = em28xx_read_reg(dev, AC97BUSY_REG)) < 0)
                         return ret;
-                if (!((u8) ret) & 0x01)
+                if (!(ret & 0x01))
                         return 0;
                 msleep(5);
         }
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index d42f120354e5..948ca35e7ee8 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -54,7 +54,6 @@
 #include "ivtv-vbi.h"
 #include "ivtv-routing.h"
 #include "ivtv-gpio.h"
-#include "ivtv-yuv.h"
 
 #include <media/tveeprom.h>
 #include <media/saa7115.h>
@@ -700,6 +699,9 @@ static int __devinit ivtv_init_struct1(struct ivtv *itv)
         itv->vbi.in.type = V4L2_BUF_TYPE_SLICED_VBI_CAPTURE;
         itv->vbi.sliced_in = &itv->vbi.in.fmt.sliced;
 
+        /* Init the sg table for osd/yuv output */
+        sg_init_table(itv->udma.SGlist, IVTV_DMA_SG_OSD_ENT);
+
         /* OSD */
         itv->osd_global_alpha_state = 1;
         itv->osd_global_alpha = 255;
@@ -1053,9 +1055,6 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
                 goto free_io;
         }
 
-        /* Check yuv output filter table */
-        if (itv->has_cx23415) ivtv_yuv_filter_check(itv);
-
         ivtv_gpio_init(itv);
 
         /* active i2c  */
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c
index 425eb1063904..6dba55b7e25a 100644
--- a/drivers/media/video/ivtv/ivtv-firmware.c
+++ b/drivers/media/video/ivtv/ivtv-firmware.c
@@ -22,6 +22,7 @@
 #include "ivtv-driver.h"
 #include "ivtv-mailbox.h"
 #include "ivtv-firmware.h"
+#include "ivtv-yuv.h"
 #include <linux/firmware.h>
 
 #define IVTV_MASK_SPU_ENABLE            0xFFFFFFFE
@@ -225,11 +226,14 @@ int ivtv_firmware_init(struct ivtv *itv)
                 return 0;
 
         itv->dec_mbox.mbox = ivtv_search_mailbox(itv->dec_mem, IVTV_DECODER_SIZE);
-        if (itv->dec_mbox.mbox == NULL)
+        if (itv->dec_mbox.mbox == NULL) {
                 IVTV_ERR("Decoder mailbox not found\n");
-        else if (itv->has_cx23415 && ivtv_vapi(itv, CX2341X_DEC_PING_FW, 0)) {
+        } else if (itv->has_cx23415 && ivtv_vapi(itv, CX2341X_DEC_PING_FW, 0)) {
                 IVTV_ERR("Decoder firmware dead!\n");
                 itv->dec_mbox.mbox = NULL;
+        } else {
+                /* Firmware okay, so check yuv output filter table */
+                ivtv_yuv_filter_check(itv);
         }
         return itv->dec_mbox.mbox ? 0 : -ENODEV;
 }
diff --git a/drivers/media/video/mt20xx.c b/drivers/media/video/mt20xx.c
index 58bab653330f..74fd6a01d4c4 100644
--- a/drivers/media/video/mt20xx.c
+++ b/drivers/media/video/mt20xx.c
@@ -647,7 +647,7 @@ struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
         default:
                 tuner_info("microtune %s found, not (yet?) supported, sorry :-/\n",
                            name);
-                return 0;
+                return NULL;
         }
 
         strlcpy(fe->ops.tuner_ops.info.name, name,
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index add6d0d680be..cb5a510f9251 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -221,9 +221,8 @@ static int mxb_probe(struct saa7146_dev* dev)
         device_for_each_child(&mxb->i2c_adapter.dev, mxb, mxb_check_clients);
 
         /* check if all devices are present */
-        if(    0 == mxb->tea6420_1      || 0 == mxb->tea6420_2  || 0 == mxb->tea6415c
-            || 0 == mxb->tda9840        || 0 == mxb->saa7111a   || 0 == mxb->tuner ) {
-
+        if (!mxb->tea6420_1 || !mxb->tea6420_2 || !mxb->tea6415c ||
+            !mxb->tda9840 || !mxb->saa7111a || !mxb->tuner) {
                 printk("mxb: did not find all i2c devices. aborting\n");
                 i2c_del_adapter(&mxb->i2c_adapter);
                 kfree(mxb);
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
index 46f156fb108c..5a3e8d21a38a 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ctrl.c
@@ -60,7 +60,7 @@ int pvr2_ctrl_set_mask_value(struct pvr2_ctrl *cptr,int mask,int val)
         int ret = 0;
         if (!cptr) return -EINVAL;
         LOCK_TAKE(cptr->hdw->big_lock); do {
-                if (cptr->info->set_value != 0) {
+                if (cptr->info->set_value) {
                         if (cptr->info->type == pvr2_ctl_bitmask) {
                                 mask &= cptr->info->def.type_bitmask.valid_bits;
                         } else if (cptr->info->type == pvr2_ctl_int) {
@@ -265,7 +265,7 @@ unsigned int pvr2_ctrl_get_v4lflags(struct pvr2_ctrl *cptr)
 int pvr2_ctrl_is_writable(struct pvr2_ctrl *cptr)
 {
         if (!cptr) return 0;
-        return cptr->info->set_value != 0;
+        return cptr->info->set_value != NULL;
 }
 
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 41ae980405ed..d6955fa39598 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -2291,7 +2291,7 @@ static int pvr2_hdw_commit_setup(struct pvr2_hdw *hdw)
 
         for (idx = 0; idx < hdw->control_cnt; idx++) {
                 cptr = hdw->controls + idx;
-                if (cptr->info->is_dirty == 0) continue;
+                if (!cptr->info->is_dirty) continue;
                 if (!cptr->info->is_dirty(cptr)) continue;
                 commit_flag = !0;
 
@@ -2646,7 +2646,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
         u16 address;
         unsigned int pipe;
         LOCK_TAKE(hdw->big_lock); do {
-                if ((hdw->fw_buffer == 0) == !enable_flag) break;
+                if ((hdw->fw_buffer == NULL) == !enable_flag) break;
 
                 if (!enable_flag) {
                         pvr2_trace(PVR2_TRACE_FIRMWARE,
@@ -2715,7 +2715,7 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
 /* Return true if we're in a mode for retrieval CPU firmware */
 int pvr2_hdw_cpufw_get_enabled(struct pvr2_hdw *hdw)
 {
-        return hdw->fw_buffer != 0;
+        return hdw->fw_buffer != NULL;
 }
 
 
diff --git a/drivers/media/video/pvrusb2/pvrusb2-io.c b/drivers/media/video/pvrusb2/pvrusb2-io.c
index ce3c8982ffe0..a9889ff96ecc 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-io.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-io.c
@@ -563,7 +563,7 @@ void pvr2_stream_kill(struct pvr2_stream *sp)
         struct pvr2_buffer *bp;
         mutex_lock(&sp->mutex); do {
                 pvr2_stream_internal_flush(sp);
-                while ((bp = pvr2_stream_get_ready_buffer(sp)) != 0) {
+                while ((bp = pvr2_stream_get_ready_buffer(sp)) != NULL) {
                         pvr2_buffer_set_idle(bp);
                 }
                 if (sp->buffer_total_count != sp->buffer_target_count) {
diff --git a/drivers/media/video/pvrusb2/pvrusb2-ioread.c b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
index f782418afa45..c572212c9f15 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-ioread.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-ioread.c
@@ -165,7 +165,7 @@ static int pvr2_ioread_start(struct pvr2_ioread *cp)
         if (!(cp->stream)) return 0;
         pvr2_trace(PVR2_TRACE_START_STOP,
                    "/*---TRACE_READ---*/ pvr2_ioread_start id=%p",cp);
-        while ((bp = pvr2_stream_get_idle_buffer(cp->stream)) != 0) {
+        while ((bp = pvr2_stream_get_idle_buffer(cp->stream)) != NULL) {
                 stat = pvr2_buffer_queue(bp);
                 if (stat < 0) {
                         pvr2_trace(PVR2_TRACE_DATA_FLOW,
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index f991d72fe108..e0a453a6543d 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -915,7 +915,7 @@ static void pwc_iso_stop(struct pwc_device *pdev)
                 struct urb *urb;
 
                 urb = pdev->sbuf[i].urb;
-                if (urb != 0) {
+                if (urb) {
                         PWC_DEBUG_MEMORY("Unlinking URB %p\n", urb);
                         usb_kill_urb(urb);
                 }
@@ -931,7 +931,7 @@ static void pwc_iso_free(struct pwc_device *pdev)
                 struct urb *urb;
 
                 urb = pdev->sbuf[i].urb;
-                if (urb != 0) {
+                if (urb) {
                         PWC_DEBUG_MEMORY("Freeing URB\n");
                         usb_free_urb(urb);
                         pdev->sbuf[i].urb = NULL;
@@ -1759,8 +1759,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
 
         /* Allocate video_device structure */
         pdev->vdev = video_device_alloc();
-        if (pdev->vdev == 0)
-        {
+        if (!pdev->vdev) {
                 PWC_ERROR("Err, cannot allocate video_device struture. Failing probe.");
                 kfree(pdev);
                 return -ENOMEM;
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
index 061134a7ba9f..1df2602cd184 100644
--- a/drivers/media/video/saa7110.c
+++ b/drivers/media/video/saa7110.c
@@ -488,7 +488,7 @@ saa7110_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
@@ -496,7 +496,7 @@ saa7110_detect_client (struct i2c_adapter *adapter,
         strlcpy(I2C_NAME(client), "saa7110", sizeof(I2C_NAME(client)));
 
         decoder = kzalloc(sizeof(struct saa7110), GFP_KERNEL);
-        if (decoder == 0) {
+        if (!decoder) {
                 kfree(client);
                 return -ENOMEM;
         }
diff --git a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
index 7ae2d646d000..a0772c53bb1f 100644
--- a/drivers/media/video/saa7111.c
+++ b/drivers/media/video/saa7111.c
@@ -502,7 +502,7 @@ saa7111_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/saa7114.c b/drivers/media/video/saa7114.c
index 677df51de1a9..bf91a4faa706 100644
--- a/drivers/media/video/saa7114.c
+++ b/drivers/media/video/saa7114.c
@@ -841,7 +841,7 @@ saa7114_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 262830da08c8..6f5744286e8c 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2484,27 +2484,28 @@ struct saa7134_board saa7134_boards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .gpiomask       = 0x080200000,
-                .inputs         = {{
-                          .name = name_tv,
-                          .vmux = 4,
-                          .amux = TV,
-                          .tv   = 1,
-                },{
-                          .name = name_comp1,
-                          .vmux = 1,
-                         .amux = LINE2,
-               },{
-                         .name = name_comp2,
-                         .vmux = 0,
-                          .amux = LINE2,
-                },{
-                          .name = name_svideo,
-                          .vmux = 8,
-                          .amux = LINE2,
-                }},
+                .inputs         = { {
+                        .name = name_tv,
+                        .vmux = 4,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp1,
+                        .vmux = 1,
+                        .amux = LINE2,
+                }, {
+                        .name = name_comp2,
+                        .vmux = 0,
+                        .amux = LINE2,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                } },
                 .radio = {
-                          .name = name_radio,
-                          .amux = LINE1,
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x0200000,
                 },
         },
         [SAA7134_BOARD_ASUSTeK_P7131_DUAL] = {
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 52baa4f7f7dd..58ab163fdbd7 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -1022,12 +1022,13 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
         saa7134_i2c_register(dev);
 
         /* initialize hardware #2 */
+        if (TUNER_ABSENT != dev->tuner_type)
+                request_module("tuner");
         saa7134_board_init2(dev);
+
         saa7134_hwinit2(dev);
 
         /* load i2c helpers */
-        if (TUNER_ABSENT != dev->tuner_type)
-                request_module("tuner");
         if (card_is_empress(dev)) {
                 request_module("saa6752hs");
         }
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
index 66cc92c0ea66..41f70440fd3b 100644
--- a/drivers/media/video/saa7185.c
+++ b/drivers/media/video/saa7185.c
@@ -403,7 +403,7 @@ saa7185_detect_client (struct i2c_adapter *adapter,
                 return 0;
 
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (client == 0)
+        if (!client)
                 return -ENOMEM;
         client->addr = address;
         client->adapter = adapter;
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c
index ef494febb5e4..bdca5d278978 100644
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
@@ -172,7 +172,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* allocate memory for client structure */
         client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (0 == client) {
+        if (!client) {
                 printk("not enough kernel memory\n");
                 return -ENOMEM;
         }
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 523df0b8cc63..df2fad9f391e 100644
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -64,7 +64,7 @@ static int detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* allocate memory for client structure */
         client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (0 == client) {
+        if (!client) {
                 return -ENOMEM;
         }
 
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c
index ca05cd655087..4ff6c63f7237 100644
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
@@ -101,7 +101,7 @@ static int tea6420_detect(struct i2c_adapter *adapter, int address, int kind)
 
         /* allocate memory for client structure */
         client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (0 == client) {
+        if (!client) {
                 return -ENOMEM;
         }
 
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 445eba4174d7..b6e24e714a23 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -672,7 +672,7 @@ static int tvp5150_set_vbi(struct i2c_client *c,
         if (std == V4L2_STD_ALL) {
                 tvp5150_err("VBI can't be configured without knowing number of lines\n");
                 return 0;
-        } else if (std && V4L2_STD_625_50) {
+        } else if (std & V4L2_STD_625_50) {
                 /* Don't follow NTSC Line number convension */
                 line += 3;
         }
@@ -719,7 +719,7 @@ static int tvp5150_get_vbi(struct i2c_client *c,
         if (std == V4L2_STD_ALL) {
                 tvp5150_err("VBI can't be configured without knowing number of lines\n");
                 return 0;
-        } else if (std && V4L2_STD_625_50) {
+        } else if (std & V4L2_STD_625_50) {
                 /* Don't follow NTSC Line number convension */
                 line += 3;
         }
@@ -1072,12 +1072,12 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
                 return 0;
 
         c = kmalloc(sizeof(struct i2c_client), GFP_KERNEL);
-        if (c == 0)
+        if (!c)
                 return -ENOMEM;
         memcpy(c, &client_template, sizeof(struct i2c_client));
 
         core = kzalloc(sizeof(struct tvp5150), GFP_KERNEL);
-        if (core == 0) {
+        if (!core) {
                 kfree(c);
                 return -ENOMEM;
         }
diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
index fb434b5602a3..5d363be7bc73 100644
--- a/drivers/media/video/usbvideo/usbvideo.c
+++ b/drivers/media/video/usbvideo/usbvideo.c
@@ -1034,6 +1034,11 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
                 info("%s: iface=%d. endpoint=$%02x paletteBits=$%08lx",
                      __FUNCTION__, uvd->iface, uvd->video_endp, uvd->paletteBits);
         }
+        if (uvd->dev == NULL) {
+                err("%s: uvd->dev == NULL", __FUNCTION__);
+                return -EINVAL;
+        }
+        uvd->vdev.dev=&(uvd->dev->dev);
         if (video_register_device(&uvd->vdev, VFL_TYPE_GRABBER, video_nr) == -1) {
                 err("%s: video_register_device failed", __FUNCTION__);
                 return -EPIPE;
@@ -1041,10 +1046,6 @@ int usbvideo_RegisterVideoDevice(struct uvd *uvd)
         if (uvd->debug > 1) {
                 info("%s: video_register_device() successful", __FUNCTION__);
         }
-        if (uvd->dev == NULL) {
-                err("%s: uvd->dev == NULL", __FUNCTION__);
-                return -EINVAL;
-        }
 
         info("%s on /dev/video%d: canvas=%s videosize=%s",
              (uvd->handle != NULL) ? uvd->handle->drvName : "???",
diff --git a/drivers/media/video/v4l1-compat.c b/drivers/media/video/v4l1-compat.c
index dcf22a3b672a..50e1ff9f2be5 100644
--- a/drivers/media/video/v4l1-compat.c
+++ b/drivers/media/video/v4l1-compat.c
@@ -303,7 +303,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct video_capability *cap = arg;
 
-                cap2 = kzalloc(sizeof(*cap2),GFP_KERNEL);
+                cap2 = kzalloc(sizeof(*cap2), GFP_KERNEL);
+                if (!cap2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 memset(cap, 0, sizeof(*cap));
                 memset(&fbuf2, 0, sizeof(fbuf2));
 
@@ -426,7 +430,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct video_window     *win = arg;
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 memset(win,0,sizeof(*win));
 
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
@@ -464,7 +472,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 struct video_window     *win = arg;
                 int err1,err2;
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 drv(inode, file, VIDIOC_STREAMOFF, &fmt2->type);
                 err1 = drv(inode, file, VIDIOC_G_FMT, fmt2);
@@ -586,6 +598,12 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct video_picture    *pict = arg;
 
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
+
                 pict->brightness = get_v4l_control(inode, file,
                                                    V4L2_CID_BRIGHTNESS,drv);
                 pict->hue = get_v4l_control(inode, file,
@@ -597,7 +615,6 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 pict->whiteness = get_v4l_control(inode, file,
                                                   V4L2_CID_WHITENESS, drv);
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 err = drv(inode, file, VIDIOC_G_FMT, fmt2);
                 if (err < 0) {
@@ -617,6 +634,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                 struct video_picture    *pict = arg;
                 int mem_err = 0, ovl_err = 0;
 
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 memset(&fbuf2, 0, sizeof(fbuf2));
 
                 set_v4l_control(inode, file,
@@ -636,7 +658,6 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                  * different pixel formats for memory vs overlay.
                  */
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
                 err = drv(inode, file, VIDIOC_G_FMT, fmt2);
                 /* If VIDIOC_G_FMT failed, then the driver likely doesn't
@@ -890,7 +911,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct video_mmap       *mm = arg;
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 memset(&buf2,0,sizeof(buf2));
 
                 fmt2->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -986,7 +1011,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
         {
                 struct vbi_format      *fmt = arg;
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 fmt2->type = V4L2_BUF_TYPE_VBI_CAPTURE;
 
                 err = drv(inode, file, VIDIOC_G_FMT, fmt2);
@@ -1018,8 +1047,11 @@ v4l_compat_translate_ioctl(struct inode         *inode,
                         break;
                 }
 
-                fmt2 = kzalloc(sizeof(*fmt2),GFP_KERNEL);
-
+                fmt2 = kzalloc(sizeof(*fmt2), GFP_KERNEL);
+                if (!fmt2) {
+                        err = -ENOMEM;
+                        break;
+                }
                 fmt2->type = V4L2_BUF_TYPE_VBI_CAPTURE;
                 fmt2->fmt.vbi.samples_per_line = fmt->samples_per_line;
                 fmt2->fmt.vbi.sampling_rate    = fmt->sampling_rate;
diff --git a/drivers/media/video/v4l2-int-device.c b/drivers/media/video/v4l2-int-device.c
index a545dcaf857f..0e4549922f26 100644
--- a/drivers/media/video/v4l2-int-device.c
+++ b/drivers/media/video/v4l2-int-device.c
@@ -156,3 +156,5 @@ int v4l2_int_ioctl_1(struct v4l2_int_device *d, int cmd, void *arg)
                 find_ioctl(d->u.slave, cmd,
                            (v4l2_int_ioctl_func *)no_such_ioctl_1))(d, arg);
 }
+
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/zoran_driver.c b/drivers/media/video/zoran_driver.c
index dd3d7d2c8b0e..fea4946ee713 100644
--- a/drivers/media/video/zoran_driver.c
+++ b/drivers/media/video/zoran_driver.c
@@ -339,7 +339,7 @@ v4l_fbuffer_alloc (struct file *file)
                         /* Use kmalloc */
 
                         mem = kmalloc(fh->v4l_buffers.buffer_size, GFP_KERNEL);
-                        if (mem == 0) {
+                        if (!mem) {
                                 dprintk(1,
                                         KERN_ERR
                                         "%s: v4l_fbuffer_alloc() - kmalloc for V4L buf %d failed\n",
diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index 1b44784d0efb..04949c823654 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -390,7 +390,7 @@ static int read_frame(struct zr364xx_camera *cam, int framenum)
 }
 
 
-static ssize_t zr364xx_read(struct file *file, char *buf, size_t cnt,
+static ssize_t zr364xx_read(struct file *file, char __user *buf, size_t cnt,
                             loff_t * ppos)
 {
         unsigned long count = cnt;
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index de80dba12f9b..946e3d3506ac 100644
--- a/drivers/memstick/core/memstick.c
+++ b/drivers/memstick/core/memstick.c
@@ -276,8 +276,6 @@ void memstick_init_req_sg(struct memstick_request *mrq, unsigned char tpc,
                 mrq->need_card_int = 1;
         else
                 mrq->need_card_int = 0;
-
-        mrq->get_int_reg = 0;
 }
 EXPORT_SYMBOL(memstick_init_req_sg);
 
@@ -311,8 +309,6 @@ void memstick_init_req(struct memstick_request *mrq, unsigned char tpc,
                 mrq->need_card_int = 1;
         else
                 mrq->need_card_int = 0;
-
-        mrq->get_int_reg = 0;
 }
 EXPORT_SYMBOL(memstick_init_req);
 
@@ -342,6 +338,7 @@ static int h_memstick_read_dev_id(struct memstick_dev *card,
                         card->id.class = id_reg.class;
                 }
                 complete(&card->mrq_complete);
+                dev_dbg(&card->dev, "if_mode = %02x\n", id_reg.if_mode);
                 return -EAGAIN;
         }
 }
@@ -422,7 +419,6 @@ static void memstick_power_on(struct memstick_host *host)
 {
         host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_ON);
         host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_SERIAL);
-        msleep(1);
 }
 
 static void memstick_check(struct work_struct *work)
@@ -579,7 +575,8 @@ EXPORT_SYMBOL(memstick_suspend_host);
 void memstick_resume_host(struct memstick_host *host)
 {
         mutex_lock(&host->lock);
-        host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_ON);
+        if (host->card)
+                memstick_power_on(host);
         mutex_unlock(&host->lock);
         memstick_detect_change(host);
 }
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 1d637e4561d3..557dbbba5cb2 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -133,6 +133,7 @@ struct mspro_devinfo {
 struct mspro_block_data {
         struct memstick_dev   *card;
         unsigned int          usage_count;
+        unsigned int          caps;
         struct gendisk        *disk;
         struct request_queue  *queue;
         spinlock_t            q_lock;
@@ -577,7 +578,6 @@ static int h_mspro_block_wait_for_ced(struct memstick_dev *card,
 static int h_mspro_block_transfer_data(struct memstick_dev *card,
                                        struct memstick_request **mrq)
 {
-        struct memstick_host *host = card->host;
         struct mspro_block_data *msb = memstick_get_drvdata(card);
         unsigned char t_val = 0;
         struct scatterlist t_sg = { 0 };
@@ -591,12 +591,12 @@ static int h_mspro_block_transfer_data(struct memstick_dev *card,
         switch ((*mrq)->tpc) {
         case MS_TPC_WRITE_REG:
                 memstick_init_req(*mrq, MS_TPC_SET_CMD, &msb->transfer_cmd, 1);
-                (*mrq)->get_int_reg = 1;
+                (*mrq)->need_card_int = 1;
                 return 0;
         case MS_TPC_SET_CMD:
                 t_val = (*mrq)->int_reg;
                 memstick_init_req(*mrq, MS_TPC_GET_INT, NULL, 1);
-                if (host->caps & MEMSTICK_CAP_AUTO_GET_INT)
+                if (msb->caps & MEMSTICK_CAP_AUTO_GET_INT)
                         goto has_int_reg;
                 return 0;
         case MS_TPC_GET_INT:
@@ -646,12 +646,12 @@ has_int_reg:
                                            ? MS_TPC_READ_LONG_DATA
                                            : MS_TPC_WRITE_LONG_DATA,
                                      &t_sg);
-                (*mrq)->get_int_reg = 1;
+                (*mrq)->need_card_int = 1;
                 return 0;
         case MS_TPC_READ_LONG_DATA:
         case MS_TPC_WRITE_LONG_DATA:
                 msb->current_page++;
-                if (host->caps & MEMSTICK_CAP_AUTO_GET_INT) {
+                if (msb->caps & MEMSTICK_CAP_AUTO_GET_INT) {
                         t_val = (*mrq)->int_reg;
                         goto has_int_reg;
                 } else {
@@ -816,12 +816,13 @@ static int mspro_block_wait_for_ced(struct memstick_dev *card)
         return card->current_mrq.error;
 }
 
-static int mspro_block_switch_to_parallel(struct memstick_dev *card)
+static int mspro_block_set_interface(struct memstick_dev *card,
+                                     unsigned char sys_reg)
 {
         struct memstick_host *host = card->host;
         struct mspro_block_data *msb = memstick_get_drvdata(card);
         struct mspro_param_register param = {
-                .system = MEMSTICK_SYS_PAR4,
+                .system = sys_reg,
                 .data_count = 0,
                 .data_address = 0,
                 .tpc_param = 0
@@ -833,41 +834,70 @@ static int mspro_block_switch_to_parallel(struct memstick_dev *card)
                           sizeof(param));
         memstick_new_req(host);
         wait_for_completion(&card->mrq_complete);
-        if (card->current_mrq.error)
-                return card->current_mrq.error;
+        return card->current_mrq.error;
+}
+
+static int mspro_block_switch_interface(struct memstick_dev *card)
+{
+        struct memstick_host *host = card->host;
+        struct mspro_block_data *msb = memstick_get_drvdata(card);
+        int rc = 0;
+
+        if (msb->caps & MEMSTICK_CAP_PAR4)
+                rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR4);
+        else
+                return 0;
+
+        if (rc) {
+                printk(KERN_WARNING
+                       "%s: could not switch to 4-bit mode, error %d\n",
+                       card->dev.bus_id, rc);
+                return 0;
+        }
 
         msb->system = MEMSTICK_SYS_PAR4;
         host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_PAR4);
+        printk(KERN_INFO "%s: switching to 4-bit parallel mode\n",
+               card->dev.bus_id);
+
+        if (msb->caps & MEMSTICK_CAP_PAR8) {
+                rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR8);
+
+                if (!rc) {
+                        msb->system = MEMSTICK_SYS_PAR8;
+                        host->set_param(host, MEMSTICK_INTERFACE,
+                                        MEMSTICK_PAR8);
+                        printk(KERN_INFO
+                               "%s: switching to 8-bit parallel mode\n",
+                               card->dev.bus_id);
+                } else
+                        printk(KERN_WARNING
+                               "%s: could not switch to 8-bit mode, error %d\n",
+                               card->dev.bus_id, rc);
+        }
 
         card->next_request = h_mspro_block_req_init;
         msb->mrq_handler = h_mspro_block_default;
         memstick_init_req(&card->current_mrq, MS_TPC_GET_INT, NULL, 1);
         memstick_new_req(card->host);
         wait_for_completion(&card->mrq_complete);
+        rc = card->current_mrq.error;
 
-        if (card->current_mrq.error) {
+        if (rc) {
+                printk(KERN_WARNING
+                       "%s: interface error, trying to fall back to serial\n",
+                       card->dev.bus_id);
                 msb->system = MEMSTICK_SYS_SERIAL;
                 host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_OFF);
-                msleep(1000);
+                msleep(10);
                 host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_ON);
                 host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_SERIAL);
 
-                if (memstick_set_rw_addr(card))
-                        return card->current_mrq.error;
-
-                param.system = msb->system;
-
-                card->next_request = h_mspro_block_req_init;
-                msb->mrq_handler = h_mspro_block_default;
-                memstick_init_req(&card->current_mrq, MS_TPC_WRITE_REG, &param,
-                                  sizeof(param));
-                memstick_new_req(host);
-                wait_for_completion(&card->mrq_complete);
-
-                return -EFAULT;
+                rc = memstick_set_rw_addr(card);
+                if (!rc)
+                        rc = mspro_block_set_interface(card, msb->system);
         }
-
-        return 0;
+        return rc;
 }
 
 /* Memory allocated for attributes by this function should be freed by
@@ -1052,16 +1082,18 @@ static int mspro_block_init_card(struct memstick_dev *card)
         if (memstick_set_rw_addr(card))
                 return -EIO;
 
-        if (host->caps & MEMSTICK_CAP_PAR4) {
-                if (mspro_block_switch_to_parallel(card))
-                        printk(KERN_WARNING "%s: could not switch to "
-                               "parallel interface\n", card->dev.bus_id);
-        }
+        msb->caps = host->caps;
+        rc = mspro_block_switch_interface(card);
+        if (rc)
+                return rc;
 
+        msleep(200);
         rc = mspro_block_wait_for_ced(card);
         if (rc)
                 return rc;
         dev_dbg(&card->dev, "card activated\n");
+        if (msb->system != MEMSTICK_SYS_SERIAL)
+                msb->caps |= MEMSTICK_CAP_AUTO_GET_INT;
 
         card->next_request = h_mspro_block_req_init;
         msb->mrq_handler = h_mspro_block_get_ro;
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index 03fe8783b1ee..8770a5fac3b6 100644
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -12,6 +12,7 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/dma-mapping.h>
 #include <linux/delay.h>
 #include <linux/highmem.h>
 #include <linux/memstick.h>
@@ -56,8 +57,6 @@ struct jmb38x_ms_host {
         unsigned long           timeout_jiffies;
         struct timer_list       timer;
         struct memstick_request *req;
-        unsigned char           eject:1,
-                                use_dma:1;
         unsigned char           cmd_flags;
         unsigned char           io_pos;
         unsigned int            io_word[2];
@@ -94,9 +93,22 @@ struct jmb38x_ms {
 #define HOST_CONTROL_IF_PAR4   0x1
 #define HOST_CONTROL_IF_PAR8   0x3
 
+#define STATUS_BUSY             0x00080000
+#define STATUS_MS_DAT7          0x00040000
+#define STATUS_MS_DAT6          0x00020000
+#define STATUS_MS_DAT5          0x00010000
+#define STATUS_MS_DAT4          0x00008000
+#define STATUS_MS_DAT3          0x00004000
+#define STATUS_MS_DAT2          0x00002000
+#define STATUS_MS_DAT1          0x00001000
+#define STATUS_MS_DAT0          0x00000800
 #define STATUS_HAS_MEDIA        0x00000400
 #define STATUS_FIFO_EMPTY       0x00000200
 #define STATUS_FIFO_FULL        0x00000100
+#define STATUS_MS_CED           0x00000080
+#define STATUS_MS_ERR           0x00000040
+#define STATUS_MS_BRQ           0x00000020
+#define STATUS_MS_CNK           0x00000001
 
 #define INT_STATUS_TPC_ERR      0x00080000
 #define INT_STATUS_CRC_ERR      0x00040000
@@ -119,11 +131,17 @@ struct jmb38x_ms {
 #define PAD_PU_PD_ON_MS_SOCK0 0x5f8f0000
 #define PAD_PU_PD_ON_MS_SOCK1 0x0f0f0000
 
+#define CLOCK_CONTROL_40MHZ   0x00000001
+#define CLOCK_CONTROL_50MHZ   0x00000002
+#define CLOCK_CONTROL_60MHZ   0x00000008
+#define CLOCK_CONTROL_62_5MHZ 0x0000000c
+#define CLOCK_CONTROL_OFF     0x00000000
+
 enum {
         CMD_READY    = 0x01,
         FIFO_READY   = 0x02,
         REG_DATA     = 0x04,
-        AUTO_GET_INT = 0x08
+        DMA_DATA     = 0x08
 };
 
 static unsigned int jmb38x_ms_read_data(struct jmb38x_ms_host *host,
@@ -273,7 +291,7 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host)
 {
         unsigned int length;
         unsigned int off;
-        unsigned int t_size, p_off, p_cnt;
+        unsigned int t_size, p_cnt;
         unsigned char *buf;
         struct page *pg;
         unsigned long flags = 0;
@@ -287,6 +305,8 @@ static int jmb38x_ms_transfer_data(struct jmb38x_ms_host *host)
         }
 
         while (length) {
+                unsigned int uninitialized_var(p_off);
+
                 if (host->req->long_data) {
                         pg = nth_page(sg_page(&host->req->sg),
                                       off >> PAGE_SHIFT);
@@ -364,28 +384,27 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
                 cmd |= TPC_DIR;
         if (host->req->need_card_int)
                 cmd |= TPC_WAIT_INT;
-        if (host->req->get_int_reg)
-                cmd |= TPC_GET_INT;
 
         data = host->req->data;
 
-        host->use_dma = !no_dma;
+        if (!no_dma)
+                host->cmd_flags |= DMA_DATA;
 
         if (host->req->long_data) {
                 data_len = host->req->sg.length;
         } else {
                 data_len = host->req->data_len;
-                host->use_dma = 0;
+                host->cmd_flags &= ~DMA_DATA;
         }
 
         if (data_len <= 8) {
                 cmd &= ~(TPC_DATA_SEL | 0xf);
                 host->cmd_flags |= REG_DATA;
                 cmd |= data_len & 0xf;
-                host->use_dma = 0;
+                host->cmd_flags &= ~DMA_DATA;
         }
 
-        if (host->use_dma) {
+        if (host->cmd_flags & DMA_DATA) {
                 if (1 != pci_map_sg(host->chip->pdev, &host->req->sg, 1,
                                     host->req->data_dir == READ
                                     ? PCI_DMA_FROMDEVICE
@@ -448,13 +467,12 @@ static void jmb38x_ms_complete_cmd(struct memstick_host *msh, int last)
                 readl(host->addr + INT_STATUS));
         dev_dbg(msh->cdev.dev, "c hstatus %08x\n", readl(host->addr + STATUS));
 
-        if (host->req->get_int_reg) {
-                t_val = readl(host->addr + TPC_P0);
-                host->req->int_reg = (t_val & 0xff);
-        }
+        host->req->int_reg = readl(host->addr + STATUS) & 0xff;
+
+        writel(0, host->addr + BLOCK);
+        writel(0, host->addr + DMA_CONTROL);
 
-        if (host->use_dma) {
-                writel(0, host->addr + DMA_CONTROL);
+        if (host->cmd_flags & DMA_DATA) {
                 pci_unmap_sg(host->chip->pdev, &host->req->sg, 1,
                              host->req->data_dir == READ
                              ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE);
@@ -506,7 +524,7 @@ static irqreturn_t jmb38x_ms_isr(int irq, void *dev_id)
                         else
                                 host->req->error = -ETIME;
                 } else {
-                        if (host->use_dma) {
+                        if (host->cmd_flags & DMA_DATA) {
                                 if (irq_status & INT_STATUS_EOTRAN)
                                         host->cmd_flags |= FIFO_READY;
                         } else {
@@ -595,19 +613,18 @@ static void jmb38x_ms_reset(struct jmb38x_ms_host *host)
 {
         unsigned int host_ctl = readl(host->addr + HOST_CONTROL);
 
-        writel(host_ctl | HOST_CONTROL_RESET_REQ | HOST_CONTROL_RESET,
-               host->addr + HOST_CONTROL);
+        writel(HOST_CONTROL_RESET_REQ, host->addr + HOST_CONTROL);
 
         while (HOST_CONTROL_RESET_REQ
                & (host_ctl = readl(host->addr + HOST_CONTROL))) {
-                ndelay(100);
-                dev_dbg(&host->chip->pdev->dev, "reset\n");
+                ndelay(20);
+                dev_dbg(&host->chip->pdev->dev, "reset %08x\n", host_ctl);
         }
 
-        writel(INT_STATUS_ALL, host->addr + INT_STATUS_ENABLE);
+        writel(HOST_CONTROL_RESET, host->addr + HOST_CONTROL);
+        mmiowb();
         writel(INT_STATUS_ALL, host->addr + INT_SIGNAL_ENABLE);
-
-        dev_dbg(&host->chip->pdev->dev, "reset\n");
+        writel(INT_STATUS_ALL, host->addr + INT_STATUS_ENABLE);
 }
 
 static void jmb38x_ms_set_param(struct memstick_host *msh,
@@ -615,10 +632,8 @@ static void jmb38x_ms_set_param(struct memstick_host *msh,
                                 int value)
 {
         struct jmb38x_ms_host *host = memstick_priv(msh);
-        unsigned int host_ctl;
-        unsigned long flags;
-
-        spin_lock_irqsave(&host->lock, flags);
+        unsigned int host_ctl = readl(host->addr + HOST_CONTROL);
+        unsigned int clock_ctl = CLOCK_CONTROL_40MHZ, clock_delay = 0;
 
         switch (param) {
         case MEMSTICK_POWER:
@@ -626,60 +641,57 @@ static void jmb38x_ms_set_param(struct memstick_host *msh,
                         jmb38x_ms_reset(host);
 
                         writel(host->id ? PAD_PU_PD_ON_MS_SOCK1
-                                          : PAD_PU_PD_ON_MS_SOCK0,
+                                        : PAD_PU_PD_ON_MS_SOCK0,
                                host->addr + PAD_PU_PD);
 
                         writel(PAD_OUTPUT_ENABLE_MS,
                                host->addr + PAD_OUTPUT_ENABLE);
 
-                        host_ctl = readl(host->addr + HOST_CONTROL);
-                        host_ctl |= 7;
-                        writel(host_ctl | (HOST_CONTROL_POWER_EN
-                                           | HOST_CONTROL_CLOCK_EN),
-                               host->addr + HOST_CONTROL);
+                        host_ctl = 7;
+                        host_ctl |= HOST_CONTROL_POWER_EN
+                                 | HOST_CONTROL_CLOCK_EN;
+                        writel(host_ctl, host->addr + HOST_CONTROL);
 
                         dev_dbg(&host->chip->pdev->dev, "power on\n");
                 } else if (value == MEMSTICK_POWER_OFF) {
-                        writel(readl(host->addr + HOST_CONTROL)
-                               & ~(HOST_CONTROL_POWER_EN
-                                   | HOST_CONTROL_CLOCK_EN),
-                               host->addr +  HOST_CONTROL);
+                        host_ctl &= ~(HOST_CONTROL_POWER_EN
+                                      | HOST_CONTROL_CLOCK_EN);
+                        writel(host_ctl, host->addr +  HOST_CONTROL);
                         writel(0, host->addr + PAD_OUTPUT_ENABLE);
                         writel(PAD_PU_PD_OFF, host->addr + PAD_PU_PD);
                         dev_dbg(&host->chip->pdev->dev, "power off\n");
                 }
                 break;
         case MEMSTICK_INTERFACE:
-                /* jmb38x_ms_reset(host); */
-
-                host_ctl = readl(host->addr + HOST_CONTROL);
                 host_ctl &= ~(3 << HOST_CONTROL_IF_SHIFT);
-                /* host_ctl |= 7; */
 
                 if (value == MEMSTICK_SERIAL) {
                         host_ctl &= ~HOST_CONTROL_FAST_CLK;
                         host_ctl |= HOST_CONTROL_IF_SERIAL
                                     << HOST_CONTROL_IF_SHIFT;
                         host_ctl |= HOST_CONTROL_REI;
-                        writel(0, host->addr + CLOCK_DELAY);
+                        clock_ctl = CLOCK_CONTROL_40MHZ;
+                        clock_delay = 0;
                 } else if (value == MEMSTICK_PAR4) {
                         host_ctl |= HOST_CONTROL_FAST_CLK;
                         host_ctl |= HOST_CONTROL_IF_PAR4
                                     << HOST_CONTROL_IF_SHIFT;
                         host_ctl &= ~HOST_CONTROL_REI;
-                        writel(4, host->addr + CLOCK_DELAY);
+                        clock_ctl = CLOCK_CONTROL_40MHZ;
+                        clock_delay = 4;
                 } else if (value == MEMSTICK_PAR8) {
                         host_ctl |= HOST_CONTROL_FAST_CLK;
                         host_ctl |= HOST_CONTROL_IF_PAR8
                                     << HOST_CONTROL_IF_SHIFT;
                         host_ctl &= ~HOST_CONTROL_REI;
-                        writel(4, host->addr + CLOCK_DELAY);
+                        clock_ctl = CLOCK_CONTROL_60MHZ;
+                        clock_delay = 0;
                 }
                 writel(host_ctl, host->addr + HOST_CONTROL);
+                writel(clock_ctl, host->addr + CLOCK_CONTROL);
+                writel(clock_delay, host->addr + CLOCK_DELAY);
                 break;
         };
-
-        spin_unlock_irqrestore(&host->lock, flags);
 }
 
 #ifdef CONFIG_PM
@@ -772,13 +784,10 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt)
         snprintf(host->host_id, DEVICE_ID_SIZE, DRIVER_NAME ":slot%d",
                  host->id);
         host->irq = jm->pdev->irq;
-        host->timeout_jiffies = msecs_to_jiffies(4000);
+        host->timeout_jiffies = msecs_to_jiffies(1000);
         msh->request = jmb38x_ms_request;
         msh->set_param = jmb38x_ms_set_param;
-        /*
-        msh->caps = MEMSTICK_CAP_AUTO_GET_INT | MEMSTICK_CAP_PAR4
-                    | MEMSTICK_CAP_PAR8;
-        */
+
         msh->caps = MEMSTICK_CAP_PAR4 | MEMSTICK_CAP_PAR8;
 
         setup_timer(&host->timer, jmb38x_ms_abort, (unsigned long)msh);
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index 2b5bf52a8302..8577de4ebb0e 100644
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
@@ -182,7 +182,7 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host)
         struct tifm_dev *sock = host->dev;
         unsigned int length;
         unsigned int off;
-        unsigned int t_size, p_off, p_cnt;
+        unsigned int t_size, p_cnt;
         unsigned char *buf;
         struct page *pg;
         unsigned long flags = 0;
@@ -198,6 +198,8 @@ static unsigned int tifm_ms_transfer_data(struct tifm_ms *host)
                 host->block_pos);
 
         while (length) {
+                unsigned int uninitialized_var(p_off);
+
                 if (host->req->long_data) {
                         pg = nth_page(sg_page(&host->req->sg),
                                       off >> PAGE_SHIFT);
@@ -340,11 +342,20 @@ static void tifm_ms_complete_cmd(struct tifm_ms *host)
 
         del_timer(&host->timer);
 
-        if (host->use_dma)
+        host->req->int_reg = readl(sock->addr + SOCK_MS_STATUS) & 0xff;
+        host->req->int_reg = (host->req->int_reg & 1)
+                             | ((host->req->int_reg << 4) & 0xe0);
+
+        writel(TIFM_FIFO_INT_SETALL,
+               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
+        writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);
+
+        if (host->use_dma) {
                 tifm_unmap_sg(sock, &host->req->sg, 1,
                               host->req->data_dir == READ
                               ? PCI_DMA_FROMDEVICE
                               : PCI_DMA_TODEVICE);
+        }
 
         writel((~TIFM_CTRL_LED) & readl(sock->addr + SOCK_CONTROL),
                sock->addr + SOCK_CONTROL);
@@ -424,12 +435,6 @@ static void tifm_ms_card_event(struct tifm_dev *sock)
                 else if (host_status & TIFM_MS_STAT_CRC)
                         host->req->error = -EILSEQ;
 
-                if (host->req->error) {
-                        writel(TIFM_FIFO_INT_SETALL,
-                               sock->addr + SOCK_DMA_FIFO_INT_ENABLE_CLEAR);
-                        writel(TIFM_DMA_RESET, sock->addr + SOCK_DMA_CONTROL);
-                }
-
                 if (host_status & TIFM_MS_STAT_RDY)
                         host->cmd_flags |= CMD_READY;
 
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 6b6df8679585..c6be6eba7dc3 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1430,6 +1430,98 @@ mpt_get_product_name(u16 vendor, u16 device, u8 revision, char *prod_name)
                 sprintf(prod_name, "%s", product_str);
 }
 
+/**
+ *      mpt_mapresources - map in memory mapped io
+ *      @ioc: Pointer to pointer to IOC adapter
+ *
+ **/
+static int
+mpt_mapresources(MPT_ADAPTER *ioc)
+{
+        u8              __iomem *mem;
+        int              ii;
+        unsigned long    mem_phys;
+        unsigned long    port;
+        u32              msize;
+        u32              psize;
+        u8               revision;
+        int              r = -ENODEV;
+        struct pci_dev *pdev;
+
+        pdev = ioc->pcidev;
+        ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
+        if (pci_enable_device_mem(pdev)) {
+                printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "
+                    "failed\n", ioc->name);
+                return r;
+        }
+        if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {
+                printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "
+                    "MEM failed\n", ioc->name);
+                return r;
+        }
+
+        pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
+
+        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)
+            && !pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
+                dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
+                    ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
+                    ioc->name));
+        } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)
+            && !pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {
+                dinitprintk(ioc, printk(MYIOC_s_INFO_FMT
+                    ": 32 BIT PCI BUS DMA ADDRESSING SUPPORTED\n",
+                    ioc->name));
+        } else {
+                printk(MYIOC_s_WARN_FMT "no suitable DMA mask for %s\n",
+                    ioc->name, pci_name(pdev));
+                pci_release_selected_regions(pdev, ioc->bars);
+                return r;
+        }
+
+        mem_phys = msize = 0;
+        port = psize = 0;
+        for (ii = 0; ii < DEVICE_COUNT_RESOURCE; ii++) {
+                if (pci_resource_flags(pdev, ii) & PCI_BASE_ADDRESS_SPACE_IO) {
+                        if (psize)
+                                continue;
+                        /* Get I/O space! */
+                        port = pci_resource_start(pdev, ii);
+                        psize = pci_resource_len(pdev, ii);
+                } else {
+                        if (msize)
+                                continue;
+                        /* Get memmap */
+                        mem_phys = pci_resource_start(pdev, ii);
+                        msize = pci_resource_len(pdev, ii);
+                }
+        }
+        ioc->mem_size = msize;
+
+        mem = NULL;
+        /* Get logical ptr for PciMem0 space */
+        /*mem = ioremap(mem_phys, msize);*/
+        mem = ioremap(mem_phys, msize);
+        if (mem == NULL) {
+                printk(MYIOC_s_ERR_FMT ": ERROR - Unable to map adapter"
+                        " memory!\n", ioc->name);
+                return -EINVAL;
+        }
+        ioc->memmap = mem;
+        dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %lx\n",
+            ioc->name, mem, mem_phys));
+
+        ioc->mem_phys = mem_phys;
+        ioc->chip = (SYSIF_REGS __iomem *)mem;
+
+        /* Save Port IO values in case we need to do downloadboot */
+        ioc->pio_mem_phys = port;
+        ioc->pio_chip = (SYSIF_REGS __iomem *)port;
+
+        return 0;
+}
+
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /**
  *      mpt_attach - Install a PCI intelligent MPT adapter.
@@ -1452,13 +1544,6 @@ int
 mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         MPT_ADAPTER     *ioc;
-        u8              __iomem *mem;
-        u8              __iomem *pmem;
-        unsigned long    mem_phys;
-        unsigned long    port;
-        u32              msize;
-        u32              psize;
-        int              ii;
         u8               cb_idx;
         int              r = -ENODEV;
         u8               revision;
@@ -1468,52 +1553,32 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         struct proc_dir_entry *dent, *ent;
 #endif
 
-        if (mpt_debug_level)
-                printk(KERN_INFO MYNAM ": mpt_debug_level=%xh\n", mpt_debug_level);
-
         ioc = kzalloc(sizeof(MPT_ADAPTER), GFP_ATOMIC);
         if (ioc == NULL) {
                 printk(KERN_ERR MYNAM ": ERROR - Insufficient memory to add adapter!\n");
                 return -ENOMEM;
         }
-        ioc->debug_level = mpt_debug_level;
+
         ioc->id = mpt_ids++;
         sprintf(ioc->name, "ioc%d", ioc->id);
 
-        ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
-        if (pci_enable_device_mem(pdev)) {
-                printk(MYIOC_s_ERR_FMT "pci_enable_device_mem() "
-                       "failed\n", ioc->name);
-                kfree(ioc);
-                return r;
-        }
-        if (pci_request_selected_regions(pdev, ioc->bars, "mpt")) {
-                printk(MYIOC_s_ERR_FMT "pci_request_selected_regions() with "
-                       "MEM failed\n", ioc->name);
-                kfree(ioc);
-                return r;
-        }
+        /*
+         * set initial debug level
+         * (refer to mptdebug.h)
+         *
+         */
+        ioc->debug_level = mpt_debug_level;
+        if (mpt_debug_level)
+                printk(KERN_INFO "mpt_debug_level=%xh\n", mpt_debug_level);
 
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT ": mpt_adapter_install\n", ioc->name));
 
-        if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
-                dprintk(ioc, printk(MYIOC_s_INFO_FMT
-                        ": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n", ioc->name));
-        } else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
-                printk(MYIOC_s_WARN_FMT ": 32 BIT PCI BUS DMA ADDRESSING NOT SUPPORTED\n",
-                    ioc->name);
+        ioc->pcidev = pdev;
+        if (mpt_mapresources(ioc)) {
                 kfree(ioc);
                 return r;
         }
 
-        if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
-                dprintk(ioc, printk(MYIOC_s_INFO_FMT
-                        ": Using 64 bit consistent mask\n", ioc->name));
-        } else {
-                dprintk(ioc, printk(MYIOC_s_INFO_FMT
-                        ": Not using 64 bit consistent mask\n", ioc->name));
-        }
-
         ioc->alloc_total = sizeof(MPT_ADAPTER);
         ioc->req_sz = MPT_DEFAULT_FRAME_SIZE;           /* avoid div by zero! */
         ioc->reply_sz = MPT_REPLY_FRAME_SIZE;
@@ -1551,48 +1616,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         /* Find lookup slot. */
         INIT_LIST_HEAD(&ioc->list);
 
-        mem_phys = msize = 0;
-        port = psize = 0;
-        for (ii=0; ii < DEVICE_COUNT_RESOURCE; ii++) {
-                if (pci_resource_flags(pdev, ii) & PCI_BASE_ADDRESS_SPACE_IO) {
-                        if (psize)
-                                continue;
-                        /* Get I/O space! */
-                        port = pci_resource_start(pdev, ii);
-                        psize = pci_resource_len(pdev,ii);
-                } else {
-                        if (msize)
-                                continue;
-                        /* Get memmap */
-                        mem_phys = pci_resource_start(pdev, ii);
-                        msize = pci_resource_len(pdev,ii);
-                }
-        }
-        ioc->mem_size = msize;
-
-        mem = NULL;
-        /* Get logical ptr for PciMem0 space */
-        /*mem = ioremap(mem_phys, msize);*/
-        mem = ioremap(mem_phys, msize);
-        if (mem == NULL) {
-                printk(MYIOC_s_ERR_FMT "Unable to map adapter memory!\n", ioc->name);
-                kfree(ioc);
-                return -EINVAL;
-        }
-        ioc->memmap = mem;
-        dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "mem = %p, mem_phys = %lx\n", ioc->name, mem, mem_phys));
-
         dinitprintk(ioc, printk(MYIOC_s_INFO_FMT "facts @ %p, pfacts[0] @ %p\n",
             ioc->name, &ioc->facts, &ioc->pfacts[0]));
 
-        ioc->mem_phys = mem_phys;
-        ioc->chip = (SYSIF_REGS __iomem *)mem;
-
-        /* Save Port IO values in case we need to do downloadboot */
-        ioc->pio_mem_phys = port;
-        pmem = (u8 __iomem *)port;
-        ioc->pio_chip = (SYSIF_REGS __iomem *)pmem;
-
         pci_read_config_byte(pdev, PCI_CLASS_REVISION, &revision);
         mpt_get_product_name(pdev->vendor, pdev->device, revision, ioc->prod_name);
 
@@ -1688,7 +1714,9 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 list_del(&ioc->list);
                 if (ioc->alt_ioc)
                         ioc->alt_ioc->alt_ioc = NULL;
-                iounmap(mem);
+                iounmap(ioc->memmap);
+                if (r != -5)
+                        pci_release_selected_regions(pdev, ioc->bars);
                 kfree(ioc);
                 pci_set_drvdata(pdev, NULL);
                 return r;
@@ -1784,13 +1812,10 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state)
         u32 device_state;
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
 
-        device_state=pci_choose_state(pdev, state);
-
-        printk(MYIOC_s_INFO_FMT
-        "pci-suspend: pdev=0x%p, slot=%s, Entering operating state [D%d]\n",
-                ioc->name, pdev, pci_name(pdev), device_state);
-
-        pci_save_state(pdev);
+        device_state = pci_choose_state(pdev, state);
+        printk(MYIOC_s_INFO_FMT "pci-suspend: pdev=0x%p, slot=%s, Entering "
+            "operating state [D%d]\n", ioc->name, pdev, pci_name(pdev),
+            device_state);
 
         /* put ioc into READY_STATE */
         if(SendIocReset(ioc, MPI_FUNCTION_IOC_MESSAGE_UNIT_RESET, CAN_SLEEP)) {
@@ -1805,10 +1830,14 @@ mpt_suspend(struct pci_dev *pdev, pm_message_t state)
         /* Clear any lingering interrupt */
         CHIPREG_WRITE32(&ioc->chip->IntStatus, 0);
 
+        free_irq(ioc->pci_irq, ioc);
+        if (mpt_msi_enable)
+                pci_disable_msi(ioc->pcidev);
+        ioc->pci_irq = -1;
+        pci_save_state(pdev);
         pci_disable_device(pdev);
         pci_release_selected_regions(pdev, ioc->bars);
         pci_set_power_state(pdev, device_state);
-
         return 0;
 }
 
@@ -1823,48 +1852,54 @@ mpt_resume(struct pci_dev *pdev)
         MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
         u32 device_state = pdev->current_state;
         int recovery_state;
+        int err;
 
-        printk(MYIOC_s_INFO_FMT
-        "pci-resume: pdev=0x%p, slot=%s, Previous operating state [D%d]\n",
-                ioc->name, pdev, pci_name(pdev), device_state);
+        printk(MYIOC_s_INFO_FMT "pci-resume: pdev=0x%p, slot=%s, Previous "
+            "operating state [D%d]\n", ioc->name, pdev, pci_name(pdev),
+            device_state);
 
-        pci_set_power_state(pdev, 0);
+        pci_set_power_state(pdev, PCI_D0);
+        pci_enable_wake(pdev, PCI_D0, 0);
         pci_restore_state(pdev);
-        if (ioc->facts.Flags & MPI_IOCFACTS_FLAGS_FW_DOWNLOAD_BOOT) {
-                ioc->bars = pci_select_bars(ioc->pcidev, IORESOURCE_MEM |
-                        IORESOURCE_IO);
-                if (pci_enable_device(pdev))
-                        return 0;
-        } else {
-                ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
-                if (pci_enable_device_mem(pdev))
-                        return 0;
-        }
-        if (pci_request_selected_regions(pdev, ioc->bars, "mpt"))
-                return 0;
+        ioc->pcidev = pdev;
+        err = mpt_mapresources(ioc);
+        if (err)
+                return err;
 
-        /* enable interrupts */
-        CHIPREG_WRITE32(&ioc->chip->IntMask, MPI_HIM_DIM);
-        ioc->active = 1;
+        printk(MYIOC_s_INFO_FMT "pci-resume: ioc-state=0x%x,doorbell=0x%x\n",
+            ioc->name, (mpt_GetIocState(ioc, 1) >> MPI_IOC_STATE_SHIFT),
+            CHIPREG_READ32(&ioc->chip->Doorbell));
 
-        printk(MYIOC_s_INFO_FMT
-                "pci-resume: ioc-state=0x%x,doorbell=0x%x\n",
-                ioc->name,
-                (mpt_GetIocState(ioc, 1) >> MPI_IOC_STATE_SHIFT),
-                CHIPREG_READ32(&ioc->chip->Doorbell));
+        /*
+         * Errata workaround for SAS pci express:
+         * Upon returning to the D0 state, the contents of the doorbell will be
+         * stale data, and this will incorrectly signal to the host driver that
+         * the firmware is ready to process mpt commands.   The workaround is
+         * to issue a diagnostic reset.
+         */
+        if (ioc->bus_type == SAS && (pdev->device ==
+            MPI_MANUFACTPAGE_DEVID_SAS1068E || pdev->device ==
+            MPI_MANUFACTPAGE_DEVID_SAS1064E)) {
+                if (KickStart(ioc, 1, CAN_SLEEP) < 0) {
+                        printk(MYIOC_s_WARN_FMT "pci-resume: Cannot recover\n",
+                            ioc->name);
+                        goto out;
+                }
+        }
 
         /* bring ioc to operational state */
-        if ((recovery_state = mpt_do_ioc_recovery(ioc,
-            MPT_HOSTEVENT_IOC_RECOVER, CAN_SLEEP)) != 0) {
-                printk(MYIOC_s_INFO_FMT
-                        "pci-resume: Cannot recover, error:[%x]\n",
-                        ioc->name, recovery_state);
-        } else {
+        printk(MYIOC_s_INFO_FMT "Sending mpt_do_ioc_recovery\n", ioc->name);
+        recovery_state = mpt_do_ioc_recovery(ioc, MPT_HOSTEVENT_IOC_BRINGUP,
+                                                 CAN_SLEEP);
+        if (recovery_state != 0)
+                printk(MYIOC_s_WARN_FMT "pci-resume: Cannot recover, "
+                    "error:[%x]\n", ioc->name, recovery_state);
+        else
                 printk(MYIOC_s_INFO_FMT
-                        "pci-resume: success\n", ioc->name);
-        }
-
+                    "pci-resume: success\n", ioc->name);
+ out:
         return 0;
+
 }
 #endif
 
@@ -1903,6 +1938,7 @@ mpt_signal_reset(u8 index, MPT_ADAPTER *ioc, int reset_phase)
  *              -3 if READY but PrimeIOCFifos Failed
  *              -4 if READY but IOCInit Failed
  *              -5 if failed to enable_device and/or request_selected_regions
+ *              -6 if failed to upload firmware
  */
 static int
 mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
@@ -2097,7 +2133,7 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                                 } else {
                                         printk(MYIOC_s_WARN_FMT
                                             "firmware upload failure!\n", ioc->name);
-                                        ret = -5;
+                                        ret = -6;
                                 }
                         }
                 }
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 0c252f60c4c1..c207bda6723b 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1170,6 +1170,10 @@ mptscsih_shutdown(struct pci_dev *pdev)
 int
 mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
 {
+        MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
+
+        scsi_block_requests(ioc->sh);
+        flush_scheduled_work();
         mptscsih_shutdown(pdev);
         return mpt_suspend(pdev,state);
 }
@@ -1183,7 +1187,12 @@ mptscsih_suspend(struct pci_dev *pdev, pm_message_t state)
 int
 mptscsih_resume(struct pci_dev *pdev)
 {
-        return mpt_resume(pdev);
+        MPT_ADAPTER             *ioc = pci_get_drvdata(pdev);
+        int rc;
+
+        rc = mpt_resume(pdev);
+        scsi_unblock_requests(ioc->sh);
+        return rc;
 }
 
 #endif
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c
index 63fb1ff3ad10..f6f2d960cadb 100644
--- a/drivers/mfd/asic3.c
+++ b/drivers/mfd/asic3.c
@@ -28,14 +28,14 @@
 static inline void asic3_write_register(struct asic3 *asic,
                                  unsigned int reg, u32 value)
 {
-        iowrite16(value, (unsigned long)asic->mapping +
+        iowrite16(value, asic->mapping +
                   (reg >> asic->bus_shift));
 }
 
 static inline u32 asic3_read_register(struct asic3 *asic,
                                unsigned int reg)
 {
-        return ioread16((unsigned long)asic->mapping +
+        return ioread16(asic->mapping +
                         (reg >> asic->bus_shift));
 }
 
diff --git a/drivers/misc/fujitsu-laptop.c b/drivers/misc/fujitsu-laptop.c
index 1cfd7f3f1294..e2e7c05a147b 100644
--- a/drivers/misc/fujitsu-laptop.c
+++ b/drivers/misc/fujitsu-laptop.c
@@ -231,7 +231,7 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
 
         if (!device || !acpi_driver_data(device))
                 return -EINVAL;
-        fujitsu->acpi_handle = 0;
+        fujitsu->acpi_handle = NULL;
 
         return 0;
 }
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 4f9d4a9da983..b5f6add34b0b 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -106,7 +106,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi
         sp->irq = pdev->irq;
         sp->base_address = ioremap(pci_resource_start(pdev, 0),
                                         pci_resource_len(pdev, 0));
-        if (sp->base_address == 0) {
+        if (!sp->base_address) {
                 dev_err(sp->dev, "Failed to ioremap pci memory\n");
                 result =  -ENODEV;
                 goto error_ioremap;
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c
index c884730c5eaf..1bfe5d16963b 100644
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
@@ -197,7 +197,7 @@ static int lkdtm_parse_commandline(void)
 {
         int i;
 
-        if (cpoint_name == INVALID || cpoint_type == NONE ||
+        if (cpoint_name == NULL || cpoint_type == NULL ||
                                         cpoint_count < 1 || recur_count < 1)
                 return -EINVAL;
 
diff --git a/drivers/mmc/core/Makefile b/drivers/mmc/core/Makefile
index 4985807257a8..19a1a254a0c5 100644
--- a/drivers/mmc/core/Makefile
+++ b/drivers/mmc/core/Makefile
@@ -7,7 +7,7 @@ ifeq ($(CONFIG_MMC_DEBUG),y)
 endif
 
 obj-$(CONFIG_MMC)               += mmc_core.o
-mmc_core-y                      := core.o sysfs.o bus.o host.o \
+mmc_core-y                      := core.o bus.o host.o \
                                    mmc.o mmc_ops.o sd.o sd_ops.o \
                                    sdio.o sdio_ops.o sdio_bus.o \
                                    sdio_cis.o sdio_io.o sdio_irq.o
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index b0c22cad9423..fd95b18e988b 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -17,7 +17,6 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/host.h>
 
-#include "sysfs.h"
 #include "core.h"
 #include "sdio_cis.h"
 #include "bus.h"
@@ -43,7 +42,7 @@ static ssize_t mmc_type_show(struct device *dev,
 }
 
 static struct device_attribute mmc_dev_attrs[] = {
-        MMC_ATTR_RO(type),
+        __ATTR(type, S_IRUGO, mmc_type_show, NULL),
         __ATTR_NULL,
 };
 
@@ -189,7 +188,7 @@ static void mmc_release_card(struct device *dev)
 /*
  * Allocate and initialise a new MMC card structure.
  */
-struct mmc_card *mmc_alloc_card(struct mmc_host *host)
+struct mmc_card *mmc_alloc_card(struct mmc_host *host, struct device_type *type)
 {
         struct mmc_card *card;
 
@@ -204,6 +203,7 @@ struct mmc_card *mmc_alloc_card(struct mmc_host *host)
         card->dev.parent = mmc_classdev(host);
         card->dev.bus = &mmc_bus_type;
         card->dev.release = mmc_release_card;
+        card->dev.type = type;
 
         return card;
 }
@@ -248,24 +248,10 @@ int mmc_add_card(struct mmc_card *card)
                         type, card->rca);
         }
 
-        card->dev.uevent_suppress = 1;
-
         ret = device_add(&card->dev);
         if (ret)
                 return ret;
 
-        if (card->host->bus_ops->sysfs_add) {
-                ret = card->host->bus_ops->sysfs_add(card->host, card);
-                if (ret) {
-                        device_del(&card->dev);
-                        return ret;
-                 }
-        }
-
-        card->dev.uevent_suppress = 0;
-
-        kobject_uevent(&card->dev.kobj, KOBJ_ADD);
-
         mmc_card_set_present(card);
 
         return 0;
@@ -285,9 +271,6 @@ void mmc_remove_card(struct mmc_card *card)
                         printk(KERN_INFO "%s: card %04x removed\n",
                                 mmc_hostname(card->host), card->rca);
                 }
-
-                if (card->host->bus_ops->sysfs_remove)
-                        card->host->bus_ops->sysfs_remove(card->host, card);
                 device_del(&card->dev);
         }
 
diff --git a/drivers/mmc/core/bus.h b/drivers/mmc/core/bus.h
index 4f35431116a8..18178766ab46 100644
--- a/drivers/mmc/core/bus.h
+++ b/drivers/mmc/core/bus.h
@@ -11,7 +11,16 @@
 #ifndef _MMC_CORE_BUS_H
 #define _MMC_CORE_BUS_H
 
-struct mmc_card *mmc_alloc_card(struct mmc_host *host);
+#define MMC_DEV_ATTR(name, fmt, args...)                                        \
+static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
+{                                                                               \
+        struct mmc_card *card = container_of(dev, struct mmc_card, dev);        \
+        return sprintf(buf, fmt, args);                                         \
+}                                                                               \
+static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
+
+struct mmc_card *mmc_alloc_card(struct mmc_host *host,
+        struct device_type *type);
 int mmc_add_card(struct mmc_card *card);
 void mmc_remove_card(struct mmc_card *card);
 
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 39daf2fb5dc4..cfa8e15b5923 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -18,8 +18,6 @@
 struct mmc_bus_ops {
         void (*remove)(struct mmc_host *);
         void (*detect)(struct mmc_host *);
-        int (*sysfs_add)(struct mmc_host *, struct mmc_card *card);
-        void (*sysfs_remove)(struct mmc_host *, struct mmc_card *card);
         void (*suspend)(struct mmc_host *);
         void (*resume)(struct mmc_host *);
 };
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 68c0e3b2f0e8..3da29eef8f7d 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -17,7 +17,6 @@
 #include <linux/mmc/mmc.h>
 
 #include "core.h"
-#include "sysfs.h"
 #include "bus.h"
 #include "mmc_ops.h"
 
@@ -248,6 +247,44 @@ out:
         return err;
 }
 
+MMC_DEV_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
+        card->raw_cid[2], card->raw_cid[3]);
+MMC_DEV_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
+        card->raw_csd[2], card->raw_csd[3]);
+MMC_DEV_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year);
+MMC_DEV_ATTR(fwrev, "0x%x\n", card->cid.fwrev);
+MMC_DEV_ATTR(hwrev, "0x%x\n", card->cid.hwrev);
+MMC_DEV_ATTR(manfid, "0x%06x\n", card->cid.manfid);
+MMC_DEV_ATTR(name, "%s\n", card->cid.prod_name);
+MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
+MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial);
+
+static struct attribute *mmc_std_attrs[] = {
+        &dev_attr_cid.attr,
+        &dev_attr_csd.attr,
+        &dev_attr_date.attr,
+        &dev_attr_fwrev.attr,
+        &dev_attr_hwrev.attr,
+        &dev_attr_manfid.attr,
+        &dev_attr_name.attr,
+        &dev_attr_oemid.attr,
+        &dev_attr_serial.attr,
+        NULL,
+};
+
+static struct attribute_group mmc_std_attr_group = {
+        .attrs = mmc_std_attrs,
+};
+
+static struct attribute_group *mmc_attr_groups[] = {
+        &mmc_std_attr_group,
+        NULL,
+};
+
+static struct device_type mmc_type = {
+        .groups = mmc_attr_groups,
+};
+
 /*
  * Handle the detection and initialisation of a card.
  *
@@ -308,7 +345,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                 /*
                  * Allocate card structure.
                  */
-                card = mmc_alloc_card(host);
+                card = mmc_alloc_card(host, &mmc_type);
                 if (IS_ERR(card)) {
                         err = PTR_ERR(card);
                         goto err;
@@ -459,53 +496,6 @@ static void mmc_detect(struct mmc_host *host)
         }
 }
 
-MMC_ATTR_FN(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
-        card->raw_cid[2], card->raw_cid[3]);
-MMC_ATTR_FN(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
-        card->raw_csd[2], card->raw_csd[3]);
-MMC_ATTR_FN(date, "%02d/%04d\n", card->cid.month, card->cid.year);
-MMC_ATTR_FN(fwrev, "0x%x\n", card->cid.fwrev);
-MMC_ATTR_FN(hwrev, "0x%x\n", card->cid.hwrev);
-MMC_ATTR_FN(manfid, "0x%06x\n", card->cid.manfid);
-MMC_ATTR_FN(name, "%s\n", card->cid.prod_name);
-MMC_ATTR_FN(oemid, "0x%04x\n", card->cid.oemid);
-MMC_ATTR_FN(serial, "0x%08x\n", card->cid.serial);
-
-static struct device_attribute mmc_dev_attrs[] = {
-        MMC_ATTR_RO(cid),
-        MMC_ATTR_RO(csd),
-        MMC_ATTR_RO(date),
-        MMC_ATTR_RO(fwrev),
-        MMC_ATTR_RO(hwrev),
-        MMC_ATTR_RO(manfid),
-        MMC_ATTR_RO(name),
-        MMC_ATTR_RO(oemid),
-        MMC_ATTR_RO(serial),
-        __ATTR_NULL,
-};
-
-/*
- * Adds sysfs entries as relevant.
- */
-static int mmc_sysfs_add(struct mmc_host *host, struct mmc_card *card)
-{
-        int ret;
-
-        ret = mmc_add_attrs(card, mmc_dev_attrs);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-/*
- * Removes the sysfs entries added by mmc_sysfs_add().
- */
-static void mmc_sysfs_remove(struct mmc_host *host, struct mmc_card *card)
-{
-        mmc_remove_attrs(card, mmc_dev_attrs);
-}
-
 #ifdef CONFIG_MMC_UNSAFE_RESUME
 
 /*
@@ -560,8 +550,6 @@ static void mmc_resume(struct mmc_host *host)
 static const struct mmc_bus_ops mmc_ops = {
         .remove = mmc_remove,
         .detect = mmc_detect,
-        .sysfs_add = mmc_sysfs_add,
-        .sysfs_remove = mmc_sysfs_remove,
         .suspend = mmc_suspend,
         .resume = mmc_resume,
 };
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index d1c1e0f592f1..7ef3b15c5e3d 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -18,7 +18,6 @@
 #include <linux/mmc/sd.h>
 
 #include "core.h"
-#include "sysfs.h"
 #include "bus.h"
 #include "mmc_ops.h"
 #include "sd_ops.h"
@@ -283,6 +282,47 @@ out:
         return err;
 }
 
+MMC_DEV_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
+        card->raw_cid[2], card->raw_cid[3]);
+MMC_DEV_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
+        card->raw_csd[2], card->raw_csd[3]);
+MMC_DEV_ATTR(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]);
+MMC_DEV_ATTR(date, "%02d/%04d\n", card->cid.month, card->cid.year);
+MMC_DEV_ATTR(fwrev, "0x%x\n", card->cid.fwrev);
+MMC_DEV_ATTR(hwrev, "0x%x\n", card->cid.hwrev);
+MMC_DEV_ATTR(manfid, "0x%06x\n", card->cid.manfid);
+MMC_DEV_ATTR(name, "%s\n", card->cid.prod_name);
+MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
+MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial);
+
+
+static struct attribute *sd_std_attrs[] = {
+        &dev_attr_cid.attr,
+        &dev_attr_csd.attr,
+        &dev_attr_scr.attr,
+        &dev_attr_date.attr,
+        &dev_attr_fwrev.attr,
+        &dev_attr_hwrev.attr,
+        &dev_attr_manfid.attr,
+        &dev_attr_name.attr,
+        &dev_attr_oemid.attr,
+        &dev_attr_serial.attr,
+        NULL,
+};
+
+static struct attribute_group sd_std_attr_group = {
+        .attrs = sd_std_attrs,
+};
+
+static struct attribute_group *sd_attr_groups[] = {
+        &sd_std_attr_group,
+        NULL,
+};
+
+static struct device_type sd_type = {
+        .groups = sd_attr_groups,
+};
+
 /*
  * Handle the detection and initialisation of a card.
  *
@@ -352,7 +392,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
                 /*
                  * Allocate card structure.
                  */
-                card = mmc_alloc_card(host);
+                card = mmc_alloc_card(host, &sd_type);
                 if (IS_ERR(card)) {
                         err = PTR_ERR(card);
                         goto err;
@@ -518,55 +558,6 @@ static void mmc_sd_detect(struct mmc_host *host)
         }
 }
 
-MMC_ATTR_FN(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
-        card->raw_cid[2], card->raw_cid[3]);
-MMC_ATTR_FN(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
-        card->raw_csd[2], card->raw_csd[3]);
-MMC_ATTR_FN(scr, "%08x%08x\n", card->raw_scr[0], card->raw_scr[1]);
-MMC_ATTR_FN(date, "%02d/%04d\n", card->cid.month, card->cid.year);
-MMC_ATTR_FN(fwrev, "0x%x\n", card->cid.fwrev);
-MMC_ATTR_FN(hwrev, "0x%x\n", card->cid.hwrev);
-MMC_ATTR_FN(manfid, "0x%06x\n", card->cid.manfid);
-MMC_ATTR_FN(name, "%s\n", card->cid.prod_name);
-MMC_ATTR_FN(oemid, "0x%04x\n", card->cid.oemid);
-MMC_ATTR_FN(serial, "0x%08x\n", card->cid.serial);
-
-static struct device_attribute mmc_sd_dev_attrs[] = {
-        MMC_ATTR_RO(cid),
-        MMC_ATTR_RO(csd),
-        MMC_ATTR_RO(scr),
-        MMC_ATTR_RO(date),
-        MMC_ATTR_RO(fwrev),
-        MMC_ATTR_RO(hwrev),
-        MMC_ATTR_RO(manfid),
-        MMC_ATTR_RO(name),
-        MMC_ATTR_RO(oemid),
-        MMC_ATTR_RO(serial),
-        __ATTR_NULL,
-};
-
-/*
- * Adds sysfs entries as relevant.
- */
-static int mmc_sd_sysfs_add(struct mmc_host *host, struct mmc_card *card)
-{
-        int ret;
-
-        ret = mmc_add_attrs(card, mmc_sd_dev_attrs);
-        if (ret < 0)
-                return ret;
-
-        return 0;
-}
-
-/*
- * Removes the sysfs entries added by mmc_sysfs_add().
- */
-static void mmc_sd_sysfs_remove(struct mmc_host *host, struct mmc_card *card)
-{
-        mmc_remove_attrs(card, mmc_sd_dev_attrs);
-}
-
 #ifdef CONFIG_MMC_UNSAFE_RESUME
 
 /*
@@ -621,8 +612,6 @@ static void mmc_sd_resume(struct mmc_host *host)
 static const struct mmc_bus_ops mmc_sd_ops = {
         .remove = mmc_sd_remove,
         .detect = mmc_sd_detect,
-        .sysfs_add = mmc_sd_sysfs_add,
-        .sysfs_remove = mmc_sd_sysfs_remove,
         .suspend = mmc_sd_suspend,
         .resume = mmc_sd_resume,
 };
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 87a50f456efc..4eab79e09ccc 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -287,7 +287,7 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
         /*
          * Allocate card structure.
          */
-        card = mmc_alloc_card(host);
+        card = mmc_alloc_card(host, NULL);
         if (IS_ERR(card)) {
                 err = PTR_ERR(card);
                 goto err;
diff --git a/drivers/mmc/core/sysfs.c b/drivers/mmc/core/sysfs.c
deleted file mode 100644
index 00a97e70f914..000000000000
--- a/drivers/mmc/core/sysfs.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *  linux/drivers/mmc/core/sysfs.c
- *
- *  Copyright (C) 2003 Russell King, All Rights Reserved.
- *  Copyright 2007 Pierre Ossman
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *  MMC sysfs/driver model support.
- */
-#include <linux/device.h>
-
-#include <linux/mmc/card.h>
-
-#include "sysfs.h"
-
-int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs)
-{
-        int error = 0;
-        int i;
-
-        for (i = 0; attr_name(attrs[i]); i++) {
-                error = device_create_file(&card->dev, &attrs[i]);
-                if (error) {
-                        while (--i >= 0)
-                                device_remove_file(&card->dev, &attrs[i]);
-                        break;
-                }
-        }
-
-        return error;
-}
-
-void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs)
-{
-        int i;
-
-        for (i = 0; attr_name(attrs[i]); i++)
-                device_remove_file(&card->dev, &attrs[i]);
-}
-
diff --git a/drivers/mmc/core/sysfs.h b/drivers/mmc/core/sysfs.h
deleted file mode 100644
index 4b8f670bd10f..000000000000
--- a/drivers/mmc/core/sysfs.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- *  linux/drivers/mmc/core/sysfs.h
- *
- *  Copyright (C) 2003 Russell King, All Rights Reserved.
- *  Copyright 2007 Pierre Ossman
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef _MMC_CORE_SYSFS_H
-#define _MMC_CORE_SYSFS_H
-
-#define MMC_ATTR_FN(name, fmt, args...)                                 \
-static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
-{                                                                       \
-        struct mmc_card *card = container_of(dev, struct mmc_card, dev);\
-        return sprintf(buf, fmt, args);                                 \
-}
-
-#define MMC_ATTR_RO(name) __ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
-
-int mmc_add_attrs(struct mmc_card *card, struct device_attribute *attrs);
-void mmc_remove_attrs(struct mmc_card *card, struct device_attribute *attrs);
-
-#endif
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index eeaaa9dce6ef..ad1880c67518 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -408,7 +408,6 @@ static int block2mtd_setup2(const char *val)
         if (token[1]) {
                 ret = parse_num(&erase_size, token[1]);
                 if (ret) {
-                        kfree(name);
                         parse_err("illegal erase size");
                 }
         }
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index f00e04efbe28..bc4649a17b9d 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -202,9 +202,8 @@ static int physmap_flash_suspend(struct platform_device *dev, pm_message_t state
         int ret = 0;
         int i;
 
-        if (info)
-                for (i = 0; i < MAX_RESOURCES; i++)
-                        ret |= info->mtd[i]->suspend(info->mtd[i]);
+        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
+                ret |= info->mtd[i]->suspend(info->mtd[i]);
 
         return ret;
 }
@@ -214,9 +213,9 @@ static int physmap_flash_resume(struct platform_device *dev)
         struct physmap_flash_info *info = platform_get_drvdata(dev);
         int i;
 
-        if (info)
-                for (i = 0; i < MAX_RESOURCES; i++)
-                        info->mtd[i]->resume(info->mtd[i]);
+        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
+                info->mtd[i]->resume(info->mtd[i]);
+
         return 0;
 }
 
@@ -225,8 +224,8 @@ static void physmap_flash_shutdown(struct platform_device *dev)
         struct physmap_flash_info *info = platform_get_drvdata(dev);
         int i;
 
-        for (i = 0; i < MAX_RESOURCES; i++)
-                if (info && info->mtd[i]->suspend(info->mtd[i]) == 0)
+        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
+                if (info->mtd[i]->suspend(info->mtd[i]) == 0)
                         info->mtd[i]->resume(info->mtd[i]);
 }
 #else
diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c
index 9189ec8f243e..0f6ac250f434 100644
--- a/drivers/mtd/nand/rtc_from4.c
+++ b/drivers/mtd/nand/rtc_from4.c
@@ -460,7 +460,7 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this,
                         er_stat |= 1 << 1;
                 kfree(buf);
         }
-
+out:
         rtn = status;
         if (er_stat == 0) {     /* if ECC is available   */
                 rtn = (status & ~NAND_STATUS_FAIL);     /*   clear the error bit */
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index b09a53de1c53..d63cc93f055d 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -968,7 +968,7 @@ dm9000_interrupt(int irq, void *dev_id)
 struct dm9000_rxhdr {
         u8      RxPktReady;
         u8      RxStatus;
-        u16     RxLen;
+        __le16  RxLen;
 } __attribute__((__packed__));
 
 /*
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 1837584c4504..6a3ac4ea97e9 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -109,7 +109,8 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of, const struct of_device_i
                 int irq = irq_of_parse_and_map(child, 0);
                 if (irq != NO_IRQ) {
                         const u32 *id = of_get_property(child, "reg", NULL);
-                        bus->irq[*id] = irq;
+                        if (id)
+                                bus->irq[*id] = irq;
                 }
         }
 
diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index fee3d7b1feba..1e965427b0e9 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -903,17 +903,18 @@ plip_interrupt(void *dev_id)
         struct net_local *nl;
         struct plip_local *rcv;
         unsigned char c0;
+        unsigned long flags;
 
         nl = netdev_priv(dev);
         rcv = &nl->rcv_data;
 
-        spin_lock_irq (&nl->lock);
+        spin_lock_irqsave (&nl->lock, flags);
 
         c0 = read_status(dev);
         if ((c0 & 0xf8) != 0xc0) {
                 if ((dev->irq != -1) && (net_debug > 1))
                         printk(KERN_DEBUG "%s: spurious interrupt\n", dev->name);
-                spin_unlock_irq (&nl->lock);
+                spin_unlock_irqrestore (&nl->lock, flags);
                 return;
         }
 
@@ -942,7 +943,7 @@ plip_interrupt(void *dev_id)
                 break;
         }
 
-        spin_unlock_irq(&nl->lock);
+        spin_unlock_irqrestore(&nl->lock, flags);
 }
 
 static int
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 54c662690f65..853bce0ac478 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4329,10 +4329,14 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
         if (!hw)
                 return 0;
 
+        del_timer_sync(&hw->watchdog_timer);
+        cancel_work_sync(&hw->restart_work);
+
         for (i = 0; i < hw->ports; i++) {
                 struct net_device *dev = hw->dev[i];
                 struct sky2_port *sky2 = netdev_priv(dev);
 
+                netif_device_detach(dev);
                 if (netif_running(dev))
                         sky2_down(dev);
 
@@ -4383,6 +4387,8 @@ static int sky2_resume(struct pci_dev *pdev)
 
         for (i = 0; i < hw->ports; i++) {
                 struct net_device *dev = hw->dev[i];
+
+                netif_device_attach(dev);
                 if (netif_running(dev)) {
                         err = sky2_up(dev);
                         if (err) {
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 7e1f00131f91..df56a518691c 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -376,7 +376,7 @@ static int alloc_all_urbs(rtl8150_t * dev)
                 return 0;
         }
         dev->ctrl_urb = usb_alloc_urb(0, GFP_KERNEL);
-        if (!dev->intr_urb) {
+        if (!dev->ctrl_urb) {
                 usb_free_urb(dev->rx_urb);
                 usb_free_urb(dev->tx_urb);
                 usb_free_urb(dev->intr_urb);
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
index 7f4836b8e71e..5fa4ba0d9934 100644
--- a/drivers/pci/hotplug/pciehp_core.c
+++ b/drivers/pci/hotplug/pciehp_core.c
@@ -467,7 +467,7 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
         t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
 
         t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */
-        if (value) {
+        if (value && pciehp_force) {
                 rc = pciehp_enable_slot(t_slot);
                 if (rc) /* -ENODEV: shouldn't happen, but deal with it */
                         value = 0;
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 977d29b32295..4cb949f0ebd9 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -1097,6 +1097,8 @@ static void iommu_free_domain(struct dmar_domain *domain)
 }
 
 static struct iova_domain reserved_iova_list;
+static struct lock_class_key reserved_alloc_key;
+static struct lock_class_key reserved_rbtree_key;
 
 static void dmar_init_reserved_ranges(void)
 {
@@ -1107,6 +1109,11 @@ static void dmar_init_reserved_ranges(void)
 
         init_iova_domain(&reserved_iova_list, DMA_32BIT_PFN);
 
+        lockdep_set_class(&reserved_iova_list.iova_alloc_lock,
+                &reserved_alloc_key);
+        lockdep_set_class(&reserved_iova_list.iova_rbtree_lock,
+                &reserved_rbtree_key);
+
         /* IOAPIC ranges shouldn't be accessed by DMA */
         iova = reserve_iova(&reserved_iova_list, IOVA_PFN(IOAPIC_RANGE_START),
                 IOVA_PFN(IOAPIC_RANGE_END));
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 183fddaa38b7..a4445b7210bf 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -314,24 +314,6 @@ int pci_find_ht_capability(struct pci_dev *dev, int ht_cap)
 }
 EXPORT_SYMBOL_GPL(pci_find_ht_capability);
 
-void pcie_wait_pending_transaction(struct pci_dev *dev)
-{
-        int pos;
-        u16 reg16;
-
-        pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
-        if (!pos)
-                return;
-        while (1) {
-                pci_read_config_word(dev, pos + PCI_EXP_DEVSTA, &reg16);
-                if (!(reg16 & PCI_EXP_DEVSTA_TRPND))
-                        break;
-                cpu_relax();
-        }
-
-}
-EXPORT_SYMBOL_GPL(pcie_wait_pending_transaction);
-
 /**
  * pci_find_parent_resource - return resource region of parent bus of given region
  * @dev: PCI device structure contains resources to be searched
@@ -936,9 +918,6 @@ pci_disable_device(struct pci_dev *dev)
         if (atomic_sub_return(1, &dev->enable_cnt) != 0)
                 return;
 
-        /* Wait for all transactions are finished before disabling the device */
-        pcie_wait_pending_transaction(dev);
-
         pci_read_config_word(dev, PCI_COMMAND, &pci_command);
         if (pci_command & PCI_COMMAND_MASTER) {
                 pci_command &= ~PCI_COMMAND_MASTER;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index e9a333d98552..e887aa45c9cd 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -951,6 +951,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_82375,	quirk_e
  * accesses to the SMBus registers, with potentially bad effects. Thus you
  * should be very careful when adding new entries: if SMM is accessing the
  * Intel SMBus, this is a very good reason to leave it hidden.
+ *
+ * Likewise, many recent laptops use ACPI for thermal management. If the
+ * ACPI DSDT code accesses the SMBus, then Linux should not access it
+ * natively, and keeping the SMBus hidden is the right thing to do. If you
+ * are about to add an entry in the table below, please first disassemble
+ * the DSDT and double-check that there is no code accessing the SMBus.
  */
 static int asus_hides_smbus;
 
@@ -1028,11 +1034,6 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                         case 0x12bf: /* HP xw4100 */
                                 asus_hides_smbus = 1;
                         }
-                else if (dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB)
-                        switch (dev->subsystem_device) {
-                        case 0x099c: /* HP Compaq nx6110 */
-                                asus_hides_smbus = 1;
-                        }
        } else if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_SAMSUNG)) {
                if (dev->device ==  PCI_DEVICE_ID_INTEL_82855PM_HB)
                        switch(dev->subsystem_device) {
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 125e7b7f34ff..f7cb8e0758b4 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -486,12 +486,7 @@ void __ref pci_bus_size_bridges(struct pci_bus *bus)
                 break;
 
         case PCI_CLASS_BRIDGE_PCI:
-                /* don't size subtractive decoding (transparent)
-                 * PCI-to-PCI bridges */
-                if (bus->self->transparent)
-                        break;
                 pci_bridge_check_ranges(bus);
-                /* fall through */
         default:
                 pbus_size_io(bus);
                 /* If the bridge supports prefetchable range, size it
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 2c925b7cd93e..257f5d827d83 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -88,6 +88,15 @@ MODULE_LICENSE("GPL");
 #define _LTAG_MEM32RANGE        0x85
 #define _LTAG_FIXEDMEM32RANGE   0x86
 
+/*
+ * Sizes of ISAPNP logical device configuration register sets.
+ * See PNP-ISA-v1.0a.pdf, Appendix A.
+ */
+#define ISAPNP_MAX_MEM          4
+#define ISAPNP_MAX_PORT         8
+#define ISAPNP_MAX_IRQ          2
+#define ISAPNP_MAX_DMA          2
+
 static unsigned char isapnp_checksum_value;
 static DEFINE_MUTEX(isapnp_cfg_mutex);
 static int isapnp_csn_count;
@@ -945,14 +954,14 @@ static int isapnp_read_resources(struct pnp_dev *dev,
 
         dev->active = isapnp_read_byte(ISAPNP_CFG_ACTIVATE);
         if (dev->active) {
-                for (tmp = 0; tmp < PNP_MAX_PORT; tmp++) {
+                for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) {
                         ret = isapnp_read_word(ISAPNP_CFG_PORT + (tmp << 1));
                         if (!ret)
                                 continue;
                         res->port_resource[tmp].start = ret;
                         res->port_resource[tmp].flags = IORESOURCE_IO;
                 }
-                for (tmp = 0; tmp < PNP_MAX_MEM; tmp++) {
+                for (tmp = 0; tmp < ISAPNP_MAX_MEM; tmp++) {
                         ret =
                             isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
                         if (!ret)
@@ -960,7 +969,7 @@ static int isapnp_read_resources(struct pnp_dev *dev,
                         res->mem_resource[tmp].start = ret;
                         res->mem_resource[tmp].flags = IORESOURCE_MEM;
                 }
-                for (tmp = 0; tmp < PNP_MAX_IRQ; tmp++) {
+                for (tmp = 0; tmp < ISAPNP_MAX_IRQ; tmp++) {
                         ret =
                             (isapnp_read_word(ISAPNP_CFG_IRQ + (tmp << 1)) >>
                              8);
@@ -970,7 +979,7 @@ static int isapnp_read_resources(struct pnp_dev *dev,
                             res->irq_resource[tmp].end = ret;
                         res->irq_resource[tmp].flags = IORESOURCE_IRQ;
                 }
-                for (tmp = 0; tmp < PNP_MAX_DMA; tmp++) {
+                for (tmp = 0; tmp < ISAPNP_MAX_DMA; tmp++) {
                         ret = isapnp_read_byte(ISAPNP_CFG_DMA + tmp);
                         if (ret == 4)
                                 continue;
@@ -1002,14 +1011,14 @@ static int isapnp_set_resources(struct pnp_dev *dev,
         isapnp_cfg_begin(dev->card->number, dev->number);
         dev->active = 1;
         for (tmp = 0;
-             tmp < PNP_MAX_PORT
+             tmp < ISAPNP_MAX_PORT
              && (res->port_resource[tmp].
                  flags & (IORESOURCE_IO | IORESOURCE_UNSET)) == IORESOURCE_IO;
              tmp++)
                 isapnp_write_word(ISAPNP_CFG_PORT + (tmp << 1),
                                   res->port_resource[tmp].start);
         for (tmp = 0;
-             tmp < PNP_MAX_IRQ
+             tmp < ISAPNP_MAX_IRQ
              && (res->irq_resource[tmp].
                  flags & (IORESOURCE_IRQ | IORESOURCE_UNSET)) == IORESOURCE_IRQ;
              tmp++) {
@@ -1019,14 +1028,14 @@ static int isapnp_set_resources(struct pnp_dev *dev,
                 isapnp_write_byte(ISAPNP_CFG_IRQ + (tmp << 1), irq);
         }
         for (tmp = 0;
-             tmp < PNP_MAX_DMA
+             tmp < ISAPNP_MAX_DMA
              && (res->dma_resource[tmp].
                  flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) == IORESOURCE_DMA;
              tmp++)
                 isapnp_write_byte(ISAPNP_CFG_DMA + tmp,
                                   res->dma_resource[tmp].start);
         for (tmp = 0;
-             tmp < PNP_MAX_MEM
+             tmp < ISAPNP_MAX_MEM
              && (res->mem_resource[tmp].
                  flags & (IORESOURCE_MEM | IORESOURCE_UNSET)) == IORESOURCE_MEM;
              tmp++)
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 6aa231ef642d..2dcd1960aca8 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -85,7 +85,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
                i < PNP_MAX_IRQ)
                 i++;
         if (i >= PNP_MAX_IRQ && !warned) {
-                printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "
+                printk(KERN_WARNING "pnpacpi: exceeded the max number of IRQ "
                                 "resources: %d \n", PNP_MAX_IRQ);
                 warned = 1;
                 return;
@@ -187,7 +187,7 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
                 res->dma_resource[i].start = dma;
                 res->dma_resource[i].end = dma;
         } else if (!warned) {
-                printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "
+                printk(KERN_WARNING "pnpacpi: exceeded the max number of DMA "
                                 "resources: %d \n", PNP_MAX_DMA);
                 warned = 1;
         }
@@ -213,7 +213,7 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
                 res->port_resource[i].start = io;
                 res->port_resource[i].end = io + len - 1;
         } else if (!warned) {
-                printk(KERN_ERR "pnpacpi: exceeded the max number of IO "
+                printk(KERN_WARNING "pnpacpi: exceeded the max number of IO "
                                 "resources: %d \n", PNP_MAX_PORT);
                 warned = 1;
         }
@@ -241,7 +241,7 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
                 res->mem_resource[i].start = mem;
                 res->mem_resource[i].end = mem + len - 1;
         } else if (!warned) {
-                printk(KERN_ERR "pnpacpi: exceeded the max number of mem "
+                printk(KERN_WARNING "pnpacpi: exceeded the max number of mem "
                                 "resources: %d\n", PNP_MAX_MEM);
                 warned = 1;
         }
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 82f5ad9c3af4..9e7de63b26ef 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -16,7 +16,7 @@ menuconfig RTC_CLASS
           probably want to enable one or more of the interfaces below.
 
           This driver can also be built as a module. If so, the module
-          will be called rtc-class.
+          will be called rtc-core.
 
 if RTC_CLASS
 
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c
index bbf10ecf416c..56728a2a3385 100644
--- a/drivers/rtc/rtc-at91sam9.c
+++ b/drivers/rtc/rtc-at91sam9.c
@@ -274,7 +274,7 @@ static irqreturn_t at91_rtc_interrupt(int irq, void *_rtc)
          * SR clears it, so we must only read it in this irq handler!
          */
         mr = rtt_readl(rtc, MR) & (AT91_RTT_ALMIEN | AT91_RTT_RTTINCIEN);
-        sr = rtt_readl(rtc, SR) & mr;
+        sr = rtt_readl(rtc, SR) & (mr >> 16);
         if (!sr)
                 return IRQ_NONE;
 
@@ -321,6 +321,10 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
         if (!rtc)
                 return -ENOMEM;
 
+        /* platform setup code should have handled this; sigh */
+        if (!device_can_wakeup(&pdev->dev))
+                device_init_wakeup(&pdev->dev, 1);
+
         platform_set_drvdata(pdev, rtc);
         rtc->rtt = (void __force __iomem *) (AT91_VA_BASE_SYS - AT91_BASE_SYS);
         rtc->rtt += r->start;
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index c46666a24809..b9d374082b65 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -325,7 +325,7 @@ menuconfig SCSI_LOWLEVEL
         depends on SCSI!=n
         default y
 
-if SCSI_LOWLEVEL
+if SCSI_LOWLEVEL && SCSI
 
 config ISCSI_TCP
         tristate "iSCSI Initiator over TCP/IP"
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index f608d4a1d6da..792b2e807bf3 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -674,12 +674,13 @@ static struct orc_scb *__orc_alloc_scb(struct orc_host * host)
                 for (index = 0; index < 32; index++) {
                         if ((host->allocation_map[channel][i] >> index) & 0x01) {
                                 host->allocation_map[channel][i] &= ~(1 << index);
-                                break;
+                                idx = index + 32 * i;
+                                /*
+                                 * Translate the index to a structure instance
+                                 */
+                                return host->scb_virt + idx;
                         }
                 }
-                idx = index + 32 * i;
-                /* Translate the index to a structure instance */
-                return (struct orc_scb *) ((unsigned long) host->scb_virt + (idx * sizeof(struct orc_scb)));
         }
         return NULL;
 }
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 3c2d6888bb8c..8591585e5cc5 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -6439,7 +6439,7 @@ static int AdvLoadMicrocode(AdvPortAddr iop_base, unsigned char *buf, int size,
                         i += 2;
                         len += 2;
                 } else {
-                        unsigned char off = buf[i] * 2;
+                        unsigned int off = buf[i] * 2;
                         unsigned short word = (buf[off + 1] << 8) | buf[off];
                         AdvWriteWordAutoIncLram(iop_base, word);
                         len += 2;
diff --git a/drivers/scsi/arcmsr/arcmsr.h b/drivers/scsi/arcmsr/arcmsr.h
index 0393707bdfce..3288be2e49f8 100644
--- a/drivers/scsi/arcmsr/arcmsr.h
+++ b/drivers/scsi/arcmsr/arcmsr.h
@@ -341,13 +341,13 @@ struct MessageUnit_B
         uint32_t        done_qbuffer[ARCMSR_MAX_HBB_POSTQUEUE];
         uint32_t        postq_index;
         uint32_t        doneq_index;
-        uint32_t        __iomem *drv2iop_doorbell_reg;
-        uint32_t        __iomem *drv2iop_doorbell_mask_reg;
-        uint32_t        __iomem *iop2drv_doorbell_reg;
-        uint32_t        __iomem *iop2drv_doorbell_mask_reg;
-        uint32_t        __iomem *msgcode_rwbuffer_reg;
-        uint32_t        __iomem *ioctl_wbuffer_reg;
-        uint32_t        __iomem *ioctl_rbuffer_reg;
+        void            __iomem *drv2iop_doorbell_reg;
+        void            __iomem *drv2iop_doorbell_mask_reg;
+        void            __iomem *iop2drv_doorbell_reg;
+        void            __iomem *iop2drv_doorbell_mask_reg;
+        void            __iomem *msgcode_rwbuffer_reg;
+        void            __iomem *ioctl_wbuffer_reg;
+        void            __iomem *ioctl_rbuffer_reg;
 };
 
 /*
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
index 27ebd336409b..0b2080d33575 100644
--- a/drivers/scsi/gdth.c
+++ b/drivers/scsi/gdth.c
@@ -493,6 +493,12 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
     if (!scp)
         return -ENOMEM;
 
+    scp->sense_buffer = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+    if (!scp->sense_buffer) {
+        kfree(scp);
+        return -ENOMEM;
+    }
+
     scp->device = sdev;
     memset(&cmndinfo, 0, sizeof(cmndinfo));
 
@@ -513,6 +519,7 @@ int __gdth_execute(struct scsi_device *sdev, gdth_cmd_str *gdtcmd, char *cmnd,
     rval = cmndinfo.status;
     if (info)
         *info = cmndinfo.info;
+    kfree(scp->sense_buffer);
     kfree(scp);
     return rval;
 }
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 880c78bff0e1..ed7e0a1fc34d 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -218,18 +218,24 @@ int scsi_add_host(struct Scsi_Host *shost, struct device *dev)
 
         get_device(&shost->shost_gendev);
 
-        if (shost->transportt->host_size &&
-            (shost->shost_data = kzalloc(shost->transportt->host_size,
-                                         GFP_KERNEL)) == NULL)
-                goto out_del_classdev;
+        if (shost->transportt->host_size) {
+                shost->shost_data = kzalloc(shost->transportt->host_size,
+                                         GFP_KERNEL);
+                if (shost->shost_data == NULL) {
+                        error = -ENOMEM;
+                        goto out_del_classdev;
+                }
+        }
 
         if (shost->transportt->create_work_queue) {
                 snprintf(shost->work_q_name, KOBJ_NAME_LEN, "scsi_wq_%d",
                         shost->host_no);
                 shost->work_q = create_singlethread_workqueue(
                                         shost->work_q_name);
-                if (!shost->work_q)
+                if (!shost->work_q) {
+                        error = -EINVAL;
                         goto out_free_shost_data;
+                }
         }
 
         error = scsi_sysfs_add_host(shost);
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 31b9af224243..709a6f75ca9d 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -295,11 +295,14 @@ static void sas_discover_domain(struct work_struct *work)
         case FANOUT_DEV:
                 error = sas_discover_root_expander(dev);
                 break;
-#ifdef CONFIG_SCSI_SAS_ATA
         case SATA_DEV:
         case SATA_PM:
+#ifdef CONFIG_SCSI_SAS_ATA
                 error = sas_discover_sata(dev);
                 break;
+#else
+                SAS_DPRINTK("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n");
+                /* Fall through */
 #endif
         default:
                 error = -ENXIO;
diff --git a/drivers/scsi/mvsas.c b/drivers/scsi/mvsas.c
index 5ec0665b3a3d..e55b9037adb2 100644
--- a/drivers/scsi/mvsas.c
+++ b/drivers/scsi/mvsas.c
@@ -37,11 +37,13 @@
 #include <linux/dma-mapping.h>
 #include <linux/ctype.h>
 #include <scsi/libsas.h>
+#include <scsi/scsi_tcq.h>
+#include <scsi/sas_ata.h>
 #include <asm/io.h>
 
 #define DRV_NAME        "mvsas"
-#define DRV_VERSION     "0.5.1"
-#define _MV_DUMP 0
+#define DRV_VERSION     "0.5.2"
+#define _MV_DUMP        0
 #define MVS_DISABLE_NVRAM
 #define MVS_DISABLE_MSI
 
@@ -52,7 +54,7 @@
         readl(regs + MVS_##reg);                \
         } while (0)
 
-#define MVS_ID_NOT_MAPPED       0xff
+#define MVS_ID_NOT_MAPPED       0x7f
 #define MVS_CHIP_SLOT_SZ        (1U << mvi->chip->slot_width)
 
 /* offset for D2H FIS in the Received FIS List Structure */
@@ -84,6 +86,7 @@ enum driver_configuration {
         MVS_RX_FIS_COUNT        = 17,   /* Optional rx'd FISs (max 17) */
 
         MVS_QUEUE_SIZE          = 30,   /* Support Queue depth */
+        MVS_CAN_QUEUE           = MVS_SLOTS - 1,        /* SCSI Queue depth */
 };
 
 /* unchangeable hardware details */
@@ -358,7 +361,20 @@ enum hw_register_bits {
 
         /* VSR */
         /* PHYMODE 6 (CDB) */
-        PHY_MODE6_DTL_SPEED     = (1U << 27),
+        PHY_MODE6_LATECLK       = (1U << 29),   /* Lock Clock */
+        PHY_MODE6_DTL_SPEED     = (1U << 27),   /* Digital Loop Speed */
+        PHY_MODE6_FC_ORDER      = (1U << 26),   /* Fibre Channel Mode Order*/
+        PHY_MODE6_MUCNT_EN      = (1U << 24),   /* u Count Enable */
+        PHY_MODE6_SEL_MUCNT_LEN = (1U << 22),   /* Training Length Select */
+        PHY_MODE6_SELMUPI       = (1U << 20),   /* Phase Multi Select (init) */
+        PHY_MODE6_SELMUPF       = (1U << 18),   /* Phase Multi Select (final) */
+        PHY_MODE6_SELMUFF       = (1U << 16),   /* Freq Loop Multi Sel(final) */
+        PHY_MODE6_SELMUFI       = (1U << 14),   /* Freq Loop Multi Sel(init) */
+        PHY_MODE6_FREEZE_LOOP   = (1U << 12),   /* Freeze Rx CDR Loop */
+        PHY_MODE6_INT_RXFOFFS   = (1U << 3),    /* Rx CDR Freq Loop Enable */
+        PHY_MODE6_FRC_RXFOFFS   = (1U << 2),    /* Initial Rx CDR Offset */
+        PHY_MODE6_STAU_0D8      = (1U << 1),    /* Rx CDR Freq Loop Saturate */
+        PHY_MODE6_RXSAT_DIS     = (1U << 0),    /* Saturate Ctl */
 };
 
 enum mvs_info_flags {
@@ -511,7 +527,43 @@ enum status_buffer {
 };
 
 enum error_info_rec {
-        CMD_ISS_STPD    =  (1U << 31),  /* Cmd Issue Stopped */
+        CMD_ISS_STPD    = (1U << 31),   /* Cmd Issue Stopped */
+        CMD_PI_ERR      = (1U << 30),   /* Protection info error.  see flags2 */
+        RSP_OVER        = (1U << 29),   /* rsp buffer overflow */
+        RETRY_LIM       = (1U << 28),   /* FIS/frame retry limit exceeded */
+        UNK_FIS         = (1U << 27),   /* unknown FIS */
+        DMA_TERM        = (1U << 26),   /* DMA terminate primitive rx'd */
+        SYNC_ERR        = (1U << 25),   /* SYNC rx'd during frame xmit */
+        TFILE_ERR       = (1U << 24),   /* SATA taskfile Error bit set */
+        R_ERR           = (1U << 23),   /* SATA returned R_ERR prim */
+        RD_OFS          = (1U << 20),   /* Read DATA frame invalid offset */
+        XFER_RDY_OFS    = (1U << 19),   /* XFER_RDY offset error */
+        UNEXP_XFER_RDY  = (1U << 18),   /* unexpected XFER_RDY error */
+        DATA_OVER_UNDER = (1U << 16),   /* data overflow/underflow */
+        INTERLOCK       = (1U << 15),   /* interlock error */
+        NAK             = (1U << 14),   /* NAK rx'd */
+        ACK_NAK_TO      = (1U << 13),   /* ACK/NAK timeout */
+        CXN_CLOSED      = (1U << 12),   /* cxn closed w/out ack/nak */
+        OPEN_TO         = (1U << 11),   /* I_T nexus lost, open cxn timeout */
+        PATH_BLOCKED    = (1U << 10),   /* I_T nexus lost, pathway blocked */
+        NO_DEST         = (1U << 9),    /* I_T nexus lost, no destination */
+        STP_RES_BSY     = (1U << 8),    /* STP resources busy */
+        BREAK           = (1U << 7),    /* break received */
+        BAD_DEST        = (1U << 6),    /* bad destination */
+        BAD_PROTO       = (1U << 5),    /* protocol not supported */
+        BAD_RATE        = (1U << 4),    /* cxn rate not supported */
+        WRONG_DEST      = (1U << 3),    /* wrong destination error */
+        CREDIT_TO       = (1U << 2),    /* credit timeout */
+        WDOG_TO         = (1U << 1),    /* watchdog timeout */
+        BUF_PAR         = (1U << 0),    /* buffer parity error */
+};
+
+enum error_info_rec_2 {
+        SLOT_BSY_ERR    = (1U << 31),   /* Slot Busy Error */
+        GRD_CHK_ERR     = (1U << 14),   /* Guard Check Error */
+        APP_CHK_ERR     = (1U << 13),   /* Application Check error */
+        REF_CHK_ERR     = (1U << 12),   /* Reference Check Error */
+        USR_BLK_NM      = (1U << 0),    /* User Block Number */
 };
 
 struct mvs_chip_info {
@@ -543,28 +595,12 @@ struct mvs_cmd_hdr {
         __le32                  reserved[4];
 };
 
-struct mvs_slot_info {
-        struct sas_task         *task;
-        u32                     n_elem;
-        u32                     tx;
-
-        /* DMA buffer for storing cmd tbl, open addr frame, status buffer,
-         * and PRD table
-         */
-        void                    *buf;
-        dma_addr_t              buf_dma;
-#if _MV_DUMP
-        u32                     cmd_size;
-#endif
-
-        void                    *response;
-};
-
 struct mvs_port {
         struct asd_sas_port     sas_port;
         u8                      port_attached;
         u8                      taskfileset;
         u8                      wide_port_phymap;
+        struct list_head        list;
 };
 
 struct mvs_phy {
@@ -582,6 +618,27 @@ struct mvs_phy {
         u32             frame_rcvd_size;
         u8              frame_rcvd[32];
         u8              phy_attached;
+        enum sas_linkrate       minimum_linkrate;
+        enum sas_linkrate       maximum_linkrate;
+};
+
+struct mvs_slot_info {
+        struct list_head        list;
+        struct sas_task         *task;
+        u32                     n_elem;
+        u32                     tx;
+
+        /* DMA buffer for storing cmd tbl, open addr frame, status buffer,
+         * and PRD table
+         */
+        void                    *buf;
+        dma_addr_t              buf_dma;
+#if _MV_DUMP
+        u32                     cmd_size;
+#endif
+
+        void                    *response;
+        struct mvs_port         *port;
 };
 
 struct mvs_info {
@@ -612,21 +669,14 @@ struct mvs_info {
 
         const struct mvs_chip_info *chip;
 
-        unsigned long           tags[MVS_SLOTS];
+        u8                      tags[MVS_SLOTS];
         struct mvs_slot_info    slot_info[MVS_SLOTS];
                                 /* further per-slot information */
         struct mvs_phy          phy[MVS_MAX_PHYS];
         struct mvs_port         port[MVS_MAX_PHYS];
-
-        u32                     can_queue;      /* per adapter */
-        u32                     tag_out;        /*Get*/
-        u32                     tag_in;         /*Give*/
-};
-
-struct mvs_queue_task {
-        struct list_head list;
-
-        void   *uldd_task;
+#ifdef MVS_USE_TASKLET
+        struct tasklet_struct   tasklet;
+#endif
 };
 
 static int mvs_phy_control(struct asd_sas_phy *sas_phy, enum phy_func func,
@@ -641,10 +691,11 @@ static u32 mvs_read_port_irq_mask(struct mvs_info *mvi, u32 port);
 static u32 mvs_is_phy_ready(struct mvs_info *mvi, int i);
 static void mvs_detect_porttype(struct mvs_info *mvi, int i);
 static void mvs_update_phyinfo(struct mvs_info *mvi, int i, int get_st);
+static void mvs_release_task(struct mvs_info *mvi, int phy_no);
 
 static int mvs_scan_finished(struct Scsi_Host *, unsigned long);
 static void mvs_scan_start(struct Scsi_Host *);
-static int mvs_sas_slave_alloc(struct scsi_device *scsi_dev);
+static int mvs_slave_configure(struct scsi_device *sdev);
 
 static struct scsi_transport_template *mvs_stt;
 
@@ -659,7 +710,7 @@ static struct scsi_host_template mvs_sht = {
         .name                   = DRV_NAME,
         .queuecommand           = sas_queuecommand,
         .target_alloc           = sas_target_alloc,
-        .slave_configure        = sas_slave_configure,
+        .slave_configure        = mvs_slave_configure,
         .slave_destroy          = sas_slave_destroy,
         .scan_finished          = mvs_scan_finished,
         .scan_start             = mvs_scan_start,
@@ -674,7 +725,7 @@ static struct scsi_host_template mvs_sht = {
         .use_clustering         = ENABLE_CLUSTERING,
         .eh_device_reset_handler        = sas_eh_device_reset_handler,
         .eh_bus_reset_handler   = sas_eh_bus_reset_handler,
-        .slave_alloc            = mvs_sas_slave_alloc,
+        .slave_alloc            = sas_slave_alloc,
         .target_destroy         = sas_target_destroy,
         .ioctl                  = sas_ioctl,
 };
@@ -709,10 +760,10 @@ static void mvs_hexdump(u32 size, u8 *data, u32 baseaddr)
         printk("\n");
 }
 
+#if _MV_DUMP
 static void mvs_hba_sb_dump(struct mvs_info *mvi, u32 tag,
                                    enum sas_protocol proto)
 {
-#if _MV_DUMP
         u32 offset;
         struct pci_dev *pdev = mvi->pdev;
         struct mvs_slot_info *slot = &mvi->slot_info[tag];
@@ -723,14 +774,14 @@ static void mvs_hba_sb_dump(struct mvs_info *mvi, u32 tag,
                         tag);
         mvs_hexdump(32, (u8 *) slot->response,
                     (u32) slot->buf_dma + offset);
-#endif
 }
+#endif
 
 static void mvs_hba_memory_dump(struct mvs_info *mvi, u32 tag,
                                 enum sas_protocol proto)
 {
 #if _MV_DUMP
-        u32 sz, w_ptr, r_ptr;
+        u32 sz, w_ptr;
         u64 addr;
         void __iomem *regs = mvi->regs;
         struct pci_dev *pdev = mvi->pdev;
@@ -738,12 +789,10 @@ static void mvs_hba_memory_dump(struct mvs_info *mvi, u32 tag,
 
         /*Delivery Queue */
         sz = mr32(TX_CFG) & TX_RING_SZ_MASK;
-        w_ptr = mr32(TX_PROD_IDX) & TX_RING_SZ_MASK;
-        r_ptr = mr32(TX_CONS_IDX) & TX_RING_SZ_MASK;
+        w_ptr = slot->tx;
         addr = mr32(TX_HI) << 16 << 16 | mr32(TX_LO);
         dev_printk(KERN_DEBUG, &pdev->dev,
-                "Delivery Queue Size=%04d , WRT_PTR=%04X , RD_PTR=%04X\n",
-                sz, w_ptr, r_ptr);
+                "Delivery Queue Size=%04d , WRT_PTR=%04X\n", sz, w_ptr);
         dev_printk(KERN_DEBUG, &pdev->dev,
                 "Delivery Queue Base Address=0x%llX (PA)"
                 "(tx_dma=0x%llX), Entry=%04d\n",
@@ -751,11 +800,11 @@ static void mvs_hba_memory_dump(struct mvs_info *mvi, u32 tag,
         mvs_hexdump(sizeof(u32), (u8 *)(&mvi->tx[mvi->tx_prod]),
                         (u32) mvi->tx_dma + sizeof(u32) * w_ptr);
         /*Command List */
-        addr = mr32(CMD_LIST_HI) << 16 << 16 | mr32(CMD_LIST_LO);
+        addr = mvi->slot_dma;
         dev_printk(KERN_DEBUG, &pdev->dev,
                 "Command List Base Address=0x%llX (PA)"
                 "(slot_dma=0x%llX), Header=%03d\n",
-                addr, mvi->slot_dma, tag);
+                addr, slot->buf_dma, tag);
         dev_printk(KERN_DEBUG, &pdev->dev, "Command Header[%03d]:\n", tag);
         /*mvs_cmd_hdr */
         mvs_hexdump(sizeof(struct mvs_cmd_hdr), (u8 *)(&mvi->slot[tag]),
@@ -779,7 +828,7 @@ static void mvs_hba_memory_dump(struct mvs_info *mvi, u32 tag,
 
 static void mvs_hba_cq_dump(struct mvs_info *mvi)
 {
-#if _MV_DUMP
+#if (_MV_DUMP > 2)
         u64 addr;
         void __iomem *regs = mvi->regs;
         struct pci_dev *pdev = mvi->pdev;
@@ -788,8 +837,8 @@ static void mvs_hba_cq_dump(struct mvs_info *mvi)
 
         /*Completion Queue */
         addr = mr32(RX_HI) << 16 << 16 | mr32(RX_LO);
-        dev_printk(KERN_DEBUG, &pdev->dev, "Completion Task = 0x%08X\n",
-                   (u32) mvi->slot_info[rx_desc & RXQ_SLOT_MASK].task);
+        dev_printk(KERN_DEBUG, &pdev->dev, "Completion Task = 0x%p\n",
+                   mvi->slot_info[rx_desc & RXQ_SLOT_MASK].task);
         dev_printk(KERN_DEBUG, &pdev->dev,
                 "Completion List Base Address=0x%llX (PA), "
                 "CQ_Entry=%04d, CQ_WP=0x%08X\n",
@@ -854,34 +903,53 @@ static int pci_go_64(struct pci_dev *pdev)
         return rc;
 }
 
+static int mvs_find_tag(struct mvs_info *mvi, struct sas_task *task, u32 *tag)
+{
+        if (task->lldd_task) {
+                struct mvs_slot_info *slot;
+                slot = (struct mvs_slot_info *) task->lldd_task;
+                *tag = slot - mvi->slot_info;
+                return 1;
+        }
+        return 0;
+}
+
 static void mvs_tag_clear(struct mvs_info *mvi, u32 tag)
 {
-        mvi->tag_in = (mvi->tag_in + 1) & (MVS_SLOTS - 1);
-        mvi->tags[mvi->tag_in] = tag;
+        void *bitmap = (void *) &mvi->tags;
+        clear_bit(tag, bitmap);
 }
 
 static void mvs_tag_free(struct mvs_info *mvi, u32 tag)
 {
-        mvi->tag_out = (mvi->tag_out - 1) & (MVS_SLOTS - 1);
+        mvs_tag_clear(mvi, tag);
+}
+
+static void mvs_tag_set(struct mvs_info *mvi, unsigned int tag)
+{
+        void *bitmap = (void *) &mvi->tags;
+        set_bit(tag, bitmap);
 }
 
 static int mvs_tag_alloc(struct mvs_info *mvi, u32 *tag_out)
 {
-        if (mvi->tag_out != mvi->tag_in) {
-                *tag_out = mvi->tags[mvi->tag_out];
-                mvi->tag_out = (mvi->tag_out + 1) & (MVS_SLOTS - 1);
-                return 0;
-        }
-        return -EBUSY;
+        unsigned int index, tag;
+        void *bitmap = (void *) &mvi->tags;
+
+        index = find_first_zero_bit(bitmap, MVS_SLOTS);
+        tag = index;
+        if (tag >= MVS_SLOTS)
+                return -SAS_QUEUE_FULL;
+        mvs_tag_set(mvi, tag);
+        *tag_out = tag;
+        return 0;
 }
 
 static void mvs_tag_init(struct mvs_info *mvi)
 {
         int i;
         for (i = 0; i < MVS_SLOTS; ++i)
-                mvi->tags[i] = i;
-        mvi->tag_out = 0;
-        mvi->tag_in = MVS_SLOTS - 1;
+                mvs_tag_clear(mvi, i);
 }
 
 #ifndef MVS_DISABLE_NVRAM
@@ -1013,10 +1081,21 @@ err_out:
 static void mvs_bytes_dmaed(struct mvs_info *mvi, int i)
 {
         struct mvs_phy *phy = &mvi->phy[i];
+        struct asd_sas_phy *sas_phy = mvi->sas.sas_phy[i];
 
         if (!phy->phy_attached)
                 return;
 
+        if (sas_phy->phy) {
+                struct sas_phy *sphy = sas_phy->phy;
+
+                sphy->negotiated_linkrate = sas_phy->linkrate;
+                sphy->minimum_linkrate = phy->minimum_linkrate;
+                sphy->minimum_linkrate_hw = SAS_LINK_RATE_1_5_GBPS;
+                sphy->maximum_linkrate = phy->maximum_linkrate;
+                sphy->maximum_linkrate_hw = SAS_LINK_RATE_3_0_GBPS;
+        }
+
         if (phy->phy_type & PORT_TYPE_SAS) {
                 struct sas_identify_frame *id;
 
@@ -1053,80 +1132,149 @@ static void mvs_scan_start(struct Scsi_Host *shost)
         }
 }
 
-static int mvs_sas_slave_alloc(struct scsi_device *scsi_dev)
+static int mvs_slave_configure(struct scsi_device *sdev)
 {
-        int rc;
+        struct domain_device *dev = sdev_to_domain_dev(sdev);
+        int ret = sas_slave_configure(sdev);
 
-        rc = sas_slave_alloc(scsi_dev);
+        if (ret)
+                return ret;
 
-        return rc;
+        if (dev_is_sata(dev)) {
+                /* struct ata_port *ap = dev->sata_dev.ap; */
+                /* struct ata_device *adev = ap->link.device; */
+
+                /* clamp at no NCQ for the time being */
+                /* adev->flags |= ATA_DFLAG_NCQ_OFF; */
+                scsi_adjust_queue_depth(sdev, MSG_SIMPLE_TAG, 1);
+        }
+        return 0;
 }
 
-static void mvs_int_port(struct mvs_info *mvi, int port_no, u32 events)
+static void mvs_int_port(struct mvs_info *mvi, int phy_no, u32 events)
 {
         struct pci_dev *pdev = mvi->pdev;
         struct sas_ha_struct *sas_ha = &mvi->sas;
-        struct mvs_phy *phy = &mvi->phy[port_no];
+        struct mvs_phy *phy = &mvi->phy[phy_no];
         struct asd_sas_phy *sas_phy = &phy->sas_phy;
 
-        phy->irq_status = mvs_read_port_irq_stat(mvi, port_no);
+        phy->irq_status = mvs_read_port_irq_stat(mvi, phy_no);
         /*
         * events is port event now ,
         * we need check the interrupt status which belongs to per port.
         */
         dev_printk(KERN_DEBUG, &pdev->dev,
                 "Port %d Event = %X\n",
-                port_no, phy->irq_status);
+                phy_no, phy->irq_status);
 
         if (phy->irq_status & (PHYEV_POOF | PHYEV_DEC_ERR)) {
-                if (!mvs_is_phy_ready(mvi, port_no)) {
+                mvs_release_task(mvi, phy_no);
+                if (!mvs_is_phy_ready(mvi, phy_no)) {
                         sas_phy_disconnected(sas_phy);
                         sas_ha->notify_phy_event(sas_phy, PHYE_LOSS_OF_SIGNAL);
+                        dev_printk(KERN_INFO, &pdev->dev,
+                                "Port %d Unplug Notice\n", phy_no);
+
                 } else
                         mvs_phy_control(sas_phy, PHY_FUNC_LINK_RESET, NULL);
         }
         if (!(phy->irq_status & PHYEV_DEC_ERR)) {
                 if (phy->irq_status & PHYEV_COMWAKE) {
-                        u32 tmp = mvs_read_port_irq_mask(mvi, port_no);
-                        mvs_write_port_irq_mask(mvi, port_no,
+                        u32 tmp = mvs_read_port_irq_mask(mvi, phy_no);
+                        mvs_write_port_irq_mask(mvi, phy_no,
                                                 tmp | PHYEV_SIG_FIS);
                 }
                 if (phy->irq_status & (PHYEV_SIG_FIS | PHYEV_ID_DONE)) {
-                        phy->phy_status = mvs_is_phy_ready(mvi, port_no);
+                        phy->phy_status = mvs_is_phy_ready(mvi, phy_no);
                         if (phy->phy_status) {
-                                mvs_detect_porttype(mvi, port_no);
+                                mvs_detect_porttype(mvi, phy_no);
 
                                 if (phy->phy_type & PORT_TYPE_SATA) {
                                         u32 tmp = mvs_read_port_irq_mask(mvi,
-                                                                port_no);
+                                                                phy_no);
                                         tmp &= ~PHYEV_SIG_FIS;
                                         mvs_write_port_irq_mask(mvi,
-                                                                port_no, tmp);
+                                                                phy_no, tmp);
                                 }
 
-                                mvs_update_phyinfo(mvi, port_no, 0);
+                                mvs_update_phyinfo(mvi, phy_no, 0);
                                 sas_ha->notify_phy_event(sas_phy,
                                                         PHYE_OOB_DONE);
-                                mvs_bytes_dmaed(mvi, port_no);
+                                mvs_bytes_dmaed(mvi, phy_no);
                         } else {
                                 dev_printk(KERN_DEBUG, &pdev->dev,
                                         "plugin interrupt but phy is gone\n");
                                 mvs_phy_control(sas_phy, PHY_FUNC_LINK_RESET,
                                                         NULL);
                         }
-                } else if (phy->irq_status & PHYEV_BROAD_CH)
+                } else if (phy->irq_status & PHYEV_BROAD_CH) {
+                        mvs_release_task(mvi, phy_no);
                         sas_ha->notify_port_event(sas_phy,
                                                 PORTE_BROADCAST_RCVD);
+                }
         }
-        mvs_write_port_irq_stat(mvi, port_no, phy->irq_status);
+        mvs_write_port_irq_stat(mvi, phy_no, phy->irq_status);
 }
 
 static void mvs_int_sata(struct mvs_info *mvi)
 {
-        /* FIXME */
+        u32 tmp;
+        void __iomem *regs = mvi->regs;
+        tmp = mr32(INT_STAT_SRS);
+        mw32(INT_STAT_SRS, tmp & 0xFFFF);
+}
+
+static void mvs_slot_reset(struct mvs_info *mvi, struct sas_task *task,
+                                u32 slot_idx)
+{
+        void __iomem *regs = mvi->regs;
+        struct domain_device *dev = task->dev;
+        struct asd_sas_port *sas_port = dev->port;
+        struct mvs_port *port = mvi->slot_info[slot_idx].port;
+        u32 reg_set, phy_mask;
+
+        if (!sas_protocol_ata(task->task_proto)) {
+                reg_set = 0;
+                phy_mask = (port->wide_port_phymap) ? port->wide_port_phymap :
+                                sas_port->phy_mask;
+        } else {
+                reg_set = port->taskfileset;
+                phy_mask = sas_port->phy_mask;
+        }
+        mvi->tx[mvi->tx_prod] = cpu_to_le32(TXQ_MODE_I | slot_idx |
+                                        (TXQ_CMD_SLOT_RESET << TXQ_CMD_SHIFT) |
+                                        (phy_mask << TXQ_PHY_SHIFT) |
+                                        (reg_set << TXQ_SRS_SHIFT));
+
+        mw32(TX_PROD_IDX, mvi->tx_prod);
+        mvi->tx_prod = (mvi->tx_prod + 1) & (MVS_CHIP_SLOT_SZ - 1);
+}
+
+static int mvs_sata_done(struct mvs_info *mvi, struct sas_task *task,
+                        u32 slot_idx, int err)
+{
+        struct mvs_port *port = mvi->slot_info[slot_idx].port;
+        struct task_status_struct *tstat = &task->task_status;
+        struct ata_task_resp *resp = (struct ata_task_resp *)tstat->buf;
+        int stat = SAM_GOOD;
+
+        resp->frame_len = sizeof(struct dev_to_host_fis);
+        memcpy(&resp->ending_fis[0],
+               SATA_RECEIVED_D2H_FIS(port->taskfileset),
+               sizeof(struct dev_to_host_fis));
+        tstat->buf_valid_size = sizeof(*resp);
+        if (unlikely(err))
+                stat = SAS_PROTO_RESPONSE;
+        return stat;
 }
 
-static void mvs_slot_free(struct mvs_info *mvi, struct sas_task *task,
+static void mvs_slot_free(struct mvs_info *mvi, u32 rx_desc)
+{
+        u32 slot_idx = rx_desc & RXQ_SLOT_MASK;
+        mvs_tag_clear(mvi, slot_idx);
+}
+
+static void mvs_slot_task_free(struct mvs_info *mvi, struct sas_task *task,
                           struct mvs_slot_info *slot, u32 slot_idx)
 {
         if (!sas_protocol_ata(task->task_proto))
@@ -1149,38 +1297,58 @@ static void mvs_slot_free(struct mvs_info *mvi, struct sas_task *task,
                 /* do nothing */
                 break;
         }
-
+        list_del(&slot->list);
+        task->lldd_task = NULL;
         slot->task = NULL;
-        mvs_tag_clear(mvi, slot_idx);
+        slot->port = NULL;
 }
 
-static void mvs_slot_err(struct mvs_info *mvi, struct sas_task *task,
+static int mvs_slot_err(struct mvs_info *mvi, struct sas_task *task,
                          u32 slot_idx)
 {
         struct mvs_slot_info *slot = &mvi->slot_info[slot_idx];
-        u64 err_dw0 = *(u32 *) slot->response;
-        void __iomem *regs = mvi->regs;
-        u32 tmp;
+        u32 err_dw0 = le32_to_cpu(*(u32 *) (slot->response));
+        u32 err_dw1 = le32_to_cpu(*(u32 *) (slot->response + 4));
+        int stat = SAM_CHECK_COND;
 
-        if (err_dw0 & CMD_ISS_STPD)
-                if (sas_protocol_ata(task->task_proto)) {
-                        tmp = mr32(INT_STAT_SRS);
-                        mw32(INT_STAT_SRS, tmp & 0xFFFF);
-                }
+        if (err_dw1 & SLOT_BSY_ERR) {
+                stat = SAS_QUEUE_FULL;
+                mvs_slot_reset(mvi, task, slot_idx);
+        }
+        switch (task->task_proto) {
+        case SAS_PROTOCOL_SSP:
+                break;
+        case SAS_PROTOCOL_SMP:
+                break;
+        case SAS_PROTOCOL_SATA:
+        case SAS_PROTOCOL_STP:
+        case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:
+                if (err_dw0 & TFILE_ERR)
+                        stat = mvs_sata_done(mvi, task, slot_idx, 1);
+                break;
+        default:
+                break;
+        }
 
-        mvs_hba_sb_dump(mvi, slot_idx, task->task_proto);
+        mvs_hexdump(16, (u8 *) slot->response, 0);
+        return stat;
 }
 
-static int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc)
+static int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc, u32 flags)
 {
         u32 slot_idx = rx_desc & RXQ_SLOT_MASK;
         struct mvs_slot_info *slot = &mvi->slot_info[slot_idx];
         struct sas_task *task = slot->task;
-        struct task_status_struct *tstat = &task->task_status;
-        struct mvs_port *port = &mvi->port[task->dev->port->id];
+        struct task_status_struct *tstat;
+        struct mvs_port *port;
         bool aborted;
         void *to;
 
+        if (unlikely(!task || !task->lldd_task))
+                return -1;
+
+        mvs_hba_cq_dump(mvi);
+
         spin_lock(&task->task_state_lock);
         aborted = task->task_state_flags & SAS_TASK_STATE_ABORTED;
         if (!aborted) {
@@ -1190,22 +1358,27 @@ static int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc)
         }
         spin_unlock(&task->task_state_lock);
 
-        if (aborted)
+        if (aborted) {
+                mvs_slot_task_free(mvi, task, slot, slot_idx);
+                mvs_slot_free(mvi, rx_desc);
                 return -1;
+        }
 
+        port = slot->port;
+        tstat = &task->task_status;
         memset(tstat, 0, sizeof(*tstat));
         tstat->resp = SAS_TASK_COMPLETE;
 
-
-        if (unlikely(!port->port_attached)) {
-                tstat->stat = SAS_PHY_DOWN;
+        if (unlikely(!port->port_attached || flags)) {
+                mvs_slot_err(mvi, task, slot_idx);
+                if (!sas_protocol_ata(task->task_proto))
+                        tstat->stat = SAS_PHY_DOWN;
                 goto out;
         }
 
         /* error info record present */
-        if ((rx_desc & RXQ_ERR) && (*(u64 *) slot->response)) {
-                tstat->stat = SAM_CHECK_COND;
-                mvs_slot_err(mvi, task, slot_idx);
+        if (unlikely((rx_desc & RXQ_ERR) && (*(u64 *) slot->response))) {
+                tstat->stat = mvs_slot_err(mvi, task, slot_idx);
                 goto out;
         }
 
@@ -1242,21 +1415,7 @@ static int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc)
         case SAS_PROTOCOL_SATA:
         case SAS_PROTOCOL_STP:
         case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP: {
-                        struct ata_task_resp *resp =
-                            (struct ata_task_resp *)tstat->buf;
-
-                        if ((rx_desc & (RXQ_DONE | RXQ_ERR | RXQ_ATTN)) ==
-                            RXQ_DONE)
-                                tstat->stat = SAM_GOOD;
-                        else
-                                tstat->stat = SAM_CHECK_COND;
-
-                        resp->frame_len = sizeof(struct dev_to_host_fis);
-                        memcpy(&resp->ending_fis[0],
-                               SATA_RECEIVED_D2H_FIS(port->taskfileset),
-                               sizeof(struct dev_to_host_fis));
-                        if (resp->ending_fis[2] & ATA_ERR)
-                                mvs_hexdump(16, resp->ending_fis, 0);
+                        tstat->stat = mvs_sata_done(mvi, task, slot_idx, 0);
                         break;
                 }
 
@@ -1266,11 +1425,34 @@ static int mvs_slot_complete(struct mvs_info *mvi, u32 rx_desc)
         }
 
 out:
-        mvs_slot_free(mvi, task, slot, slot_idx);
+        mvs_slot_task_free(mvi, task, slot, slot_idx);
+        if (unlikely(tstat->stat != SAS_QUEUE_FULL))
+                mvs_slot_free(mvi, rx_desc);
+
+        spin_unlock(&mvi->lock);
         task->task_done(task);
+        spin_lock(&mvi->lock);
         return tstat->stat;
 }
 
+static void mvs_release_task(struct mvs_info *mvi, int phy_no)
+{
+        struct list_head *pos, *n;
+        struct mvs_slot_info *slot;
+        struct mvs_phy *phy = &mvi->phy[phy_no];
+        struct mvs_port *port = phy->port;
+        u32 rx_desc;
+
+        if (!port)
+                return;
+
+        list_for_each_safe(pos, n, &port->list) {
+                slot = container_of(pos, struct mvs_slot_info, list);
+                rx_desc = (u32) (slot - mvi->slot_info);
+                mvs_slot_complete(mvi, rx_desc, 1);
+        }
+}
+
 static void mvs_int_full(struct mvs_info *mvi)
 {
         void __iomem *regs = mvi->regs;
@@ -1305,40 +1487,43 @@ static int mvs_int_rx(struct mvs_info *mvi, bool self_clear)
          * we don't have to stall the CPU reading that register.
          * The actual RX ring is offset by one dword, due to this.
          */
-        rx_prod_idx = mr32(RX_CONS_IDX) & RX_RING_SZ_MASK;
-        if (rx_prod_idx == 0xfff) {     /* h/w hasn't touched RX ring yet */
-                mvi->rx_cons = 0xfff;
+        rx_prod_idx = mvi->rx_cons;
+        mvi->rx_cons = le32_to_cpu(mvi->rx[0]);
+        if (mvi->rx_cons == 0xfff)      /* h/w hasn't touched RX ring yet */
                 return 0;
-        }
 
         /* The CMPL_Q may come late, read from register and try again
         * note: if coalescing is enabled,
         * it will need to read from register every time for sure
         */
         if (mvi->rx_cons == rx_prod_idx)
-                return 0;
+                mvi->rx_cons = mr32(RX_CONS_IDX) & RX_RING_SZ_MASK;
 
-        if (mvi->rx_cons == 0xfff)
-                mvi->rx_cons = MVS_RX_RING_SZ - 1;
+        if (mvi->rx_cons == rx_prod_idx)
+                return 0;
 
         while (mvi->rx_cons != rx_prod_idx) {
 
                 /* increment our internal RX consumer pointer */
-                mvi->rx_cons = (mvi->rx_cons + 1) & (MVS_RX_RING_SZ - 1);
+                rx_prod_idx = (rx_prod_idx + 1) & (MVS_RX_RING_SZ - 1);
 
-                rx_desc = le32_to_cpu(mvi->rx[mvi->rx_cons + 1]);
-
-                mvs_hba_cq_dump(mvi);
+                rx_desc = le32_to_cpu(mvi->rx[rx_prod_idx + 1]);
 
                 if (likely(rx_desc & RXQ_DONE))
-                        mvs_slot_complete(mvi, rx_desc);
+                        mvs_slot_complete(mvi, rx_desc, 0);
                 if (rx_desc & RXQ_ATTN) {
                         attn = true;
                         dev_printk(KERN_DEBUG, &pdev->dev, "ATTN %X\n",
                                 rx_desc);
                 } else if (rx_desc & RXQ_ERR) {
+                        if (!(rx_desc & RXQ_DONE))
+                                mvs_slot_complete(mvi, rx_desc, 0);
                         dev_printk(KERN_DEBUG, &pdev->dev, "RXQ_ERR %X\n",
                                 rx_desc);
+                } else if (rx_desc & RXQ_SLOT_RESET) {
+                        dev_printk(KERN_DEBUG, &pdev->dev, "Slot reset[%X]\n",
+                                rx_desc);
+                        mvs_slot_free(mvi, rx_desc);
                 }
         }
 
@@ -1348,6 +1533,23 @@ static int mvs_int_rx(struct mvs_info *mvi, bool self_clear)
         return 0;
 }
 
+#ifdef MVS_USE_TASKLET
+static void mvs_tasklet(unsigned long data)
+{
+        struct mvs_info *mvi = (struct mvs_info *) data;
+        unsigned long flags;
+
+        spin_lock_irqsave(&mvi->lock, flags);
+
+#ifdef MVS_DISABLE_MSI
+        mvs_int_full(mvi);
+#else
+        mvs_int_rx(mvi, true);
+#endif
+        spin_unlock_irqrestore(&mvi->lock, flags);
+}
+#endif
+
 static irqreturn_t mvs_interrupt(int irq, void *opaque)
 {
         struct mvs_info *mvi = opaque;
@@ -1356,18 +1558,21 @@ static irqreturn_t mvs_interrupt(int irq, void *opaque)
 
         stat = mr32(GBL_INT_STAT);
 
-        /* clear CMD_CMPLT ASAP */
-        mw32_f(INT_STAT, CINT_DONE);
-
         if (stat == 0 || stat == 0xffffffff)
                 return IRQ_NONE;
 
+        /* clear CMD_CMPLT ASAP */
+        mw32_f(INT_STAT, CINT_DONE);
+
+#ifndef MVS_USE_TASKLET
         spin_lock(&mvi->lock);
 
         mvs_int_full(mvi);
 
         spin_unlock(&mvi->lock);
-
+#else
+        tasklet_schedule(&mvi->tasklet);
+#endif
         return IRQ_HANDLED;
 }
 
@@ -1376,12 +1581,15 @@ static irqreturn_t mvs_msi_interrupt(int irq, void *opaque)
 {
         struct mvs_info *mvi = opaque;
 
+#ifndef MVS_USE_TASKLET
         spin_lock(&mvi->lock);
 
         mvs_int_rx(mvi, true);
 
         spin_unlock(&mvi->lock);
-
+#else
+        tasklet_schedule(&mvi->tasklet);
+#endif
         return IRQ_HANDLED;
 }
 #endif
@@ -1576,15 +1784,19 @@ static u8 mvs_assign_reg_set(struct mvs_info *mvi, struct mvs_port *port)
         return MVS_ID_NOT_MAPPED;
 }
 
-static u32 mvs_get_ncq_tag(struct sas_task *task)
+static u32 mvs_get_ncq_tag(struct sas_task *task, u32 *tag)
 {
-        u32 tag = 0;
         struct ata_queued_cmd *qc = task->uldd_task;
 
-        if (qc)
-                tag = qc->tag;
+        if (qc) {
+                if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
+                        qc->tf.command == ATA_CMD_FPDMA_READ) {
+                        *tag = qc->tag;
+                        return 1;
+                }
+        }
 
-        return tag;
+        return 0;
 }
 
 static int mvs_task_prep_ata(struct mvs_info *mvi,
@@ -1628,11 +1840,9 @@ static int mvs_task_prep_ata(struct mvs_info *mvi,
         hdr->flags = cpu_to_le32(flags);
 
         /* FIXME: the low order order 5 bits for the TAG if enable NCQ */
-        if (task->ata_task.use_ncq) {
-                hdr->tags = cpu_to_le32(mvs_get_ncq_tag(task));
-                /*Fill in task file */
-                task->ata_task.fis.sector_count = hdr->tags << 3;
-        } else
+        if (task->ata_task.use_ncq && mvs_get_ncq_tag(task, &hdr->tags))
+                task->ata_task.fis.sector_count |= hdr->tags << 3;
+        else
                 hdr->tags = cpu_to_le32(tag);
         hdr->data_len = cpu_to_le32(task->total_xfer_len);
 
@@ -1725,13 +1935,16 @@ static int mvs_task_prep_ssp(struct mvs_info *mvi,
         u32 flags;
         u32 resp_len, req_len, i, tag = tei->tag;
         const u32 max_resp_len = SB_RFB_MAX;
+        u8 phy_mask;
 
         slot = &mvi->slot_info[tag];
 
+        phy_mask = (port->wide_port_phymap) ? port->wide_port_phymap :
+                task->dev->port->phy_mask;
         slot->tx = mvi->tx_prod;
         mvi->tx[mvi->tx_prod] = cpu_to_le32(TXQ_MODE_I | tag |
                                 (TXQ_CMD_SSP << TXQ_CMD_SHIFT) |
-                                (port->wide_port_phymap << TXQ_PHY_SHIFT));
+                                (phy_mask << TXQ_PHY_SHIFT));
 
         flags = MCH_RETRY;
         if (task->ssp_task.enable_first_burst) {
@@ -1832,22 +2045,32 @@ static int mvs_task_exec(struct sas_task *task, const int num, gfp_t gfp_flags)
         void __iomem *regs = mvi->regs;
         struct mvs_task_exec_info tei;
         struct sas_task *t = task;
+        struct mvs_slot_info *slot;
         u32 tag = 0xdeadbeef, rc, n_elem = 0;
         unsigned long flags;
         u32 n = num, pass = 0;
 
         spin_lock_irqsave(&mvi->lock, flags);
-
         do {
+                dev = t->dev;
                 tei.port = &mvi->port[dev->port->id];
 
                 if (!tei.port->port_attached) {
-                        struct task_status_struct *ts = &t->task_status;
-                        ts->stat = SAS_PHY_DOWN;
-                        t->task_done(t);
-                        rc = 0;
-                        goto exec_exit;
+                        if (sas_protocol_ata(t->task_proto)) {
+                                rc = SAS_PHY_DOWN;
+                                goto out_done;
+                        } else {
+                                struct task_status_struct *ts = &t->task_status;
+                                ts->resp = SAS_TASK_UNDELIVERED;
+                                ts->stat = SAS_PHY_DOWN;
+                                t->task_done(t);
+                                if (n > 1)
+                                        t = list_entry(t->list.next,
+                                                        struct sas_task, list);
+                                continue;
+                        }
                 }
+
                 if (!sas_protocol_ata(t->task_proto)) {
                         if (t->num_scatter) {
                                 n_elem = pci_map_sg(mvi->pdev, t->scatter,
@@ -1866,9 +2089,10 @@ static int mvs_task_exec(struct sas_task *task, const int num, gfp_t gfp_flags)
                 if (rc)
                         goto err_out;
 
-                mvi->slot_info[tag].task = t;
-                mvi->slot_info[tag].n_elem = n_elem;
-                memset(mvi->slot_info[tag].buf, 0, MVS_SLOT_BUF_SZ);
+                slot = &mvi->slot_info[tag];
+                t->lldd_task = NULL;
+                slot->n_elem = n_elem;
+                memset(slot->buf, 0, MVS_SLOT_BUF_SZ);
                 tei.task = t;
                 tei.hdr = &mvi->slot[tag];
                 tei.tag = tag;
@@ -1897,28 +2121,26 @@ static int mvs_task_exec(struct sas_task *task, const int num, gfp_t gfp_flags)
                 if (rc)
                         goto err_out_tag;
 
+                slot->task = t;
+                slot->port = tei.port;
+                t->lldd_task = (void *) slot;
+                list_add_tail(&slot->list, &slot->port->list);
                 /* TODO: select normal or high priority */
 
                 spin_lock(&t->task_state_lock);
                 t->task_state_flags |= SAS_TASK_AT_INITIATOR;
                 spin_unlock(&t->task_state_lock);
 
-                if (n == 1) {
-                        spin_unlock_irqrestore(&mvi->lock, flags);
-                        mw32(TX_PROD_IDX, mvi->tx_prod);
-                }
                 mvs_hba_memory_dump(mvi, tag, t->task_proto);
 
                 ++pass;
                 mvi->tx_prod = (mvi->tx_prod + 1) & (MVS_CHIP_SLOT_SZ - 1);
-
-                if (n == 1)
-                        break;
-
-                t = list_entry(t->list.next, struct sas_task, list);
+                if (n > 1)
+                        t = list_entry(t->list.next, struct sas_task, list);
         } while (--n);
 
-        return 0;
+        rc = 0;
+        goto out_done;
 
 err_out_tag:
         mvs_tag_free(mvi, tag);
@@ -1928,7 +2150,7 @@ err_out:
                 if (n_elem)
                         pci_unmap_sg(mvi->pdev, t->scatter, n_elem,
                                      t->data_dir);
-exec_exit:
+out_done:
         if (pass)
                 mw32(TX_PROD_IDX, (mvi->tx_prod - 1) & (MVS_CHIP_SLOT_SZ - 1));
         spin_unlock_irqrestore(&mvi->lock, flags);
@@ -1937,42 +2159,59 @@ exec_exit:
 
 static int mvs_task_abort(struct sas_task *task)
 {
-        int rc = 1;
+        int rc;
         unsigned long flags;
         struct mvs_info *mvi = task->dev->port->ha->lldd_ha;
         struct pci_dev *pdev = mvi->pdev;
+        int tag;
 
         spin_lock_irqsave(&task->task_state_lock, flags);
         if (task->task_state_flags & SAS_TASK_STATE_DONE) {
                 rc = TMF_RESP_FUNC_COMPLETE;
+                spin_unlock_irqrestore(&task->task_state_lock, flags);
                 goto out_done;
         }
         spin_unlock_irqrestore(&task->task_state_lock, flags);
 
-        /*FIXME*/
-        rc = TMF_RESP_FUNC_COMPLETE;
-
         switch (task->task_proto) {
         case SAS_PROTOCOL_SMP:
-                dev_printk(KERN_DEBUG, &pdev->dev, "SMP Abort! ");
+                dev_printk(KERN_DEBUG, &pdev->dev, "SMP Abort! \n");
                 break;
         case SAS_PROTOCOL_SSP:
-                dev_printk(KERN_DEBUG, &pdev->dev, "SSP Abort! ");
+                dev_printk(KERN_DEBUG, &pdev->dev, "SSP Abort! \n");
                 break;
         case SAS_PROTOCOL_SATA:
         case SAS_PROTOCOL_STP:
         case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:{
-                dev_printk(KERN_DEBUG, &pdev->dev, "STP Abort! "
-                        "Dump D2H FIS: \n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "STP Abort! \n");
+#if _MV_DUMP
+                dev_printk(KERN_DEBUG, &pdev->dev, "Dump D2H FIS: \n");
                 mvs_hexdump(sizeof(struct host_to_dev_fis),
                                 (void *)&task->ata_task.fis, 0);
                 dev_printk(KERN_DEBUG, &pdev->dev, "Dump ATAPI Cmd : \n");
                 mvs_hexdump(16, task->ata_task.atapi_packet, 0);
+#endif
+                spin_lock_irqsave(&task->task_state_lock, flags);
+                if (task->task_state_flags & SAS_TASK_NEED_DEV_RESET) {
+                        /* TODO */
+                        ;
+                }
+                spin_unlock_irqrestore(&task->task_state_lock, flags);
                 break;
         }
         default:
                 break;
         }
+
+        if (mvs_find_tag(mvi, task, &tag)) {
+                spin_lock_irqsave(&mvi->lock, flags);
+                mvs_slot_task_free(mvi, task, &mvi->slot_info[tag], tag);
+                spin_unlock_irqrestore(&mvi->lock, flags);
+        }
+        if (!mvs_task_exec(task, 1, GFP_ATOMIC))
+                rc = TMF_RESP_FUNC_COMPLETE;
+        else
+                rc = TMF_RESP_FUNC_FAILED;
 out_done:
         return rc;
 }
@@ -2001,7 +2240,7 @@ static void mvs_free(struct mvs_info *mvi)
                                   mvi->rx_fis, mvi->rx_fis_dma);
         if (mvi->rx)
                 dma_free_coherent(&mvi->pdev->dev,
-                                  sizeof(*mvi->rx) * MVS_RX_RING_SZ,
+                                  sizeof(*mvi->rx) * (MVS_RX_RING_SZ + 1),
                                   mvi->rx, mvi->rx_dma);
         if (mvi->slot)
                 dma_free_coherent(&mvi->pdev->dev,
@@ -2109,6 +2348,9 @@ static struct mvs_info *__devinit mvs_alloc(struct pci_dev *pdev,
                 return NULL;
 
         spin_lock_init(&mvi->lock);
+#ifdef MVS_USE_TASKLET
+        tasklet_init(&mvi->tasklet, mvs_tasklet, (unsigned long)mvi);
+#endif
         mvi->pdev = pdev;
         mvi->chip = chip;
 
@@ -2132,6 +2374,10 @@ static struct mvs_info *__devinit mvs_alloc(struct pci_dev *pdev,
                 mvs_phy_init(mvi, i);
                 arr_phy[i] = &mvi->phy[i].sas_phy;
                 arr_port[i] = &mvi->port[i].sas_port;
+                mvi->port[i].taskfileset = MVS_ID_NOT_MAPPED;
+                mvi->port[i].wide_port_phymap = 0;
+                mvi->port[i].port_attached = 0;
+                INIT_LIST_HEAD(&mvi->port[i].list);
         }
 
         SHOST_TO_SAS_HA(mvi->shost) = &mvi->sas;
@@ -2148,9 +2394,10 @@ static struct mvs_info *__devinit mvs_alloc(struct pci_dev *pdev,
         mvi->sas.sas_phy = arr_phy;
         mvi->sas.sas_port = arr_port;
         mvi->sas.num_phys = chip->n_phy;
-        mvi->sas.lldd_max_execute_num = MVS_CHIP_SLOT_SZ - 1;
+        mvi->sas.lldd_max_execute_num = 1;
         mvi->sas.lldd_queue_size = MVS_QUEUE_SIZE;
-        mvi->can_queue = (MVS_CHIP_SLOT_SZ >> 1) - 1;
+        mvi->shost->can_queue = MVS_CAN_QUEUE;
+        mvi->shost->cmd_per_lun = MVS_SLOTS / mvi->sas.num_phys;
         mvi->sas.lldd_ha = mvi;
         mvi->sas.core.shost = mvi->shost;
 
@@ -2203,11 +2450,11 @@ static struct mvs_info *__devinit mvs_alloc(struct pci_dev *pdev,
         memset(mvi->rx_fis, 0, MVS_RX_FISL_SZ);
 
         mvi->rx = dma_alloc_coherent(&pdev->dev,
-                                     sizeof(*mvi->rx) * MVS_RX_RING_SZ,
+                                     sizeof(*mvi->rx) * (MVS_RX_RING_SZ + 1),
                                      &mvi->rx_dma, GFP_KERNEL);
         if (!mvi->rx)
                 goto err_out;
-        memset(mvi->rx, 0, sizeof(*mvi->rx) * MVS_RX_RING_SZ);
+        memset(mvi->rx, 0, sizeof(*mvi->rx) * (MVS_RX_RING_SZ + 1));
 
         mvi->rx[0] = cpu_to_le32(0xfff);
         mvi->rx_cons = 0xfff;
@@ -2357,7 +2604,7 @@ static void __devinit mvs_phy_hacks(struct mvs_info *mvi)
         mvs_cw32(regs, CMD_SAS_CTL0, tmp);
 
         /* workaround for WDTIMEOUT , set to 550 ms */
-        mvs_cw32(regs, CMD_WD_TIMER, 0xffffff);
+        mvs_cw32(regs, CMD_WD_TIMER, 0x86470);
 
         /* not to halt for different port op during wideport link change */
         mvs_cw32(regs, CMD_APP_ERR_CONFIG, 0xffefbf7d);
@@ -2465,17 +2712,16 @@ static u32 mvs_is_phy_ready(struct mvs_info *mvi, int i)
 {
         u32 tmp;
         struct mvs_phy *phy = &mvi->phy[i];
-        struct mvs_port *port;
+        struct mvs_port *port = phy->port;;
 
         tmp = mvs_read_phy_ctl(mvi, i);
 
         if ((tmp & PHY_READY_MASK) && !(phy->irq_status & PHYEV_POOF)) {
-                if (!phy->port)
+                if (!port)
                         phy->phy_attached = 1;
                 return tmp;
         }
 
-        port = phy->port;
         if (port) {
                 if (phy->phy_type & PORT_TYPE_SAS) {
                         port->wide_port_phymap &= ~(1U << i);
@@ -2497,7 +2743,7 @@ static void mvs_update_phyinfo(struct mvs_info *mvi, int i,
 {
         struct mvs_phy *phy = &mvi->phy[i];
         struct pci_dev *pdev = mvi->pdev;
-        u32 tmp, j;
+        u32 tmp;
         u64 tmp64;
 
         mvs_write_port_cfg_addr(mvi, i, PHYR_IDENTIFY);
@@ -2524,46 +2770,20 @@ static void mvs_update_phyinfo(struct mvs_info *mvi, int i,
                 sas_phy->linkrate =
                         (phy->phy_status & PHY_NEG_SPP_PHYS_LINK_RATE_MASK) >>
                                 PHY_NEG_SPP_PHYS_LINK_RATE_MASK_OFFSET;
-
-                /* Updated attached_sas_addr */
-                mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_ADDR_HI);
-                phy->att_dev_sas_addr =
-                                (u64) mvs_read_port_cfg_data(mvi, i) << 32;
-
-                mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_ADDR_LO);
-                phy->att_dev_sas_addr |= mvs_read_port_cfg_data(mvi, i);
-
-                dev_printk(KERN_DEBUG, &pdev->dev,
-                        "phy[%d] Get Attached Address 0x%llX ,"
-                        " SAS Address 0x%llX\n",
-                        i, phy->att_dev_sas_addr, phy->dev_sas_addr);
-                dev_printk(KERN_DEBUG, &pdev->dev,
-                        "Rate = %x , type = %d\n",
-                        sas_phy->linkrate, phy->phy_type);
-
-#if 1
-                /*
-                * If the device is capable of supporting a wide port
-                * on its phys, it may configure the phys as a wide port.
-                */
-                if (phy->phy_type & PORT_TYPE_SAS)
-                        for (j = 0; j < mvi->chip->n_phy && j != i; ++j) {
-                                if ((mvi->phy[j].phy_attached) &&
-                                        (mvi->phy[j].phy_type & PORT_TYPE_SAS))
-                                        if (phy->att_dev_sas_addr ==
-                                        mvi->phy[j].att_dev_sas_addr - 1) {
-                                                phy->att_dev_sas_addr =
-                                                mvi->phy[j].att_dev_sas_addr;
-                                                break;
-                                        }
-                        }
-
-#endif
-
-                tmp64 = cpu_to_be64(phy->att_dev_sas_addr);
-                memcpy(sas_phy->attached_sas_addr, &tmp64, SAS_ADDR_SIZE);
+                phy->minimum_linkrate =
+                        (phy->phy_status &
+                                PHY_MIN_SPP_PHYS_LINK_RATE_MASK) >> 8;
+                phy->maximum_linkrate =
+                        (phy->phy_status &
+                                PHY_MAX_SPP_PHYS_LINK_RATE_MASK) >> 12;
 
                 if (phy->phy_type & PORT_TYPE_SAS) {
+                        /* Updated attached_sas_addr */
+                        mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_ADDR_HI);
+                        phy->att_dev_sas_addr =
+                                (u64) mvs_read_port_cfg_data(mvi, i) << 32;
+                        mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_ADDR_LO);
+                        phy->att_dev_sas_addr |= mvs_read_port_cfg_data(mvi, i);
                         mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_DEV_INFO);
                         phy->att_dev_info = mvs_read_port_cfg_data(mvi, i);
                         phy->identify.device_type =
@@ -2582,6 +2802,7 @@ static void mvs_update_phyinfo(struct mvs_info *mvi, int i,
                 } else if (phy->phy_type & PORT_TYPE_SATA) {
                         phy->identify.target_port_protocols = SAS_PROTOCOL_STP;
                         if (mvs_is_sig_fis_received(phy->irq_status)) {
+                                phy->att_dev_sas_addr = i;      /* temp */
                                 if (phy_st & PHY_OOB_DTCTD)
                                         sas_phy->oob_mode = SATA_OOB_MODE;
                                 phy->frame_rcvd_size =
@@ -2591,20 +2812,34 @@ static void mvs_update_phyinfo(struct mvs_info *mvi, int i,
                         } else {
                                 dev_printk(KERN_DEBUG, &pdev->dev,
                                         "No sig fis\n");
+                                phy->phy_type &= ~(PORT_TYPE_SATA);
+                                goto out_done;
                         }
                 }
+                tmp64 = cpu_to_be64(phy->att_dev_sas_addr);
+                memcpy(sas_phy->attached_sas_addr, &tmp64, SAS_ADDR_SIZE);
+
+                dev_printk(KERN_DEBUG, &pdev->dev,
+                        "phy[%d] Get Attached Address 0x%llX ,"
+                        " SAS Address 0x%llX\n",
+                        i, phy->att_dev_sas_addr, phy->dev_sas_addr);
+                dev_printk(KERN_DEBUG, &pdev->dev,
+                        "Rate = %x , type = %d\n",
+                        sas_phy->linkrate, phy->phy_type);
+
                 /* workaround for HW phy decoding error on 1.5g disk drive */
                 mvs_write_port_vsr_addr(mvi, i, VSR_PHY_MODE6);
                 tmp = mvs_read_port_vsr_data(mvi, i);
                 if (((phy->phy_status & PHY_NEG_SPP_PHYS_LINK_RATE_MASK) >>
                      PHY_NEG_SPP_PHYS_LINK_RATE_MASK_OFFSET) ==
                         SAS_LINK_RATE_1_5_GBPS)
-                        tmp &= ~PHY_MODE6_DTL_SPEED;
+                        tmp &= ~PHY_MODE6_LATECLK;
                 else
-                        tmp |= PHY_MODE6_DTL_SPEED;
+                        tmp |= PHY_MODE6_LATECLK;
                 mvs_write_port_vsr_data(mvi, i, tmp);
 
         }
+out_done:
         if (get_st)
                 mvs_write_port_irq_stat(mvi, i, phy->irq_status);
 }
@@ -2629,6 +2864,11 @@ static void mvs_port_formed(struct asd_sas_phy *sas_phy)
         spin_unlock_irqrestore(&mvi->lock, flags);
 }
 
+static int mvs_I_T_nexus_reset(struct domain_device *dev)
+{
+        return TMF_RESP_FUNC_FAILED;
+}
+
 static int __devinit mvs_hw_init(struct mvs_info *mvi)
 {
         void __iomem *regs = mvi->regs;
@@ -2790,13 +3030,12 @@ static int __devinit mvs_hw_init(struct mvs_info *mvi)
         /* enable CMD/CMPL_Q/RESP mode */
         mw32(PCS, PCS_SATA_RETRY | PCS_FIS_RX_EN | PCS_CMD_EN);
 
-        /* re-enable interrupts globally */
-        mvs_hba_interrupt_enable(mvi);
-
         /* enable completion queue interrupt */
-        tmp = (CINT_PORT_MASK | CINT_DONE | CINT_MEM);
+        tmp = (CINT_PORT_MASK | CINT_DONE | CINT_MEM | CINT_SRS);
         mw32(INT_MASK, tmp);
 
+        /* Enable SRS interrupt */
+        mw32(INT_MASK_SRS, 0xFF);
         return 0;
 }
 
@@ -2870,6 +3109,8 @@ static int __devinit mvs_pci_init(struct pci_dev *pdev,
 
         mvs_print_info(mvi);
 
+        mvs_hba_interrupt_enable(mvi);
+
         scsi_scan_host(mvi->shost);
 
         return 0;
@@ -2915,12 +3156,22 @@ static struct sas_domain_function_template mvs_transport_ops = {
         .lldd_execute_task      = mvs_task_exec,
         .lldd_control_phy       = mvs_phy_control,
         .lldd_abort_task        = mvs_task_abort,
-        .lldd_port_formed       = mvs_port_formed
+        .lldd_port_formed       = mvs_port_formed,
+        .lldd_I_T_nexus_reset   = mvs_I_T_nexus_reset,
 };
 
 static struct pci_device_id __devinitdata mvs_pci_table[] = {
         { PCI_VDEVICE(MARVELL, 0x6320), chip_6320 },
         { PCI_VDEVICE(MARVELL, 0x6340), chip_6440 },
+        {
+                .vendor         = PCI_VENDOR_ID_MARVELL,
+                .device         = 0x6440,
+                .subvendor      = PCI_ANY_ID,
+                .subdevice      = 0x6480,
+                .class          = 0,
+                .class_mask     = 0,
+                .driver_data    = chip_6480,
+        },
         { PCI_VDEVICE(MARVELL, 0x6440), chip_6440 },
         { PCI_VDEVICE(MARVELL, 0x6480), chip_6480 },
 
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index ba21d97d1855..f40898dc2d14 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -2162,10 +2162,15 @@ void sdev_evt_send(struct scsi_device *sdev, struct scsi_event *evt)
 {
         unsigned long flags;
 
+#if 0
+        /* FIXME: currently this check eliminates all media change events
+         * for polled devices.  Need to update to discriminate between AN
+         * and polled events */
         if (!test_bit(evt->evt_type, sdev->supported_events)) {
                 kfree(evt);
                 return;
         }
+#endif
 
         spin_lock_irqsave(&sdev->list_lock, flags);
         list_add_tail(&evt->node, &sdev->event_list);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 7aee64dbfbeb..5fe7aaed904c 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1654,6 +1654,7 @@ static int sd_probe(struct device *dev)
         sdkp->disk = gd;
         sdkp->index = index;
         sdkp->openers = 0;
+        sdkp->previous_state = 1;
 
         if (!sdp->timeout) {
                 if (sdp->type != TYPE_MOD)
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 208565bdbe8e..7ee86d4a7618 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -623,6 +623,7 @@ static int sr_probe(struct device *dev)
         cd->disk = disk;
         cd->capacity = 0x1fffff;
         cd->device->changed = 1;        /* force recheck CD type */
+        cd->previous_state = 1;
         cd->use = 1;
         cd->readcd_known = 0;
         cd->readcd_cdda = 0;
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index a8bec498cad6..f97224ce59da 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -1214,13 +1214,6 @@ static struct pciserial_board pci_boards[] __devinitdata = {
                 .base_baud      = 115200,
                 .uart_offset    = 8,
         },
-        [pbn_b0_8_115200] = {
-                .flags          = FL_BASE0,
-                .num_ports      = 8,
-                .base_baud      = 115200,
-                .uart_offset    = 8,
-        },
-
         [pbn_b0_1_921600] = {
                 .flags          = FL_BASE0,
                 .num_ports      = 1,
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index d57bf3e708d8..430997e33fc4 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -96,6 +96,7 @@
 
  /* PDC registers */
 #define UART_PUT_PTCR(port,v)   __raw_writel(v, (port)->membase + ATMEL_PDC_PTCR)
+#define UART_GET_TCR(port)      __raw_readl((port)->membase + ATMEL_PDC_TCR)
 #define UART_GET_PTSR(port)     __raw_readl((port)->membase + ATMEL_PDC_PTSR)
 
 #define UART_PUT_RPR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_RPR)
@@ -106,6 +107,7 @@
 
 #define UART_PUT_TPR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_TPR)
 #define UART_PUT_TCR(port,v)    __raw_writel(v, (port)->membase + ATMEL_PDC_TCR)
+#define UART_GET_TCR(port)      __raw_readl((port)->membase + ATMEL_PDC_TCR)
 
 static int (*atmel_open_hook)(struct uart_port *);
 static void (*atmel_close_hook)(struct uart_port *);
@@ -562,17 +564,22 @@ static void atmel_tx_dma(struct uart_port *port)
         struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
         int count;
 
+        /* nothing left to transmit? */
+        if (UART_GET_TCR(port))
+                return;
+
         xmit->tail += pdc->ofs;
         xmit->tail &= UART_XMIT_SIZE - 1;
 
         port->icount.tx += pdc->ofs;
         pdc->ofs = 0;
 
-        if (!uart_circ_empty(xmit)) {
-                /* more to transmit - setup next transfer */
+        /* more to transmit - setup next transfer */
 
-                /* disable PDC transmit */
-                UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
+        /* disable PDC transmit */
+        UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
+
+        if (!uart_circ_empty(xmit)) {
                 dma_sync_single_for_device(port->dev,
                                            pdc->dma_addr,
                                            pdc->dma_size,
@@ -586,11 +593,6 @@ static void atmel_tx_dma(struct uart_port *port)
                 /* re-enable PDC transmit and interrupts */
                 UART_PUT_PTCR(port, ATMEL_PDC_TXTEN);
                 UART_PUT_IER(port, ATMEL_US_ENDTX | ATMEL_US_TXBUFE);
-        } else {
-                /* nothing left to transmit - disable the transmitter */
-
-                /* disable PDC transmit */
-                UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
         }
 
         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
@@ -1274,6 +1276,7 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
 {
         struct uart_port *port = &atmel_ports[co->index].uart;
         unsigned int status, imr;
+        unsigned int pdc_tx;
 
         /*
          * First, save IMR and then disable interrupts
@@ -1281,6 +1284,10 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
         imr = UART_GET_IMR(port);
         UART_PUT_IDR(port, ATMEL_US_RXRDY | ATMEL_US_TXRDY);
 
+        /* Store PDC transmit status and disable it */
+        pdc_tx = UART_GET_PTSR(port) & ATMEL_PDC_TXTEN;
+        UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
+
         uart_console_write(port, s, count, atmel_console_putchar);
 
         /*
@@ -1290,6 +1297,11 @@ static void atmel_console_write(struct console *co, const char *s, u_int count)
         do {
                 status = UART_GET_CSR(port);
         } while (!(status & ATMEL_US_TXRDY));
+
+        /* Restore PDC transmit status */
+        if (pdc_tx)
+                UART_PUT_PTCR(port, ATMEL_PDC_TXTEN);
+
         /* set interrupts back the way they were */
         UART_PUT_IER(port, imr);
 }
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index a8c116b80bff..9d244d1644e1 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -414,12 +414,12 @@ static void sci_init_pins_scif(struct uart_port *port, unsigned int cflag)
     defined(CONFIG_CPU_SUBTYPE_SH7785)
 static inline int scif_txroom(struct uart_port *port)
 {
-        return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0x7f);
+        return SCIF_TXROOM_MAX - (sci_in(port, SCTFDR) & 0xff);
 }
 
 static inline int scif_rxroom(struct uart_port *port)
 {
-        return sci_in(port, SCRFDR) & 0x7f;
+        return sci_in(port, SCRFDR) & 0xff;
 }
 #else
 static inline int scif_txroom(struct uart_port *port)
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 3ab313ed441c..17e71d56f31e 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -4,8 +4,6 @@
 
 menuconfig THERMAL
         bool "Generic Thermal sysfs driver"
-        select HWMON
-        default y
         help
           Generic Thermal Sysfs driver offers a generic mechanism for
           thermal management. Usually it's made up of one or more thermal
diff --git a/drivers/thermal/thermal.c b/drivers/thermal/thermal.c
index 41bd4c805ace..8b86e53ccf7a 100644
--- a/drivers/thermal/thermal.c
+++ b/drivers/thermal/thermal.c
@@ -30,10 +30,8 @@
 #include <linux/idr.h>
 #include <linux/thermal.h>
 #include <linux/spinlock.h>
-#include <linux/hwmon.h>
-#include <linux/hwmon-sysfs.h>
 
-MODULE_AUTHOR("Zhang Rui");
+MODULE_AUTHOR("Zhang Rui")
 MODULE_DESCRIPTION("Generic thermal management sysfs support");
 MODULE_LICENSE("GPL");
 
@@ -58,9 +56,6 @@ static LIST_HEAD(thermal_tz_list);
 static LIST_HEAD(thermal_cdev_list);
 static DEFINE_MUTEX(thermal_list_lock);
 
-static struct device *thermal_hwmon;
-#define MAX_THERMAL_ZONES       10
-
 static int get_idr(struct idr *idr, struct mutex *lock, int *id)
 {
         int err;
@@ -92,67 +87,7 @@ static void release_idr(struct idr *idr, struct mutex *lock, int id)
                 mutex_unlock(lock);
 }
 
-/* hwmon sys I/F*/
-static ssize_t
-name_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        return sprintf(buf, "thermal_sys_class\n");
-}
-
-static ssize_t
-temp_input_show(struct device *dev, struct device_attribute *attr, char *buf)
-{
-        struct thermal_zone_device *tz;
-        struct sensor_device_attribute *sensor_attr
-                                                = to_sensor_dev_attr(attr);
-
-        list_for_each_entry(tz, &thermal_tz_list, node)
-                if (tz->id == sensor_attr->index)
-                        return tz->ops->get_temp(tz, buf);
-
-        return -ENODEV;
-}
-
-static ssize_t
-temp_crit_show(struct device *dev, struct device_attribute *attr,
-                char *buf)
-{
-        struct thermal_zone_device *tz;
-        struct sensor_device_attribute *sensor_attr
-                                                = to_sensor_dev_attr(attr);
-
-        list_for_each_entry(tz, &thermal_tz_list, node)
-                if (tz->id == sensor_attr->index)
-                        return tz->ops->get_trip_temp(tz, 0, buf);
-
-        return -ENODEV;
-}
-
-static DEVICE_ATTR(name, 0444, name_show, NULL);
-static struct sensor_device_attribute sensor_attrs[] = {
-        SENSOR_ATTR(temp1_input, 0444, temp_input_show, NULL, 0),
-        SENSOR_ATTR(temp1_crit, 0444, temp_crit_show, NULL, 0),
-        SENSOR_ATTR(temp2_input, 0444, temp_input_show, NULL, 1),
-        SENSOR_ATTR(temp2_crit, 0444, temp_crit_show, NULL, 1),
-        SENSOR_ATTR(temp3_input, 0444, temp_input_show, NULL, 2),
-        SENSOR_ATTR(temp3_crit, 0444, temp_crit_show, NULL, 2),
-        SENSOR_ATTR(temp4_input, 0444, temp_input_show, NULL, 3),
-        SENSOR_ATTR(temp4_crit, 0444, temp_crit_show, NULL, 3),
-        SENSOR_ATTR(temp5_input, 0444, temp_input_show, NULL, 4),
-        SENSOR_ATTR(temp5_crit, 0444, temp_crit_show, NULL, 4),
-        SENSOR_ATTR(temp6_input, 0444, temp_input_show, NULL, 5),
-        SENSOR_ATTR(temp6_crit, 0444, temp_crit_show, NULL, 5),
-        SENSOR_ATTR(temp7_input, 0444, temp_input_show, NULL, 6),
-        SENSOR_ATTR(temp7_crit, 0444, temp_crit_show, NULL, 6),
-        SENSOR_ATTR(temp8_input, 0444, temp_input_show, NULL, 7),
-        SENSOR_ATTR(temp8_crit, 0444, temp_crit_show, NULL, 7),
-        SENSOR_ATTR(temp9_input, 0444, temp_input_show, NULL, 8),
-        SENSOR_ATTR(temp9_crit, 0444, temp_crit_show, NULL, 8),
-        SENSOR_ATTR(temp10_input, 0444, temp_input_show, NULL, 9),
-        SENSOR_ATTR(temp10_crit, 0444, temp_crit_show, NULL, 9),
-};
-
-/* thermal zone sys I/F */
+/* sys I/F for thermal zone */
 
 #define to_thermal_zone(_dev) \
         container_of(_dev, struct thermal_zone_device, device)
@@ -279,7 +214,7 @@ do {	\
         device_remove_file(_dev, &trip_point_attrs[_index * 2 + 1]);    \
 } while (0)
 
-/* cooling device sys I/F */
+/* sys I/F for cooling device */
 #define to_cooling_device(_dev) \
         container_of(_dev, struct thermal_cooling_device, device)
 
@@ -512,9 +447,6 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *type,
         struct thermal_zone_device *pos;
         int result;
 
-        if (!type)
-                return ERR_PTR(-EINVAL);
-
         if (strlen(type) >= THERMAL_NAME_LENGTH)
                 return ERR_PTR(-EINVAL);
 
@@ -545,9 +477,11 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *type,
         }
 
         /* sys I/F */
-        result = device_create_file(&cdev->device, &dev_attr_cdev_type);
-        if (result)
-                goto unregister;
+        if (type) {
+                result = device_create_file(&cdev->device, &dev_attr_cdev_type);
+                if (result)
+                        goto unregister;
+        }
 
         result = device_create_file(&cdev->device, &dev_attr_max_state);
         if (result)
@@ -613,8 +547,8 @@ void thermal_cooling_device_unregister(struct
                 tz->ops->unbind(tz, cdev);
         }
         mutex_unlock(&thermal_list_lock);
-
-        device_remove_file(&cdev->device, &dev_attr_cdev_type);
+        if (cdev->type[0])
+                device_remove_file(&cdev->device, &dev_attr_cdev_type);
         device_remove_file(&cdev->device, &dev_attr_max_state);
         device_remove_file(&cdev->device, &dev_attr_cur_state);
 
@@ -646,9 +580,6 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
         int result;
         int count;
 
-        if (!type)
-                return ERR_PTR(-EINVAL);
-
         if (strlen(type) >= THERMAL_NAME_LENGTH)
                 return ERR_PTR(-EINVAL);
 
@@ -670,13 +601,6 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
                 kfree(tz);
                 return ERR_PTR(result);
         }
-        if (tz->id >= MAX_THERMAL_ZONES) {
-                printk(KERN_ERR PREFIX
-                        "Too many thermal zones\n");
-                release_idr(&thermal_tz_idr, &thermal_idr_lock, tz->id);
-                kfree(tz);
-                return ERR_PTR(-EINVAL);
-        }
 
         strcpy(tz->type, type);
         tz->ops = ops;
@@ -691,27 +615,12 @@ struct thermal_zone_device *thermal_zone_device_register(char *type,
                 return ERR_PTR(result);
         }
 
-        /* hwmon sys I/F */
-        result = device_create_file(thermal_hwmon,
-                                        &sensor_attrs[tz->id * 2].dev_attr);
-        if (result)
-                goto unregister;
-
-        if (trips > 0) {
-                char buf[40];
-                result = tz->ops->get_trip_type(tz, 0, buf);
-                if (result > 0 && !strcmp(buf, "critical\n")) {
-                        result = device_create_file(thermal_hwmon,
-                                        &sensor_attrs[tz->id * 2 + 1].dev_attr);
-                        if (result)
-                                goto unregister;
-                }
-        }
-
         /* sys I/F */
-        result = device_create_file(&tz->device, &dev_attr_type);
-        if (result)
-                goto unregister;
+        if (type) {
+                result = device_create_file(&tz->device, &dev_attr_type);
+                if (result)
+                        goto unregister;
+        }
 
         result = device_create_file(&tz->device, &dev_attr_temp);
         if (result)
@@ -778,17 +687,8 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
                     tz->ops->unbind(tz, cdev);
         mutex_unlock(&thermal_list_lock);
 
-        device_remove_file(thermal_hwmon,
-                                &sensor_attrs[tz->id * 2].dev_attr);
-        if (tz->trips > 0) {
-                char buf[40];
-                if (tz->ops->get_trip_type(tz, 0, buf) > 0)
-                        if (!strcmp(buf, "critical\n"))
-                                device_remove_file(thermal_hwmon,
-                                &sensor_attrs[tz->id * 2 + 1].dev_attr);
-        }
-
-        device_remove_file(&tz->device, &dev_attr_type);
+        if (tz->type[0])
+                device_remove_file(&tz->device, &dev_attr_type);
         device_remove_file(&tz->device, &dev_attr_temp);
         if (tz->ops->get_mode)
                 device_remove_file(&tz->device, &dev_attr_mode);
@@ -805,19 +705,6 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz)
 
 EXPORT_SYMBOL(thermal_zone_device_unregister);
 
-static void thermal_exit(void)
-{
-        if (thermal_hwmon) {
-                device_remove_file(thermal_hwmon, &dev_attr_name);
-                hwmon_device_unregister(thermal_hwmon);
-        }
-        class_unregister(&thermal_class);
-        idr_destroy(&thermal_tz_idr);
-        idr_destroy(&thermal_cdev_idr);
-        mutex_destroy(&thermal_idr_lock);
-        mutex_destroy(&thermal_list_lock);
-}
-
 static int __init thermal_init(void)
 {
         int result = 0;
@@ -829,21 +716,17 @@ static int __init thermal_init(void)
                 mutex_destroy(&thermal_idr_lock);
                 mutex_destroy(&thermal_list_lock);
         }
-
-        thermal_hwmon = hwmon_device_register(NULL);
-        if (IS_ERR(thermal_hwmon)) {
-                result = PTR_ERR(thermal_hwmon);
-                thermal_hwmon = NULL;
-                printk(KERN_ERR PREFIX
-                        "unable to register hwmon device\n");
-                thermal_exit();
-                return result;
-        }
-
-        result = device_create_file(thermal_hwmon, &dev_attr_name);
-
         return result;
 }
 
+static void __exit thermal_exit(void)
+{
+        class_unregister(&thermal_class);
+        idr_destroy(&thermal_tz_idr);
+        idr_destroy(&thermal_cdev_idr);
+        mutex_destroy(&thermal_idr_lock);
+        mutex_destroy(&thermal_list_lock);
+}
+
 subsys_initcall(thermal_init);
 module_exit(thermal_exit);
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index e8a01f264540..11759080ca54 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -470,6 +470,8 @@ static int uio_mmap_physical(struct vm_area_struct *vma)
 
         vma->vm_flags |= VM_IO | VM_RESERVED;
 
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+
         return remap_pfn_range(vma,
                                vma->vm_start,
                                idev->info->mem[mi].addr >> PAGE_SHIFT,
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index fefb92296e8f..c311f67b7f08 100644
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -1206,7 +1206,10 @@ int usb_set_interface(struct usb_device *dev, int interface, int alternate)
                 return -EINVAL;
         }
 
-        ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
+        if (dev->quirks & USB_QUIRK_NO_SET_INTF)
+                ret = -EPIPE;
+        else
+                ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                                    USB_REQ_SET_INTERFACE, USB_RECIP_INTERFACE,
                                    alternate, interface, NULL, 0, 5000);
 
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index d9d1eb19f2a1..dfc5418ea10c 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -50,6 +50,9 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* M-Systems Flash Disk Pioneers */
         { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */
+        { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF },
+
         /* Action Semiconductor flash disk */
         { USB_DEVICE(0x10d6, 0x2200), .driver_info =
                         USB_QUIRK_STRING_FETCH_255 },
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 805602a687cb..0a6feafc8d28 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1458,7 +1458,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
         /* currently one config, two speeds */
         case USB_REQ_SET_CONFIGURATION:
                 if (ctrl->bRequestType != 0)
-                        break;
+                        goto unrecognized;
                 if (0 == (u8) w_value) {
                         value = 0;
                         dev->current_config = 0;
@@ -1505,7 +1505,7 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl)
         /* PXA automagically handles this request too */
         case USB_REQ_GET_CONFIGURATION:
                 if (ctrl->bRequestType != 0x80)
-                        break;
+                        goto unrecognized;
                 *(u8 *)req->buf = dev->current_config;
                 value = min (w_length, (u16) 1);
                 break;
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 40e8240b7851..4e065e556e4b 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -135,8 +135,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
                 hcd->state = HC_STATE_QUIESCING;
         }
         ehci->command = ehci_readl(ehci, &ehci->regs->command);
-        if (ehci->reclaim)
-                end_unlink_async(ehci);
         ehci_work(ehci);
 
         /* Unlike other USB host controller types, EHCI doesn't have
@@ -180,6 +178,9 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
         ehci_halt (ehci);
         hcd->state = HC_STATE_SUSPENDED;
 
+        if (ehci->reclaim)
+                end_unlink_async(ehci);
+
         /* allow remote wakeup */
         mask = INTR_MASK;
         if (!device_may_wakeup(&hcd->self.root_hub->dev))
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 3ba01664f821..72ccd56e36dd 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -152,6 +152,20 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
                         break;
                 }
                 break;
+        case PCI_VENDOR_ID_VIA:
+                if (pdev->device == 0x3104 && (pdev->revision & 0xf0) == 0x60) {
+                        u8 tmp;
+
+                        /* The VT6212 defaults to a 1 usec EHCI sleep time which
+                         * hogs the PCI bus *badly*. Setting bit 5 of 0x4B makes
+                         * that sleep time use the conventional 10 usec.
+                         */
+                        pci_read_config_byte(pdev, 0x4b, &tmp);
+                        if (tmp & 0x20)
+                                break;
+                        pci_write_config_byte(pdev, 0x4b, tmp | 0x20);
+                }
+                break;
         }
 
         ehci_reset(ehci);
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index dd4798ee028e..33f1c1c32edf 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -467,7 +467,7 @@ static void unlink_watchdog_func(unsigned long _ohci)
 out:
         kfree(seen);
         if (ohci->eds_scheduled)
-                mod_timer(&ohci->unlink_watchdog, round_jiffies_relative(HZ));
+                mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ));
 done:
         spin_unlock_irqrestore(&ohci->lock, flags);
 }
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index 51817322232b..9c9f3b59186f 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -169,7 +169,7 @@ static int ed_schedule (struct ohci_hcd *ohci, struct ed *ed)
         if (quirk_zfmicro(ohci)
                         && (ed->type == PIPE_INTERRUPT)
                         && !(ohci->eds_scheduled++))
-                mod_timer(&ohci->unlink_watchdog, round_jiffies_relative(HZ));
+                mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ));
         wmb ();
 
         /* we care about rm_list when setting CLE/BLE in case the HC was at
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index da922dfc0dcc..b6b5b2affad1 100644
--- a/drivers/usb/misc/usbtest.c
+++ b/drivers/usb/misc/usbtest.c
@@ -378,6 +378,7 @@ alloc_sglist (int nents, int max, int vary)
         sg = kmalloc (nents * sizeof *sg, GFP_KERNEL);
         if (!sg)
                 return NULL;
+        sg_init_table(sg, nents);
 
         for (i = 0; i < nents; i++) {
                 char            *buf;
@@ -390,7 +391,7 @@ alloc_sglist (int nents, int max, int vary)
                 }
 
                 /* kmalloc pages are always physically contiguous! */
-                sg_init_one(&sg[i], buf, size);
+                sg_set_buf(&sg[i], buf, size);
 
                 switch (pattern) {
                 case 0:
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c
index f3ca66017a03..324bb61d68ff 100644
--- a/drivers/usb/serial/cp2101.c
+++ b/drivers/usb/serial/cp2101.c
@@ -75,6 +75,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */
         { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */
         { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */
+        { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */
         { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */
         { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */
diff --git a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
index 8a0d17401529..74ce8bca3e66 100644
--- a/drivers/usb/serial/keyspan.h
+++ b/drivers/usb/serial/keyspan.h
@@ -637,6 +637,7 @@ static struct usb_serial_driver keyspan_pre_device = {
         .description            = "Keyspan - (without firmware)",
         .id_table               = keyspan_pre_ids,
         .num_interrupt_in       = NUM_DONT_CARE,
+        .num_interrupt_out      = NUM_DONT_CARE,
         .num_bulk_in            = NUM_DONT_CARE,
         .num_bulk_out           = NUM_DONT_CARE,
         .num_ports              = 1,
@@ -651,6 +652,7 @@ static struct usb_serial_driver keyspan_1port_device = {
         .description            = "Keyspan 1 port adapter",
         .id_table               = keyspan_1port_ids,
         .num_interrupt_in       = NUM_DONT_CARE,
+        .num_interrupt_out      = NUM_DONT_CARE,
         .num_bulk_in            = NUM_DONT_CARE,
         .num_bulk_out           = NUM_DONT_CARE,
         .num_ports              = 1,
@@ -678,6 +680,7 @@ static struct usb_serial_driver keyspan_2port_device = {
         .description            = "Keyspan 2 port adapter",
         .id_table               = keyspan_2port_ids,
         .num_interrupt_in       = NUM_DONT_CARE,
+        .num_interrupt_out      = NUM_DONT_CARE,
         .num_bulk_in            = NUM_DONT_CARE,
         .num_bulk_out           = NUM_DONT_CARE,
         .num_ports              = 2,
@@ -705,6 +708,7 @@ static struct usb_serial_driver keyspan_4port_device = {
         .description            = "Keyspan 4 port adapter",
         .id_table               = keyspan_4port_ids,
         .num_interrupt_in       = NUM_DONT_CARE,
+        .num_interrupt_out      = NUM_DONT_CARE,
         .num_bulk_in            = NUM_DONT_CARE,
         .num_bulk_out           = NUM_DONT_CARE,
         .num_ports              = 4,
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index ae3ec1a64008..2af778555bdc 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -55,6 +55,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_DCU11) },
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ3) },
         { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_PHAROS) },
+        { USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_ALDIGA) },
         { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
         { USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID_RSAQ5) },
         { USB_DEVICE(ATEN_VENDOR_ID, ATEN_PRODUCT_ID) },
diff --git a/drivers/usb/serial/pl2303.h b/drivers/usb/serial/pl2303.h
index 237a41f6638a..10cf872e5ecb 100644
--- a/drivers/usb/serial/pl2303.h
+++ b/drivers/usb/serial/pl2303.h
@@ -13,6 +13,7 @@
 #define PL2303_PRODUCT_ID_DCU11         0x1234
 #define PL2303_PRODUCT_ID_PHAROS        0xaaa0
 #define PL2303_PRODUCT_ID_RSAQ3         0xaaa2
+#define PL2303_PRODUCT_ID_ALDIGA        0x0611
 
 #define ATEN_VENDOR_ID          0x0557
 #define ATEN_VENDOR_ID2         0x0547
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index e3d44ae8d448..ed678811e6a6 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -14,7 +14,7 @@
   Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org>
 */
 
-#define DRIVER_VERSION "v.1.2.7"
+#define DRIVER_VERSION "v.1.2.8"
 #define DRIVER_AUTHOR "Kevin Lloyd <linux@sierrawireless.com>"
 #define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
 
@@ -163,6 +163,7 @@ static struct usb_device_id id_table [] = {
         { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */
         { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */
         { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Thinkpad internal) */
+        { USB_DEVICE(0x1199, 0x6815) }, /* Sierra Wireless MC8775 */
         { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */
         { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/
         { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/
@@ -196,9 +197,9 @@ struct sierra_port_private {
         spinlock_t lock;        /* lock the structure */
         int outstanding_urbs;   /* number of out urbs in flight */
 
-        /* Input endpoints and buffer for this port */
+        /* Input endpoints and buffers for this port */
         struct urb *in_urbs[N_IN_URB];
-        char in_buffer[N_IN_URB][IN_BUFLEN];
+        char *in_buffer[N_IN_URB];
 
         /* Settings for the port */
         int rts_state;  /* Handshaking pins (outputs) */
@@ -638,6 +639,15 @@ static int sierra_startup(struct usb_serial *serial)
                         return -ENOMEM;
                 }
                 spin_lock_init(&portdata->lock);
+                for (j = 0; j < N_IN_URB; j++) {
+                        portdata->in_buffer[j] = kmalloc(IN_BUFLEN, GFP_KERNEL);
+                        if (!portdata->in_buffer[j]) {
+                                for (--j; j >= 0; j--)
+                                        kfree(portdata->in_buffer[j]);
+                                kfree(portdata);
+                                return -ENOMEM;
+                        }
+                }
 
                 usb_set_serial_port_data(port, portdata);
 
@@ -681,7 +691,7 @@ static void sierra_shutdown(struct usb_serial *serial)
                 for (j = 0; j < N_IN_URB; j++) {
                         usb_kill_urb(portdata->in_urbs[j]);
                         usb_free_urb(portdata->in_urbs[j]);
-                        portdata->in_urbs[j] = NULL;
+                        kfree(portdata->in_buffer[j]);
                 }
                 kfree(portdata);
                 usb_set_serial_port_data(port, NULL);
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index b517f93352ec..e3d241f67afc 100644
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -265,8 +265,8 @@ static struct usb_serial_driver ti_1port_device = {
         .description            = "TI USB 3410 1 port adapter",
         .usb_driver             = &ti_usb_driver,
         .id_table               = ti_id_table_3410,
-        .num_interrupt_in       = 1,
-        .num_bulk_in            = 1,
+        .num_interrupt_in       = NUM_DONT_CARE,
+        .num_bulk_in            = NUM_DONT_CARE,
         .num_bulk_out           = 1,
         .num_ports              = 1,
         .attach                 = ti_startup,
diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 22b3f78a388c..c2b01f7c3197 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -191,7 +191,7 @@ static struct usb_serial_driver handspring_device = {
         .id_table =             id_table,
         .num_interrupt_in =     NUM_DONT_CARE,
         .num_bulk_in =          2,
-        .num_bulk_out =         2,
+        .num_bulk_out =         NUM_DONT_CARE,
         .num_ports =            2,
         .open =                 visor_open,
         .close =                visor_close,
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 2ae1e8673b19..971d13dd5e65 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -1230,6 +1230,7 @@ static int isd200_get_inquiry_data( struct us_data *us )
             
                         /* Free driver structure */         
                         us->extra_destructor(info);
+                        kfree(info);
                         us->extra = NULL;
                         us->extra_destructor = NULL;
                 }
@@ -1469,6 +1470,7 @@ static void isd200_free_info_ptrs(void *info_)
         if (info) {
                 kfree(info->id);
                 kfree(info->RegsBuf);
+                kfree(info->srb.sense_buffer);
         }
 }
 
@@ -1494,7 +1496,9 @@ static int isd200_init_info(struct us_data *us)
                                 kzalloc(sizeof(struct hd_driveid), GFP_KERNEL);
                 info->RegsBuf = (unsigned char *)
                                 kmalloc(sizeof(info->ATARegs), GFP_KERNEL);
-                if (!info->id || !info->RegsBuf) {
+                info->srb.sense_buffer =
+                                kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
+                if (!info->id || !info->RegsBuf || !info->srb.sense_buffer) {
                         isd200_free_info_ptrs(info);
                         kfree(info);
                         retStatus = ISD200_ERROR;
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 5780ed15f1ad..bdd4334bed5a 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -1009,7 +1009,8 @@ int usb_stor_Bulk_transport(struct scsi_cmnd *srb, struct us_data *us)
         US_DEBUGP("Bulk Status S 0x%x T 0x%x R %u Stat 0x%x\n",
                         le32_to_cpu(bcs->Signature), bcs->Tag, 
                         residue, bcs->Status);
-        if (bcs->Tag != us->tag || bcs->Status > US_BULK_STAT_PHASE) {
+        if (!(bcs->Tag == us->tag || (us->flags & US_FL_BULK_IGNORE_TAG)) ||
+                bcs->Status > US_BULK_STAT_PHASE) {
                 US_DEBUGP("Bulk logical error\n");
                 return USB_STOR_TRANSPORT_ERROR;
         }
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 99679a8cfa02..e5219a56947c 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1589,6 +1589,17 @@ UNUSUAL_DEV(  0x22b8, 0x4810, 0x0001, 0x0001,
                 US_SC_DEVICE, US_PR_DEVICE, NULL,
                 US_FL_FIX_CAPACITY),
 
+/*
+ * Patch by Constantin Baranov <const@tltsu.ru>
+ * Report by Andreas Koenecke.
+ * Motorola ROKR Z6.
+ */
+UNUSUAL_DEV(  0x22b8, 0x6426, 0x0101, 0x0101,
+                "Motorola",
+                "MSnc.",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_INQUIRY | US_FL_FIX_CAPACITY | US_FL_BULK_IGNORE_TAG),
+
 /* Reported by Radovan Garabik <garabik@kassiopeia.juls.savba.sk> */
 UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x9999,
                 "MPIO",
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index e0b0580705e4..1bd5fb30237d 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1893,6 +1893,20 @@ config FB_XILINX
           framebuffer. ML300 carries a 640*480 LCD display on the board,
           ML403 uses a standard DB15 VGA connector.
 
+config FB_METRONOME
+       tristate "Metronome display controller support"
+       depends on FB && ARCH_PXA && MMU
+       select FB_SYS_FILLRECT
+       select FB_SYS_COPYAREA
+       select FB_SYS_IMAGEBLIT
+       select FB_SYS_FOPS
+       select FB_DEFERRED_IO
+       help
+         This enables support for the Metronome display controller. Tested
+         with an E-Ink 800x600 display and Gumstix Connex through an AMLCD
+         interface. Please read <file:Documentation/fb/metronomefb.txt>
+         for more information.
+
 config FB_VIRTUAL
         tristate "Virtual Frame Buffer support (ONLY FOR TESTING!)"
         depends on FB
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 03371c789039..11c0e5e05f21 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -103,6 +103,7 @@ obj-$(CONFIG_FB_PMAG_AA)	  += pmag-aa-fb.o
 obj-$(CONFIG_FB_PMAG_BA)          += pmag-ba-fb.o
 obj-$(CONFIG_FB_PMAGB_B)          += pmagb-b-fb.o
 obj-$(CONFIG_FB_MAXINE)           += maxinefb.o
+obj-$(CONFIG_FB_METRONOME)        += metronomefb.o
 obj-$(CONFIG_FB_S1D13XXX)         += s1d13xxxfb.o
 obj-$(CONFIG_FB_IMX)              += imxfb.o
 obj-$(CONFIG_FB_S3C2410)          += s3c2410fb.o
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index 986a550c0439..eefba3d0e4b9 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -384,7 +384,7 @@ static int bfin_bf54x_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
          *   Other flags can be set, and are documented in
          *   include/linux/mm.h
          */
-        vma->vm_flags |= VM_MAYSHARE;
+        vma->vm_flags |=  VM_MAYSHARE | VM_SHARED;
 
         return 0;
 }
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index a2bb2de9e020..135d6dd7e672 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -91,6 +91,7 @@ struct bfin_t350mcqbfb_info {
         int lq043_open_cnt;
         int irq;
         spinlock_t lock;        /* lock */
+        u32 pseudo_pal[16];
 };
 
 static int nocursor;
@@ -182,13 +183,13 @@ static void bfin_t350mcqb_config_dma(struct bfin_t350mcqbfb_info *fbi)
 
 }
 
-static int bfin_t350mcqb_request_ports(int action)
-{
-        u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
+static  u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
                             P_PPI0_D0, P_PPI0_D1, P_PPI0_D2,
                             P_PPI0_D3, P_PPI0_D4, P_PPI0_D5,
                             P_PPI0_D6, P_PPI0_D7, 0};
 
+static int bfin_t350mcqb_request_ports(int action)
+{
         if (action) {
                 if (peripheral_request_list(ppi0_req_8, DRIVER_NAME)) {
                         printk(KERN_ERR "Requesting Peripherals faild\n");
@@ -301,7 +302,7 @@ static int bfin_t350mcqb_fb_mmap(struct fb_info *info, struct vm_area_struct *vm
          *   Other flags can be set, and are documented in
          *   include/linux/mm.h
          */
-        vma->vm_flags |= VM_MAYSHARE;
+        vma->vm_flags |= VM_MAYSHARE | VM_SHARED;
 
         return 0;
 }
@@ -520,16 +521,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
 
         fbinfo->fbops = &bfin_t350mcqb_fb_ops;
 
-        fbinfo->pseudo_palette = kmalloc(sizeof(u32) * 16, GFP_KERNEL);
-        if (!fbinfo->pseudo_palette) {
-                printk(KERN_ERR DRIVER_NAME
-                       "Fail to allocate pseudo_palette\n");
-
-                ret = -ENOMEM;
-                goto out4;
-        }
-
-        memset(fbinfo->pseudo_palette, 0, sizeof(u32) * 16);
+        fbinfo->pseudo_palette = &info->pseudo_pal;
 
         if (fb_alloc_cmap(&fbinfo->cmap, BFIN_LCD_NBR_PALETTE_ENTRIES, 0)
             < 0) {
@@ -537,7 +529,7 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
                        "Fail to allocate colormap (%d entries)\n",
                        BFIN_LCD_NBR_PALETTE_ENTRIES);
                 ret = -EFAULT;
-                goto out5;
+                goto out4;
         }
 
         if (bfin_t350mcqb_request_ports(1)) {
@@ -552,11 +544,11 @@ static int __init bfin_t350mcqb_probe(struct platform_device *pdev)
                 goto out7;
         }
 
-        if (request_irq(info->irq, (void *)bfin_t350mcqb_irq_error, IRQF_DISABLED,
-                        "PPI ERROR", info) < 0) {
+        ret = request_irq(info->irq, bfin_t350mcqb_irq_error, IRQF_DISABLED,
+                        "PPI ERROR", info);
+        if (ret < 0) {
                 printk(KERN_ERR DRIVER_NAME
                        ": unable to request PPI ERROR IRQ\n");
-                ret = -EFAULT;
                 goto out7;
         }
 
@@ -584,8 +576,6 @@ out7:
         bfin_t350mcqb_request_ports(0);
 out6:
         fb_dealloc_cmap(&fbinfo->cmap);
-out5:
-        kfree(fbinfo->pseudo_palette);
 out4:
         dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
                           info->dma_handle);
@@ -605,6 +595,8 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
         struct fb_info *fbinfo = platform_get_drvdata(pdev);
         struct bfin_t350mcqbfb_info *info = fbinfo->par;
 
+        unregister_framebuffer(fbinfo);
+
         free_dma(CH_PPI);
         free_irq(info->irq, info);
 
@@ -612,7 +604,6 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
                 dma_free_coherent(NULL, fbinfo->fix.smem_len, info->fb_buffer,
                                   info->dma_handle);
 
-        kfree(fbinfo->pseudo_palette);
         fb_dealloc_cmap(&fbinfo->cmap);
 
 #ifndef NO_BL_SUPPORT
@@ -620,10 +611,11 @@ static int bfin_t350mcqb_remove(struct platform_device *pdev)
         backlight_device_unregister(bl_dev);
 #endif
 
-        unregister_framebuffer(fbinfo);
-
         bfin_t350mcqb_request_ports(0);
 
+        platform_set_drvdata(pdev, NULL);
+        framebuffer_release(fbinfo);
+
         printk(KERN_INFO DRIVER_NAME ": Unregister LCD driver.\n");
 
         return 0;
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c
index 0f8cfb988c90..24843fdd5395 100644
--- a/drivers/video/fb_defio.c
+++ b/drivers/video/fb_defio.c
@@ -4,7 +4,7 @@
  *  Copyright (C) 2006 Jaya Kumar
  *
  * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file COPYING in the main directory of this archive
+ * License. See the file COPYING in the main directory of this archive
  * for more details.
  */
 
@@ -31,7 +31,7 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma,
         unsigned long offset;
         struct page *page;
         struct fb_info *info = vma->vm_private_data;
-        /* info->screen_base is in System RAM */
+        /* info->screen_base is virtual memory */
         void *screen_base = (void __force *) info->screen_base;
 
         offset = vmf->pgoff << PAGE_SHIFT;
@@ -43,6 +43,15 @@ static int fb_deferred_io_fault(struct vm_area_struct *vma,
                 return VM_FAULT_SIGBUS;
 
         get_page(page);
+
+        if (vma->vm_file)
+                page->mapping = vma->vm_file->f_mapping;
+        else
+                printk(KERN_ERR "no mapping available\n");
+
+        BUG_ON(!page->mapping);
+        page->index = vmf->pgoff;
+
         vmf->page = page;
         return 0;
 }
@@ -138,11 +147,20 @@ EXPORT_SYMBOL_GPL(fb_deferred_io_init);
 
 void fb_deferred_io_cleanup(struct fb_info *info)
 {
+        void *screen_base = (void __force *) info->screen_base;
         struct fb_deferred_io *fbdefio = info->fbdefio;
+        struct page *page;
+        int i;
 
         BUG_ON(!fbdefio);
         cancel_delayed_work(&info->deferred_work);
         flush_scheduled_work();
+
+        /* clear out the mapping that we setup */
+        for (i = 0 ; i < info->fix.smem_len; i += PAGE_SIZE) {
+                page = vmalloc_to_page(screen_base + i);
+                page->mapping = NULL;
+        }
 }
 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
 
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 1d13dd099af8..a24e680d2b9c 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -1476,7 +1476,7 @@ static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor)
         struct i810fb_par *par = info->par;
         u8 __iomem *mmio = par->mmio_start_virtual;
 
-        if (!(par->dev_flags & LOCKUP))
+        if (par->dev_flags & LOCKUP)
                 return -ENXIO;
 
         if (cursor->image.width > 64 || cursor->image.height > 64)
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c
new file mode 100644
index 000000000000..e9a89fd82757
--- /dev/null
+++ b/drivers/video/metronomefb.c
@@ -0,0 +1,999 @@
+/*
+ * linux/drivers/video/metronomefb.c -- FB driver for Metronome controller
+ *
+ * Copyright (C) 2008, Jaya Kumar
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of this archive for
+ * more details.
+ *
+ * Layout is based on skeletonfb.c by James Simmons and Geert Uytterhoeven.
+ *
+ * This work was made possible by help and equipment support from E-Ink
+ * Corporation. http://support.eink.com/community
+ *
+ * This driver is written to be used with the Metronome display controller.
+ * It was tested with an E-Ink 800x600 Vizplex EPD on a Gumstix Connex board
+ * using the Lyre interface board.
+ *
+ * General notes:
+ * - User must set metronomefb_enable=1 to enable it.
+ * - See Documentation/fb/metronomefb.txt for how metronome works.
+ */
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/mm.h>
+#include <linux/slab.h>
+#include <linux/vmalloc.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/fb.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/firmware.h>
+#include <linux/dma-mapping.h>
+#include <linux/uaccess.h>
+#include <linux/irq.h>
+
+#include <asm/arch/pxa-regs.h>
+#include <asm/unaligned.h>
+
+#define DEBUG 1
+#ifdef DEBUG
+#define DPRINTK(f, a...) printk(KERN_DEBUG "%s: " f, __func__ , ## a)
+#else
+#define DPRINTK(f, a...)
+#endif
+
+
+/* Display specific information */
+#define DPY_W 832
+#define DPY_H 622
+
+struct metromem_desc {
+        u32 mFDADR0;
+        u32 mFSADR0;
+        u32 mFIDR0;
+        u32 mLDCMD0;
+};
+
+struct metromem_cmd {
+        u16 opcode;
+        u16 args[((64-2)/2)];
+        u16 csum;
+};
+
+struct metronomefb_par {
+        unsigned char *metromem;
+        struct metromem_desc *metromem_desc;
+        struct metromem_cmd *metromem_cmd;
+        unsigned char *metromem_wfm;
+        unsigned char *metromem_img;
+        u16 *metromem_img_csum;
+        u16 *csum_table;
+        int metromemsize;
+        dma_addr_t metromem_dma;
+        dma_addr_t metromem_desc_dma;
+        struct fb_info *info;
+        wait_queue_head_t waitq;
+        u8 frame_count;
+};
+
+/* frame differs from image. frame includes non-visible pixels */
+struct epd_frame {
+        int fw; /* frame width */
+        int fh; /* frame height */
+};
+
+static struct epd_frame epd_frame_table[] = {
+        {
+        .fw = 832,
+        .fh = 622
+        },
+};
+
+static struct fb_fix_screeninfo metronomefb_fix __devinitdata = {
+        .id =           "metronomefb",
+        .type =         FB_TYPE_PACKED_PIXELS,
+        .visual =       FB_VISUAL_STATIC_PSEUDOCOLOR,
+        .xpanstep =     0,
+        .ypanstep =     0,
+        .ywrapstep =    0,
+        .line_length =  DPY_W,
+        .accel =        FB_ACCEL_NONE,
+};
+
+static struct fb_var_screeninfo metronomefb_var __devinitdata = {
+        .xres           = DPY_W,
+        .yres           = DPY_H,
+        .xres_virtual   = DPY_W,
+        .yres_virtual   = DPY_H,
+        .bits_per_pixel = 8,
+        .grayscale      = 1,
+        .nonstd         = 1,
+        .red =          { 4, 3, 0 },
+        .green =        { 0, 0, 0 },
+        .blue =         { 0, 0, 0 },
+        .transp =       { 0, 0, 0 },
+};
+
+static unsigned int metronomefb_enable;
+
+struct waveform_hdr {
+        u8 stuff[32];
+
+        u8 wmta[3];
+        u8 fvsn;
+
+        u8 luts;
+        u8 mc;
+        u8 trc;
+        u8 stuff3;
+
+        u8 endb;
+        u8 swtb;
+        u8 stuff2a[2];
+
+        u8 stuff2b[3];
+        u8 wfm_cs;
+} __attribute__ ((packed));
+
+/* main metronomefb functions */
+static u8 calc_cksum(int start, int end, u8 *mem)
+{
+        u8 tmp = 0;
+        int i;
+
+        for (i = start; i < end; i++)
+                tmp += mem[i];
+
+        return tmp;
+}
+
+static u16 calc_img_cksum(u16 *start, int length)
+{
+        u16 tmp = 0;
+
+        while (length--)
+                tmp += *start++;
+
+        return tmp;
+}
+
+/* here we decode the incoming waveform file and populate metromem */
+#define EXP_WFORM_SIZE 47001
+static int load_waveform(u8 *mem, size_t size, u8 *metromem, int m, int t,
+                                u8 *frame_count)
+{
+        int tta;
+        int wmta;
+        int trn = 0;
+        int i;
+        unsigned char v;
+        u8 cksum;
+        int cksum_idx;
+        int wfm_idx, owfm_idx;
+        int mem_idx = 0;
+        struct waveform_hdr *wfm_hdr;
+
+        if (size != EXP_WFORM_SIZE) {
+                printk(KERN_ERR "Error: unexpected size %d != %d\n", size,
+                                        EXP_WFORM_SIZE);
+                return -EINVAL;
+        }
+
+        wfm_hdr = (struct waveform_hdr *) mem;
+
+        if (wfm_hdr->fvsn != 1) {
+                printk(KERN_ERR "Error: bad fvsn %x\n", wfm_hdr->fvsn);
+                return -EINVAL;
+        }
+        if (wfm_hdr->luts != 0) {
+                printk(KERN_ERR "Error: bad luts %x\n", wfm_hdr->luts);
+                return -EINVAL;
+        }
+        cksum = calc_cksum(32, 47, mem);
+        if (cksum != wfm_hdr->wfm_cs) {
+                printk(KERN_ERR "Error: bad cksum %x != %x\n", cksum,
+                                        wfm_hdr->wfm_cs);
+                return -EINVAL;
+        }
+        wfm_hdr->mc += 1;
+        wfm_hdr->trc += 1;
+        for (i = 0; i < 5; i++) {
+                if (*(wfm_hdr->stuff2a + i) != 0) {
+                        printk(KERN_ERR "Error: unexpected value in padding\n");
+                        return -EINVAL;
+                }
+        }
+
+        /* calculating trn. trn is something used to index into
+        the waveform. presumably selecting the right one for the
+        desired temperature. it works out the offset of the first
+        v that exceeds the specified temperature */
+        if ((sizeof(*wfm_hdr) + wfm_hdr->trc) > size)
+                return -EINVAL;
+
+        for (i = sizeof(*wfm_hdr); i <= sizeof(*wfm_hdr) + wfm_hdr->trc; i++) {
+                if (mem[i] > t) {
+                        trn = i - sizeof(*wfm_hdr) - 1;
+                        break;
+                }
+        }
+
+        /* check temperature range table checksum */
+        cksum_idx = sizeof(*wfm_hdr) + wfm_hdr->trc + 1;
+        if (cksum_idx > size)
+                return -EINVAL;
+        cksum = calc_cksum(sizeof(*wfm_hdr), cksum_idx, mem);
+        if (cksum != mem[cksum_idx]) {
+                printk(KERN_ERR "Error: bad temperature range table cksum"
+                                " %x != %x\n", cksum, mem[cksum_idx]);
+                return -EINVAL;
+        }
+
+        /* check waveform mode table address checksum */
+        wmta = le32_to_cpu(get_unaligned((__le32 *) wfm_hdr->wmta));
+        wmta &= 0x00FFFFFF;
+        cksum_idx = wmta + m*4 + 3;
+        if (cksum_idx > size)
+                return -EINVAL;
+        cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
+        if (cksum != mem[cksum_idx]) {
+                printk(KERN_ERR "Error: bad mode table address cksum"
+                                " %x != %x\n", cksum, mem[cksum_idx]);
+                return -EINVAL;
+        }
+
+        /* check waveform temperature table address checksum */
+        tta = le32_to_cpu(get_unaligned((int *) (mem + wmta + m*4)));
+        tta &= 0x00FFFFFF;
+        cksum_idx = tta + trn*4 + 3;
+        if (cksum_idx > size)
+                return -EINVAL;
+        cksum = calc_cksum(cksum_idx - 3, cksum_idx, mem);
+        if (cksum != mem[cksum_idx]) {
+                printk(KERN_ERR "Error: bad temperature table address cksum"
+                        " %x != %x\n", cksum, mem[cksum_idx]);
+                return -EINVAL;
+        }
+
+        /* here we do the real work of putting the waveform into the
+        metromem buffer. this does runlength decoding of the waveform */
+        wfm_idx = le32_to_cpu(get_unaligned((__le32 *) (mem + tta + trn*4)));
+        wfm_idx &= 0x00FFFFFF;
+        owfm_idx = wfm_idx;
+        if (wfm_idx > size)
+                return -EINVAL;
+        while (wfm_idx < size) {
+                unsigned char rl;
+                v = mem[wfm_idx++];
+                if (v == wfm_hdr->swtb) {
+                        while (((v = mem[wfm_idx++]) != wfm_hdr->swtb) &&
+                                wfm_idx < size)
+                                metromem[mem_idx++] = v;
+
+                        continue;
+                }
+
+                if (v == wfm_hdr->endb)
+                        break;
+
+                rl = mem[wfm_idx++];
+                for (i = 0; i <= rl; i++)
+                        metromem[mem_idx++] = v;
+        }
+
+        cksum_idx = wfm_idx;
+        if (cksum_idx > size)
+                return -EINVAL;
+        cksum = calc_cksum(owfm_idx, cksum_idx, mem);
+        if (cksum != mem[cksum_idx]) {
+                printk(KERN_ERR "Error: bad waveform data cksum"
+                                " %x != %x\n", cksum, mem[cksum_idx]);
+                return -EINVAL;
+        }
+        *frame_count = (mem_idx/64);
+
+        return 0;
+}
+
+/* register offsets for gpio control */
+#define LED_GPIO_PIN 51
+#define STDBY_GPIO_PIN 48
+#define RST_GPIO_PIN 49
+#define RDY_GPIO_PIN 32
+#define ERR_GPIO_PIN 17
+#define PCBPWR_GPIO_PIN 16
+
+#define AF_SEL_GPIO_N 0x3
+#define GAFR0_U_OFFSET(pin) ((pin - 16) * 2)
+#define GAFR1_L_OFFSET(pin) ((pin - 32) * 2)
+#define GAFR1_U_OFFSET(pin) ((pin - 48) * 2)
+#define GPDR1_OFFSET(pin) (pin - 32)
+#define GPCR1_OFFSET(pin) (pin - 32)
+#define GPSR1_OFFSET(pin) (pin - 32)
+#define GPCR0_OFFSET(pin) (pin)
+#define GPSR0_OFFSET(pin) (pin)
+
+static void metronome_set_gpio_output(int pin, int val)
+{
+        u8 index;
+
+        index = pin >> 4;
+
+        switch (index) {
+        case 1:
+                if (val)
+                        GPSR0 |= (1 << GPSR0_OFFSET(pin));
+                else
+                        GPCR0 |= (1 << GPCR0_OFFSET(pin));
+                break;
+        case 2:
+                break;
+        case 3:
+                if (val)
+                        GPSR1 |= (1 << GPSR1_OFFSET(pin));
+                else
+                        GPCR1 |= (1 << GPCR1_OFFSET(pin));
+                break;
+        default:
+                printk(KERN_ERR "unimplemented\n");
+        }
+}
+
+static void __devinit metronome_init_gpio_pin(int pin, int dir)
+{
+        u8 index;
+        /* dir 0 is output, 1 is input
+        - do 2 things here:
+        - set gpio alternate function to standard gpio
+        - set gpio direction to input or output  */
+
+        index = pin >> 4;
+        switch (index) {
+        case 1:
+                GAFR0_U &= ~(AF_SEL_GPIO_N << GAFR0_U_OFFSET(pin));
+
+                if (dir)
+                        GPDR0 &= ~(1 << pin);
+                else
+                        GPDR0 |= (1 << pin);
+                break;
+        case 2:
+                GAFR1_L &= ~(AF_SEL_GPIO_N << GAFR1_L_OFFSET(pin));
+
+                if (dir)
+                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
+                else
+                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
+                break;
+        case 3:
+                GAFR1_U &= ~(AF_SEL_GPIO_N << GAFR1_U_OFFSET(pin));
+
+                if (dir)
+                        GPDR1 &= ~(1 << GPDR1_OFFSET(pin));
+                else
+                        GPDR1 |= (1 << GPDR1_OFFSET(pin));
+                break;
+        default:
+                printk(KERN_ERR "unimplemented\n");
+        }
+}
+
+static void __devinit metronome_init_gpio_regs(void)
+{
+        metronome_init_gpio_pin(LED_GPIO_PIN, 0);
+        metronome_set_gpio_output(LED_GPIO_PIN, 0);
+
+        metronome_init_gpio_pin(STDBY_GPIO_PIN, 0);
+        metronome_set_gpio_output(STDBY_GPIO_PIN, 0);
+
+        metronome_init_gpio_pin(RST_GPIO_PIN, 0);
+        metronome_set_gpio_output(RST_GPIO_PIN, 0);
+
+        metronome_init_gpio_pin(RDY_GPIO_PIN, 1);
+
+        metronome_init_gpio_pin(ERR_GPIO_PIN, 1);
+
+        metronome_init_gpio_pin(PCBPWR_GPIO_PIN, 0);
+        metronome_set_gpio_output(PCBPWR_GPIO_PIN, 0);
+}
+
+static void metronome_disable_lcd_controller(struct metronomefb_par *par)
+{
+        LCSR = 0xffffffff;      /* Clear LCD Status Register */
+        LCCR0 |= LCCR0_DIS;     /* Disable LCD Controller */
+
+        /* we reset and just wait for things to settle */
+        msleep(200);
+}
+
+static void metronome_enable_lcd_controller(struct metronomefb_par *par)
+{
+        LCSR = 0xffffffff;
+        FDADR0 = par->metromem_desc_dma;
+        LCCR0 |= LCCR0_ENB;
+}
+
+static void __devinit metronome_init_lcdc_regs(struct metronomefb_par *par)
+{
+        /* here we do:
+        - disable the lcd controller
+        - setup lcd control registers
+        - setup dma descriptor
+        - reenable lcd controller
+        */
+
+        /* disable the lcd controller */
+        metronome_disable_lcd_controller(par);
+
+        /* setup lcd control registers */
+        LCCR0 = LCCR0_LDM | LCCR0_SFM | LCCR0_IUM | LCCR0_EFM | LCCR0_PAS
+                | LCCR0_QDM | LCCR0_BM | LCCR0_OUM;
+
+        LCCR1 = (epd_frame_table[0].fw/2 - 1) /* pixels per line */
+                | (27 << 10) /* hsync pulse width - 1 */
+                | (33 << 16) /* eol pixel count */
+                | (33 << 24); /* bol pixel count */
+
+        LCCR2 = (epd_frame_table[0].fh - 1) /* lines per panel */
+                | (24 << 10) /* vsync pulse width - 1 */
+                | (2 << 16) /* eof pixel count */
+                | (0 << 24); /* bof pixel count */
+
+        LCCR3 = 2 /* pixel clock divisor */
+                | (24 << 8) /* AC Bias pin freq */
+                | LCCR3_16BPP /* BPP */
+                | LCCR3_PCP;  /* PCP falling edge */
+
+        /* setup dma descriptor */
+        par->metromem_desc->mFDADR0 = par->metromem_desc_dma;
+        par->metromem_desc->mFSADR0 = par->metromem_dma;
+        par->metromem_desc->mFIDR0 = 0;
+        par->metromem_desc->mLDCMD0 = epd_frame_table[0].fw
+                                        * epd_frame_table[0].fh;
+        /* reenable lcd controller */
+        metronome_enable_lcd_controller(par);
+}
+
+static int metronome_display_cmd(struct metronomefb_par *par)
+{
+        int i;
+        u16 cs;
+        u16 opcode;
+        static u8 borderval;
+        u8 *ptr;
+
+        /* setup display command
+        we can't immediately set the opcode since the controller
+        will try parse the command before we've set it all up
+        so we just set cs here and set the opcode at the end */
+
+        ptr = par->metromem;
+
+        if (par->metromem_cmd->opcode == 0xCC40)
+                opcode = cs = 0xCC41;
+        else
+                opcode = cs = 0xCC40;
+
+        /* set the args ( 2 bytes ) for display */
+        i = 0;
+        par->metromem_cmd->args[i] =    1 << 3 /* border update */
+                                        | ((borderval++ % 4) & 0x0F) << 4
+                                        | (par->frame_count - 1) << 8;
+        cs += par->metromem_cmd->args[i++];
+
+        /* the rest are 0 */
+        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+
+        par->metromem_cmd->csum = cs;
+        par->metromem_cmd->opcode = opcode; /* display cmd */
+
+        i = wait_event_interruptible_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+        return i;
+}
+
+static int __devinit metronome_powerup_cmd(struct metronomefb_par *par)
+{
+        int i;
+        u16 cs;
+
+        /* setup power up command */
+        par->metromem_cmd->opcode = 0x1234; /* pwr up pseudo cmd */
+        cs = par->metromem_cmd->opcode;
+
+        /* set pwr1,2,3 to 1024 */
+        for (i = 0; i < 3; i++) {
+                par->metromem_cmd->args[i] = 1024;
+                cs += par->metromem_cmd->args[i];
+        }
+
+        /* the rest are 0 */
+        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+
+        par->metromem_cmd->csum = cs;
+
+        msleep(1);
+        metronome_set_gpio_output(RST_GPIO_PIN, 1);
+
+        msleep(1);
+        metronome_set_gpio_output(STDBY_GPIO_PIN, 1);
+
+        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+        return i;
+}
+
+static int __devinit metronome_config_cmd(struct metronomefb_par *par)
+{
+        int i;
+        u16 cs;
+
+        /* setup config command
+        we can't immediately set the opcode since the controller
+        will try parse the command before we've set it all up
+        so we just set cs here and set the opcode at the end */
+
+        cs = 0xCC10;
+
+        /* set the 12 args ( 8 bytes ) for config. see spec for meanings */
+        i = 0;
+        par->metromem_cmd->args[i] =    15 /* sdlew */
+                                        | 2 << 8 /* sdosz */
+                                        | 0 << 11 /* sdor */
+                                        | 0 << 12 /* sdces */
+                                        | 0 << 15; /* sdcer */
+        cs += par->metromem_cmd->args[i++];
+
+        par->metromem_cmd->args[i] =    42 /* gdspl */
+                                        | 1 << 8 /* gdr1 */
+                                        | 1 << 9 /* sdshr */
+                                        | 0 << 15; /* gdspp */
+        cs += par->metromem_cmd->args[i++];
+
+        par->metromem_cmd->args[i] =    18 /* gdspw */
+                                        | 0 << 15; /* dispc */
+        cs += par->metromem_cmd->args[i++];
+
+        par->metromem_cmd->args[i] =    599 /* vdlc */
+                                        | 0 << 11 /* dsi */
+                                        | 0 << 12; /* dsic */
+        cs += par->metromem_cmd->args[i++];
+
+        /* the rest are 0 */
+        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+
+        par->metromem_cmd->csum = cs;
+        par->metromem_cmd->opcode = 0xCC10; /* config cmd */
+
+        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+        return i;
+}
+
+static int __devinit metronome_init_cmd(struct metronomefb_par *par)
+{
+        int i;
+        u16 cs;
+
+        /* setup init command
+        we can't immediately set the opcode since the controller
+        will try parse the command before we've set it all up
+        so we just set cs here and set the opcode at the end */
+
+        cs = 0xCC20;
+
+        /* set the args ( 2 bytes ) for init */
+        i = 0;
+        par->metromem_cmd->args[i] = 0;
+        cs += par->metromem_cmd->args[i++];
+
+        /* the rest are 0 */
+        memset((u8 *) (par->metromem_cmd->args + i), 0, (32-i)*2);
+
+        par->metromem_cmd->csum = cs;
+        par->metromem_cmd->opcode = 0xCC20; /* init cmd */
+
+        i = wait_event_timeout(par->waitq, (GPLR1 & 0x01), HZ);
+        return i;
+}
+
+static int __devinit metronome_init_regs(struct metronomefb_par *par)
+{
+        int res;
+
+        metronome_init_gpio_regs();
+        metronome_init_lcdc_regs(par);
+
+        res = metronome_powerup_cmd(par);
+        if (res)
+                return res;
+
+        res = metronome_config_cmd(par);
+        if (res)
+                return res;
+
+        res = metronome_init_cmd(par);
+        if (res)
+                return res;
+
+        return res;
+}
+
+static void metronomefb_dpy_update(struct metronomefb_par *par)
+{
+        u16 cksum;
+        unsigned char *buf = (unsigned char __force *)par->info->screen_base;
+
+        /* copy from vm to metromem */
+        memcpy(par->metromem_img, buf, DPY_W*DPY_H);
+
+        cksum = calc_img_cksum((u16 *) par->metromem_img,
+                                (epd_frame_table[0].fw * DPY_H)/2);
+        *((u16 *) (par->metromem_img) +
+                        (epd_frame_table[0].fw * DPY_H)/2) = cksum;
+        metronome_display_cmd(par);
+}
+
+static u16 metronomefb_dpy_update_page(struct metronomefb_par *par, int index)
+{
+        int i;
+        u16 csum = 0;
+        u16 *buf = (u16 __force *) (par->info->screen_base + index);
+        u16 *img = (u16 *) (par->metromem_img + index);
+
+        /* swizzle from vm to metromem and recalc cksum at the same time*/
+        for (i = 0; i < PAGE_SIZE/2; i++) {
+                *(img + i) = (buf[i] << 5) & 0xE0E0;
+                csum += *(img + i);
+        }
+        return csum;
+}
+
+/* this is called back from the deferred io workqueue */
+static void metronomefb_dpy_deferred_io(struct fb_info *info,
+                                struct list_head *pagelist)
+{
+        u16 cksum;
+        struct page *cur;
+        struct fb_deferred_io *fbdefio = info->fbdefio;
+        struct metronomefb_par *par = info->par;
+
+        /* walk the written page list and swizzle the data */
+        list_for_each_entry(cur, &fbdefio->pagelist, lru) {
+                cksum = metronomefb_dpy_update_page(par,
+                                        (cur->index << PAGE_SHIFT));
+                par->metromem_img_csum -= par->csum_table[cur->index];
+                par->csum_table[cur->index] = cksum;
+                par->metromem_img_csum += cksum;
+        }
+
+        metronome_display_cmd(par);
+}
+
+static void metronomefb_fillrect(struct fb_info *info,
+                                   const struct fb_fillrect *rect)
+{
+        struct metronomefb_par *par = info->par;
+
+        cfb_fillrect(info, rect);
+        metronomefb_dpy_update(par);
+}
+
+static void metronomefb_copyarea(struct fb_info *info,
+                                   const struct fb_copyarea *area)
+{
+        struct metronomefb_par *par = info->par;
+
+        cfb_copyarea(info, area);
+        metronomefb_dpy_update(par);
+}
+
+static void metronomefb_imageblit(struct fb_info *info,
+                                const struct fb_image *image)
+{
+        struct metronomefb_par *par = info->par;
+
+        cfb_imageblit(info, image);
+        metronomefb_dpy_update(par);
+}
+
+/*
+ * this is the slow path from userspace. they can seek and write to
+ * the fb. it is based on fb_sys_write
+ */
+static ssize_t metronomefb_write(struct fb_info *info, const char __user *buf,
+                                size_t count, loff_t *ppos)
+{
+        struct metronomefb_par *par = info->par;
+        unsigned long p = *ppos;
+        void *dst;
+        int err = 0;
+        unsigned long total_size;
+
+        if (info->state != FBINFO_STATE_RUNNING)
+                return -EPERM;
+
+        total_size = info->fix.smem_len;
+
+        if (p > total_size)
+                return -EFBIG;
+
+        if (count > total_size) {
+                err = -EFBIG;
+                count = total_size;
+        }
+
+        if (count + p > total_size) {
+                if (!err)
+                        err = -ENOSPC;
+
+                count = total_size - p;
+        }
+
+        dst = (void __force *) (info->screen_base + p);
+
+        if (copy_from_user(dst, buf, count))
+                err = -EFAULT;
+
+        if  (!err)
+                *ppos += count;
+
+        metronomefb_dpy_update(par);
+
+        return (err) ? err : count;
+}
+
+static struct fb_ops metronomefb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_write       = metronomefb_write,
+        .fb_fillrect    = metronomefb_fillrect,
+        .fb_copyarea    = metronomefb_copyarea,
+        .fb_imageblit   = metronomefb_imageblit,
+};
+
+static struct fb_deferred_io metronomefb_defio = {
+        .delay          = HZ,
+        .deferred_io    = metronomefb_dpy_deferred_io,
+};
+
+static irqreturn_t metronome_handle_irq(int irq, void *dev_id)
+{
+        struct fb_info *info = dev_id;
+        struct metronomefb_par *par = info->par;
+
+        wake_up_interruptible(&par->waitq);
+        return IRQ_HANDLED;
+}
+
+static int __devinit metronomefb_probe(struct platform_device *dev)
+{
+        struct fb_info *info;
+        int retval = -ENOMEM;
+        int videomemorysize;
+        unsigned char *videomemory;
+        struct metronomefb_par *par;
+        const struct firmware *fw_entry;
+        int cmd_size, wfm_size, img_size, padding_size, totalsize;
+        int i;
+
+        /* we have two blocks of memory.
+        info->screen_base which is vm, and is the fb used by apps.
+        par->metromem which is physically contiguous memory and
+        contains the display controller commands, waveform,
+        processed image data and padding. this is the data pulled
+        by the pxa255's LCD controller and pushed to Metronome */
+
+        videomemorysize = (DPY_W*DPY_H);
+        videomemory = vmalloc(videomemorysize);
+        if (!videomemory)
+                return retval;
+
+        memset(videomemory, 0, videomemorysize);
+
+        info = framebuffer_alloc(sizeof(struct metronomefb_par), &dev->dev);
+        if (!info)
+                goto err_vfree;
+
+        info->screen_base = (char __iomem *) videomemory;
+        info->fbops = &metronomefb_ops;
+
+        info->var = metronomefb_var;
+        info->fix = metronomefb_fix;
+        info->fix.smem_len = videomemorysize;
+        par = info->par;
+        par->info = info;
+        init_waitqueue_head(&par->waitq);
+
+        /* this table caches per page csum values. */
+        par->csum_table = vmalloc(videomemorysize/PAGE_SIZE);
+        if (!par->csum_table)
+                goto err_csum_table;
+
+        /* the metromem buffer is divided as follows:
+        command | CRC | padding
+        16kb waveform data | CRC | padding
+        image data | CRC
+        and an extra 256 bytes for dma descriptors
+        eg: IW=832 IH=622 WS=128
+        */
+
+        cmd_size = 1 * epd_frame_table[0].fw;
+        wfm_size = ((16*1024 + 2 + epd_frame_table[0].fw - 1)
+                        / epd_frame_table[0].fw) * epd_frame_table[0].fw;
+        img_size = epd_frame_table[0].fh * epd_frame_table[0].fw;
+        padding_size = 4 * epd_frame_table[0].fw;
+        totalsize = cmd_size + wfm_size + img_size + padding_size;
+        par->metromemsize = PAGE_ALIGN(totalsize + 256);
+        DPRINTK("desired memory size = %d\n", par->metromemsize);
+        dev->dev.coherent_dma_mask = 0xffffffffull;
+        par->metromem = dma_alloc_writecombine(&dev->dev, par->metromemsize,
+                                                &par->metromem_dma, GFP_KERNEL);
+        if (!par->metromem) {
+                printk(KERN_ERR
+                        "metronomefb: unable to allocate dma buffer\n");
+                goto err_vfree;
+        }
+
+        info->fix.smem_start = par->metromem_dma;
+        par->metromem_cmd = (struct metromem_cmd *) par->metromem;
+        par->metromem_wfm = par->metromem + cmd_size;
+        par->metromem_img = par->metromem + cmd_size + wfm_size;
+        par->metromem_img_csum = (u16 *) (par->metromem_img +
+                                        (epd_frame_table[0].fw * DPY_H));
+        DPRINTK("img offset=0x%x\n", cmd_size + wfm_size);
+        par->metromem_desc = (struct metromem_desc *) (par->metromem + cmd_size
+                                        + wfm_size + img_size + padding_size);
+        par->metromem_desc_dma = par->metromem_dma + cmd_size + wfm_size
+                                 + img_size + padding_size;
+
+        /* load the waveform in. assume mode 3, temp 31 for now */
+        /*      a) request the waveform file from userspace
+                b) process waveform and decode into metromem */
+
+        retval = request_firmware(&fw_entry, "waveform.wbf", &dev->dev);
+        if (retval < 0) {
+                printk(KERN_ERR "metronomefb: couldn't get waveform\n");
+                goto err_dma_free;
+        }
+
+        retval = load_waveform((u8 *) fw_entry->data, fw_entry->size,
+                                par->metromem_wfm, 3, 31, &par->frame_count);
+        if (retval < 0) {
+                printk(KERN_ERR "metronomefb: couldn't process waveform\n");
+                goto err_ld_wfm;
+        }
+        release_firmware(fw_entry);
+
+        retval = request_irq(IRQ_GPIO(RDY_GPIO_PIN), metronome_handle_irq,
+                                IRQF_DISABLED, "Metronome", info);
+        if (retval) {
+                dev_err(&dev->dev, "request_irq failed: %d\n", retval);
+                goto err_ld_wfm;
+        }
+        set_irq_type(IRQ_GPIO(RDY_GPIO_PIN), IRQT_FALLING);
+
+        retval = metronome_init_regs(par);
+        if (retval < 0)
+                goto err_free_irq;
+
+        info->flags = FBINFO_FLAG_DEFAULT;
+
+        info->fbdefio = &metronomefb_defio;
+        fb_deferred_io_init(info);
+
+        retval = fb_alloc_cmap(&info->cmap, 8, 0);
+        if (retval < 0) {
+                printk(KERN_ERR "Failed to allocate colormap\n");
+                goto err_fb_rel;
+        }
+
+        /* set cmap */
+        for (i = 0; i < 8; i++)
+                info->cmap.red[i] = (((2*i)+1)*(0xFFFF))/16;
+        memcpy(info->cmap.green, info->cmap.red, sizeof(u16)*8);
+        memcpy(info->cmap.blue, info->cmap.red, sizeof(u16)*8);
+
+        retval = register_framebuffer(info);
+        if (retval < 0)
+                goto err_cmap;
+
+        platform_set_drvdata(dev, info);
+
+        printk(KERN_INFO
+                "fb%d: Metronome frame buffer device, using %dK of video"
+                " memory\n", info->node, videomemorysize >> 10);
+
+        return 0;
+
+err_cmap:
+        fb_dealloc_cmap(&info->cmap);
+err_fb_rel:
+        framebuffer_release(info);
+err_free_irq:
+        free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
+err_ld_wfm:
+        release_firmware(fw_entry);
+err_dma_free:
+        dma_free_writecombine(&dev->dev, par->metromemsize, par->metromem,
+                                par->metromem_dma);
+err_csum_table:
+        vfree(par->csum_table);
+err_vfree:
+        vfree(videomemory);
+        return retval;
+}
+
+static int __devexit metronomefb_remove(struct platform_device *dev)
+{
+        struct fb_info *info = platform_get_drvdata(dev);
+
+        if (info) {
+                struct metronomefb_par *par = info->par;
+                fb_deferred_io_cleanup(info);
+                dma_free_writecombine(&dev->dev, par->metromemsize,
+                                        par->metromem, par->metromem_dma);
+                fb_dealloc_cmap(&info->cmap);
+                vfree(par->csum_table);
+                unregister_framebuffer(info);
+                vfree((void __force *)info->screen_base);
+                free_irq(IRQ_GPIO(RDY_GPIO_PIN), info);
+                framebuffer_release(info);
+        }
+        return 0;
+}
+
+static struct platform_driver metronomefb_driver = {
+        .probe  = metronomefb_probe,
+        .remove = metronomefb_remove,
+        .driver = {
+                .name   = "metronomefb",
+        },
+};
+
+static struct platform_device *metronomefb_device;
+
+static int __init metronomefb_init(void)
+{
+        int ret;
+
+        if (!metronomefb_enable) {
+                printk(KERN_ERR
+                        "Use metronomefb_enable to enable the device\n");
+                return -ENXIO;
+        }
+
+        ret = platform_driver_register(&metronomefb_driver);
+        if (!ret) {
+                metronomefb_device = platform_device_alloc("metronomefb", 0);
+                if (metronomefb_device)
+                        ret = platform_device_add(metronomefb_device);
+                else
+                        ret = -ENOMEM;
+
+                if (ret) {
+                        platform_device_put(metronomefb_device);
+                        platform_driver_unregister(&metronomefb_driver);
+                }
+        }
+        return ret;
+
+}
+
+static void __exit metronomefb_exit(void)
+{
+        platform_device_unregister(metronomefb_device);
+        platform_driver_unregister(&metronomefb_driver);
+}
+
+module_param(metronomefb_enable, uint, 0);
+MODULE_PARM_DESC(metronomefb_enable, "Enable communication with Metronome");
+
+module_init(metronomefb_init);
+module_exit(metronomefb_exit);
+
+MODULE_DESCRIPTION("fbdev driver for Metronome controller");
+MODULE_AUTHOR("Jaya Kumar");
+MODULE_LICENSE("GPL");
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 59a8f73dec73..c0df924766a7 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -37,7 +37,7 @@ struct virtio_pci_device
         struct pci_dev *pci_dev;
 
         /* the IO mapping for the PCI config space */
-        void *ioaddr;
+        void __iomem *ioaddr;
 
         /* a list of queues so we can dispatch IRQs */
         spinlock_t lock;
@@ -111,7 +111,7 @@ static void vp_get(struct virtio_device *vdev, unsigned offset,
                    void *buf, unsigned len)
 {
         struct virtio_pci_device *vp_dev = to_vp_device(vdev);
-        void *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset;
+        void __iomem *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset;
         u8 *ptr = buf;
         int i;
 
@@ -125,7 +125,7 @@ static void vp_set(struct virtio_device *vdev, unsigned offset,
                    const void *buf, unsigned len)
 {
         struct virtio_pci_device *vp_dev = to_vp_device(vdev);
-        void *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset;
+        void __iomem *ioaddr = vp_dev->ioaddr + VIRTIO_PCI_CONFIG + offset;
         const u8 *ptr = buf;
         int i;
 
@@ -388,6 +388,7 @@ static void __devexit virtio_pci_remove(struct pci_dev *pci_dev)
 {
         struct virtio_pci_device *vp_dev = pci_get_drvdata(pci_dev);
 
+        unregister_virtio_device(&vp_dev->vdev);
         free_irq(pci_dev->irq, vp_dev);
         pci_set_drvdata(pci_dev, NULL);
         pci_iounmap(pci_dev, vp_dev->ioaddr);
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
index 1efcad3b6fca..ca90c5192596 100644
--- a/drivers/watchdog/it8712f_wdt.c
+++ b/drivers/watchdog/it8712f_wdt.c
@@ -111,15 +111,6 @@ superio_inw(int reg)
         return val;
 }
 
-static void
-superio_outw(int val, int reg)
-{
-        outb(reg++, REG);
-        outb((val >> 8) & 0xff, VAL);
-        outb(reg, REG);
-        outb(val & 0xff, VAL);
-}
-
 static inline void
 superio_select(int ldn)
 {
@@ -170,9 +161,8 @@ it8712f_wdt_update_margin(void)
         superio_outb(config, WDT_CONFIG);
 
         if (revision >= 0x08)
-                superio_outw(units, WDT_TIMEOUT);
-        else
-                superio_outb(units, WDT_TIMEOUT);
+                superio_outb(units >> 8, WDT_TIMEOUT + 1);
+        superio_outb(units, WDT_TIMEOUT);
 }
 
 static int