302 files changed, 2456 insertions, 1721 deletions
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_.LNKA",
-                "\\_SB_.PCI0.ISA.LNKB"},
+                "\\_SB_.PCI0.ISA_.LNKB"},
        { dell_optiplex, 0, 0, 0xd, 'A',
                "\\_SB_.LNKB",
                "\\_SB_.LNKA"},
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index 36a68fa114e3..a825b431b64f 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -822,7 +822,7 @@ static int acpi_processor_remove(struct acpi_device *device, int type)
        }
        processors[pr->id] = NULL;
+        processor_device_array[pr->id] = NULL;
        kfree(pr);
        return 0;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index e8e2d8869236..788da9781f80 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -1487,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 !
@@ -1577,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();
        /*
@@ -1692,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:",
+        len = snprintf(modalias, size, "acpi:");
-                       acpi_dev->pnp.hardware_id);
-        if (len < 0 || len >= size)
-                return -EINVAL;
        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) {
+        if (error) {
-                        acpi_target_sleep_state = ACPI_STATE_S0;
+                acpi_target_sleep_state = ACPI_STATE_S0;
-                        return error;
+                return error;
-                }
-                acpi_sleep_finish_wake_up = true;
        }
        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
+         * This is necessary in case acpi_pm_finish() is not called during a
-         * during a failing transition to a sleep state.
+         * failing transition to a sleep state.
         */
-        if (acpi_sleep_finish_wake_up)
+        acpi_target_sleep_state = ACPI_STATE_S0;
-                acpi_pm_finish();
 }
 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);
+        return 0;
-        if (error)
-                acpi_target_sleep_state = ACPI_STATE_S0;
-        else
-                acpi_sleep_finish_wake_up = true;
-        return error;
 }
 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) {
+        if (error) {
-                        acpi_target_sleep_state = ACPI_STATE_S0;
+                acpi_target_sleep_state = ACPI_STATE_S0;
-                        return error;
+                return error;
-                }
-                acpi_sleep_finish_wake_up = true;
        }
        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_target_sleep_state = ACPI_STATE_S0;
-                acpi_hibernation_finish();
 }
 static int acpi_hibernation_pre_restore(void)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index c4e00ac8ea85..1bcecc7dd2ca 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
                        tz->trips.active[i].flags.valid; i++, trips++);
        tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
                                        trips, tz, &acpi_thermal_zone_ops);
-        if (!tz->thermal_zone)
+        if (IS_ERR(tz->thermal_zone))
                return -ENODEV;
        result = sysfs_create_link(&tz->device->dev.kobj,
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 12fb44f16766..980a74188781 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -713,7 +713,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
        kfree(obj);
-        if (device->cap._BCL && device->cap._BCM && max_level > 0) {
+        if (device->cap._BCL && device->cap._BCM && device->cap._BQC && max_level > 0){
                int result;
                static int count = 0;
                char *name;
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index c4248b37ff64..be95fdb69726 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -326,6 +326,44 @@ static void ata_force_horkage(struct ata_device *dev)
 }
 /**
+ *      atapi_cmd_type - Determine ATAPI command type from SCSI opcode
+ *      @opcode: SCSI opcode
+ *
+ *      Determine ATAPI command type from @opcode.
+ *
+ *      LOCKING:
+ *      None.
+ *
+ *      RETURNS:
+ *      ATAPI_{READ|WRITE|READ_CD|PASS_THRU|MISC}
+ */
+int atapi_cmd_type(u8 opcode)
+{
+        switch (opcode) {
+        case GPCMD_READ_10:
+        case GPCMD_READ_12:
+                return ATAPI_READ;
+        case GPCMD_WRITE_10:
+        case GPCMD_WRITE_12:
+        case GPCMD_WRITE_AND_VERIFY_10:
+                return ATAPI_WRITE;
+        case GPCMD_READ_CD:
+        case GPCMD_READ_CD_MSF:
+                return ATAPI_READ_CD;
+        case ATA_16:
+        case ATA_12:
+                if (atapi_passthru16)
+                        return ATAPI_PASS_THRU;
+                /* fall thru */
+        default:
+                return ATAPI_MISC;
+        }
+}
+/**
 *      ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure
 *      @tf: Taskfile to convert
 *      @pmp: Port multiplier port
@@ -972,7 +1010,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);
 }
@@ -2660,7 +2698,7 @@ int ata_bus_probe(struct ata_port *ap)
           specific sequence bass-ackwards so that PDIAG- is released by
           the slave device */
-        ata_link_for_each_dev(dev, &ap->link) {
+        ata_link_for_each_dev_reverse(dev, &ap->link) {
                if (tries[dev->devno])
                        dev->class = classes[dev->devno];
@@ -7774,6 +7812,7 @@ EXPORT_SYMBOL_GPL(ata_tf_read);
 EXPORT_SYMBOL_GPL(ata_noop_dev_select);
 EXPORT_SYMBOL_GPL(ata_std_dev_select);
 EXPORT_SYMBOL_GPL(sata_print_link_status);
+EXPORT_SYMBOL_GPL(atapi_cmd_type);
 EXPORT_SYMBOL_GPL(ata_tf_to_fis);
 EXPORT_SYMBOL_GPL(ata_tf_from_fis);
 EXPORT_SYMBOL_GPL(ata_pack_xfermask);
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/pata_ali.c b/drivers/ata/pata_ali.c
index 8786455c901d..ce830fe3a362 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -36,6 +36,10 @@
 #define DRV_NAME "pata_ali"
 #define DRV_VERSION "0.7.5"
+int ali_atapi_dma = 0;
+module_param_named(atapi_dma, ali_atapi_dma, int, 0644);
+MODULE_PARM_DESC(atapi_dma, "Enable ATAPI DMA (0=disable, 1=enable)");
 /*
 *      Cable special cases
 */
@@ -270,6 +274,27 @@ static void ali_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 }
 /**
+ *      ali_warn_atapi_dma      -       Warn about ATAPI DMA disablement
+ *      @adev: Device
+ *
+ *      Whine about ATAPI DMA disablement if @adev is an ATAPI device.
+ *      Can be used as ->dev_config.
+ */
+static void ali_warn_atapi_dma(struct ata_device *adev)
+{
+        struct ata_eh_context *ehc = &adev->link->eh_context;
+        int print_info = ehc->i.flags & ATA_EHI_PRINTINFO;
+        if (print_info && adev->class == ATA_DEV_ATAPI && !ali_atapi_dma) {
+                ata_dev_printk(adev, KERN_WARNING,
+                               "WARNING: ATAPI DMA disabled for reliablity issues.  It can be enabled\n");
+                ata_dev_printk(adev, KERN_WARNING,
+                               "WARNING: via pata_ali.atapi_dma modparam or corresponding sysfs node.\n");
+        }
+}
+/**
 *      ali_lock_sectors        -       Keep older devices to 255 sector mode
 *      @adev: Device
 *
@@ -283,6 +308,7 @@ static void ali_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 static void ali_lock_sectors(struct ata_device *adev)
 {
        adev->max_sectors = 255;
+        ali_warn_atapi_dma(adev);
 }
 /**
@@ -294,6 +320,18 @@ static void ali_lock_sectors(struct ata_device *adev)
 static int ali_check_atapi_dma(struct ata_queued_cmd *qc)
 {
+        if (!ali_atapi_dma) {
+                /* FIXME: pata_ali can't do ATAPI DMA reliably but the
+                 * IDE alim15x3 driver can.  I tried lots of things
+                 * but couldn't find what the actual difference was.
+                 * If you got an idea, please write it to
+                 * linux-ide@vger.kernel.org and cc htejun@gmail.com.
+                 *
+                 * Disable ATAPI DMA for now.
+                 */
+                return -EOPNOTSUPP;
+        }
        /* If its not a media command, its not worth it */
        if (atapi_cmd_type(qc->cdb[0]) == ATAPI_MISC)
                return -EOPNOTSUPP;
@@ -359,6 +397,7 @@ static struct ata_port_operations ali_20_port_ops = {
        .tf_load        = ata_tf_load,
        .tf_read        = ata_tf_read,
+        .check_atapi_dma = ali_check_atapi_dma,
        .check_status   = ata_check_status,
        .exec_command   = ata_exec_command,
        .dev_select     = ata_std_dev_select,
@@ -438,6 +477,7 @@ static struct ata_port_operations ali_c5_port_ops = {
        .check_status   = ata_check_status,
        .exec_command   = ata_exec_command,
        .dev_select     = ata_std_dev_select,
+        .dev_config     = ali_warn_atapi_dma,
        .freeze         = ata_bmdma_freeze,
        .thaw           = ata_bmdma_thaw,
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 503245a1eafa..7c5b2dd9a1a1 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_MERGE
+        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_fsl.c b/drivers/ata/sata_fsl.c
index 07791a7a48a5..9d1e3cad4aa9 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1256,7 +1256,6 @@ static int sata_fsl_probe(struct of_device *ofdev,
        void __iomem *ssr_base = NULL;
        void __iomem *csr_base = NULL;
        struct sata_fsl_host_priv *host_priv = NULL;
-        struct resource *r;
        int irq;
        struct ata_host *host;
@@ -1266,8 +1265,6 @@ static int sata_fsl_probe(struct of_device *ofdev,
        dev_printk(KERN_INFO, &ofdev->dev,
                   "Sata FSL Platform/CSB Driver init\n");
-        r = kmalloc(sizeof(struct resource), GFP_KERNEL);
        hcr_base = of_iomap(ofdev->node, 0);
        if (!hcr_base)
                goto error_exit_with_cleanup;
@@ -1348,10 +1345,7 @@ static int sata_fsl_remove(struct of_device *ofdev)
 static struct of_device_id fsl_sata_match[] = {
        {
-                .compatible = "fsl,mpc8315-sata",
+                .compatible = "fsl,pq-sata",
-        },
-        {
-                .compatible = "fsl,mpc8379-sata",
        },
        {},
 };
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 47c57a4294b7..98099f526d82 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -978,6 +978,7 @@ static int fs_open(struct atm_vcc *atm_vcc)
                /* Docs are vague about this atm_hdr field. By the way, the FS
                 * chip makes odd errors if lower bits are set.... -- REW */
                tc->atm_hdr =  (vpi << 20) | (vci << 4); 
+                tmc0 = 0;
                {
                        int pcr = atm_pcr_goal (txtp);
diff --git a/drivers/atm/he.c b/drivers/atm/he.c
index 2e3395b7e8c1..ffc4a5a41946 100644
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
@@ -3000,8 +3000,7 @@ he_proc_read(struct atm_dev *dev, loff_t *pos, char *page)
 /* eeprom routines  -- see 4.7 */
-u8
+static u8 read_prom_byte(struct he_dev *he_dev, int addr)
-read_prom_byte(struct he_dev *he_dev, int addr)
 {
        u32 val = 0, tmp_read = 0;
        int i, j = 0;
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index b967919fb7e2..28d77b5195de 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -2016,8 +2016,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
        return 0;
 }
-int
+static int idt77252_send(struct atm_vcc *vcc, struct sk_buff *skb)
-idt77252_send(struct atm_vcc *vcc, struct sk_buff *skb)
 {
        return idt77252_send_skb(vcc, skb, 0);
 }
@@ -3072,8 +3071,7 @@ idt77252_dev_open(struct idt77252_dev *card)
        return 0;
 }
-void
+static void idt77252_dev_close(struct atm_dev *dev)
-idt77252_dev_close(struct atm_dev *dev)
 {
        struct idt77252_dev *card = dev->dev_data;
        u32 conf;
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index ef52452640e0..670c093ed25f 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -958,6 +958,7 @@ static void ia_suni_pm7345_init (IADEV *iadev)
 /***************************** IA_LIB END *****************************/
    
+#ifdef CONFIG_ATM_IA_DEBUG
 static int tcnter = 0;
 static void xdump( u_char*  cp, int  length, char*  prefix )
 {
@@ -992,6 +993,7 @@ static void xdump( u_char*  cp, int  length, char*  prefix )
    }
 }  /* close xdump(... */
+#endif /* CONFIG_ATM_IA_DEBUG */
  
 static struct atm_dev *ia_boards = NULL;  
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/cciss.c b/drivers/block/cciss.c
index 55bd35c0f082..9c9627e8e334 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -50,6 +50,7 @@
 #include <scsi/sg.h>
 #include <scsi/scsi_ioctl.h>
 #include <linux/cdrom.h>
+#include <linux/scatterlist.h>
 #define CCISS_DRIVER_VERSION(maj,min,submin) ((maj<<16)|(min<<8)|(submin))
 #define DRIVER_NAME "HP CISS Driver (v 3.6.14)"
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/ub.c b/drivers/block/ub.c
index c452e2d355ee..27bfe72aab59 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -8,6 +8,7 @@
 * and is not licensed separately. See file COPYING for details.
 *
 * TODO (sorted by decreasing priority)
+ *  -- Return sense now that rq allows it (we always auto-sense anyway).
 *  -- set readonly flag for CDs, set removable flag for CF readers
 *  -- do inquiry and verify we got a disk and not a tape (for LUN mismatch)
 *  -- verify the 13 conditions and do bulk resets
@@ -359,7 +360,8 @@ static void ub_cmd_build_block(struct ub_dev *sc, struct ub_lun *lun,
 static void ub_cmd_build_packet(struct ub_dev *sc, struct ub_lun *lun,
    struct ub_scsi_cmd *cmd, struct ub_request *urq);
 static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd);
-static void ub_end_rq(struct request *rq, unsigned int status);
+static void ub_end_rq(struct request *rq, unsigned int status,
+    unsigned int cmd_len);
 static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,
    struct ub_request *urq, struct ub_scsi_cmd *cmd);
 static int ub_submit_scsi(struct ub_dev *sc, struct ub_scsi_cmd *cmd);
@@ -642,13 +644,13 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)
        if (atomic_read(&sc->poison)) {
                blkdev_dequeue_request(rq);
-                ub_end_rq(rq, DID_NO_CONNECT << 16);
+                ub_end_rq(rq, DID_NO_CONNECT << 16, blk_rq_bytes(rq));
                return 0;
        }
        if (lun->changed && !blk_pc_request(rq)) {
                blkdev_dequeue_request(rq);
-                ub_end_rq(rq, SAM_STAT_CHECK_CONDITION);
+                ub_end_rq(rq, SAM_STAT_CHECK_CONDITION, blk_rq_bytes(rq));
                return 0;
        }
@@ -701,7 +703,7 @@ static int ub_request_fn_1(struct ub_lun *lun, struct request *rq)
 drop:
        ub_put_cmd(lun, cmd);
-        ub_end_rq(rq, DID_ERROR << 16);
+        ub_end_rq(rq, DID_ERROR << 16, blk_rq_bytes(rq));
        return 0;
 }
@@ -770,6 +772,7 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
        struct ub_request *urq = cmd->back;
        struct request *rq;
        unsigned int scsi_status;
+        unsigned int cmd_len;
        rq = urq->rq;
@@ -779,8 +782,18 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                                rq->data_len = 0;
                        else
                                rq->data_len -= cmd->act_len;
+                        scsi_status = 0;
+                } else {
+                        if (cmd->act_len != cmd->len) {
+                                if ((cmd->key == MEDIUM_ERROR ||
+                                     cmd->key == UNIT_ATTENTION) &&
+                                    ub_rw_cmd_retry(sc, lun, urq, cmd) == 0)
+                                        return;
+                                scsi_status = SAM_STAT_CHECK_CONDITION;
+                        } else {
+                                scsi_status = 0;
+                        }
                }
-                scsi_status = 0;
        } else {
                if (blk_pc_request(rq)) {
                        /* UB_SENSE_SIZE is smaller than SCSI_SENSE_BUFFERSIZE */
@@ -801,14 +814,17 @@ static void ub_rw_cmd_done(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
        urq->rq = NULL;
+        cmd_len = cmd->len;
        ub_put_cmd(lun, cmd);
-        ub_end_rq(rq, scsi_status);
+        ub_end_rq(rq, scsi_status, cmd_len);
        blk_start_queue(lun->disk->queue);
 }
-static void ub_end_rq(struct request *rq, unsigned int scsi_status)
+static void ub_end_rq(struct request *rq, unsigned int scsi_status,
+    unsigned int cmd_len)
 {
        int error;
+        long rqlen;
        if (scsi_status == 0) {
                error = 0;
@@ -816,8 +832,12 @@ static void ub_end_rq(struct request *rq, unsigned int scsi_status)
                error = -EIO;
                rq->errors = scsi_status;
        }
-        if (__blk_end_request(rq, error, blk_rq_bytes(rq)))
+        rqlen = blk_rq_bytes(rq);    /* Oddly enough, this is the residue. */
-                BUG();
+        if (__blk_end_request(rq, error, cmd_len)) {
+                printk(KERN_WARNING DRV_NAME
+                    ": __blk_end_request blew, %s-cmd total %u rqlen %ld\n",
+                    blk_pc_request(rq)? "pc": "fs", cmd_len, rqlen);
+        }
 }
 static int ub_rw_cmd_retry(struct ub_dev *sc, struct ub_lun *lun,
diff --git a/drivers/char/drm/ati_pcigart.c b/drivers/char/drm/ati_pcigart.c
index e5a0e97cfdda..141f4dfa0a11 100644
--- a/drivers/char/drm/ati_pcigart.c
+++ b/drivers/char/drm/ati_pcigart.c
@@ -122,8 +122,9 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga
        } else {
                address = gart_info->addr;
                bus_address = gart_info->bus_addr;
-                DRM_DEBUG("PCI: Gart Table: VRAM %08X mapped at %08lX\n",
+                DRM_DEBUG("PCI: Gart Table: VRAM %08LX mapped at %08lX\n",
-                          bus_address, (unsigned long)address);
+                          (unsigned long long)bus_address,
+                          (unsigned long)address);
        }
        pci_gart = (u32 *) address;
@@ -167,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/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
+#elif defined(__ia64__)
-#if 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/i915_drv.h b/drivers/char/drm/i915_drv.h
index c10d128e34db..675d88bda066 100644
--- a/drivers/char/drm/i915_drv.h
+++ b/drivers/char/drm/i915_drv.h
@@ -1092,8 +1092,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
 #define IS_I915G(dev) ((dev)->pci_device == 0x2582 || (dev)->pci_device == 0x258a)
 #define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
 #define IS_I945G(dev) ((dev)->pci_device == 0x2772)
-#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2)
+#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2 ||\
+                        (dev)->pci_device == 0x27AE)
 #define IS_I965G(dev) ((dev)->pci_device == 0x2972 || \
                       (dev)->pci_device == 0x2982 || \
                       (dev)->pci_device == 0x2992 || \
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)
+                        r300_cmd_wait(dev_priv, header);
-                                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();
-                        }
                        break;
                case R300_CMD_SCRATCH:
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/hpet.c b/drivers/char/hpet.c
index 465ad35ed38f..1399971be689 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -731,14 +731,14 @@ static unsigned long hpet_calibrate(struct hpets *hpetp)
 int hpet_alloc(struct hpet_data *hdp)
 {
-        u64 cap, mcfg, hpet_config;
+        u64 cap, mcfg;
        struct hpet_dev *devp;
-        u32 i, ntimer, irq;
+        u32 i, ntimer;
        struct hpets *hpetp;
        size_t siz;
        struct hpet __iomem *hpet;
        static struct hpets *last = NULL;
-        unsigned long period, irq_bitmap;
+        unsigned long period;
        unsigned long long temp;
        /*
@@ -765,47 +765,11 @@ int hpet_alloc(struct hpet_data *hdp)
        hpetp->hp_hpet_phys = hdp->hd_phys_address;
        hpetp->hp_ntimer = hdp->hd_nirqs;
-        hpet = hpetp->hp_hpet;
-        /* Assign IRQs statically for legacy devices */
-        hpetp->hp_dev[0].hd_hdwirq = hdp->hd_irq[0];
-        hpetp->hp_dev[1].hd_hdwirq = hdp->hd_irq[1];
-        /* Assign IRQs dynamically for the others */
-        for (i = 2, devp = &hpetp->hp_dev[2]; i < hdp->hd_nirqs; i++, devp++) {
-                struct hpet_timer __iomem *timer;
-                timer = &hpet->hpet_timers[devp - hpetp->hp_dev];
+        for (i = 0; i < hdp->hd_nirqs; i++)
+                hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i];
-                /* Check if there's already an IRQ assigned to the timer */
+        hpet = hpetp->hp_hpet;
-                if (hdp->hd_irq[i]) {
-                        hpetp->hp_dev[i].hd_hdwirq = hdp->hd_irq[i];
-                        continue;
-                }
-                hpet_config = readq(&timer->hpet_config);
-                irq_bitmap = (hpet_config & Tn_INT_ROUTE_CAP_MASK)
-                        >> Tn_INT_ROUTE_CAP_SHIFT;
-                if (!irq_bitmap)
-                        irq = 0;        /* No valid IRQ Assignable */
-                else {
-                        irq = find_first_bit(&irq_bitmap, 32);
-                        do {
-                                hpet_config |= irq << Tn_INT_ROUTE_CNF_SHIFT;
-                                writeq(hpet_config, &timer->hpet_config);
-                                /*
-                                 * Verify whether we have written a valid
-                                 * IRQ number by reading it back again
-                                 */
-                                hpet_config = readq(&timer->hpet_config);
-                                if (irq == (hpet_config & Tn_INT_ROUTE_CNF_MASK)
-                                                >> Tn_INT_ROUTE_CNF_SHIFT)
-                                        break;  /* Success */
-                        } while ((irq = (find_next_bit(&irq_bitmap, 32, irq))));
-                }
-                hpetp->hp_dev[i].hd_hdwirq = irq;
-        }
        cap = readq(&hpet->hpet_cap);
@@ -836,8 +800,7 @@ int hpet_alloc(struct hpet_data *hdp)
                hpetp->hp_which, hdp->hd_phys_address,
                hpetp->hp_ntimer > 1 ? "s" : "");
        for (i = 0; i < hpetp->hp_ntimer; i++)
-                printk("%s %d", i > 0 ? "," : "",
+                printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
-                                hpetp->hp_dev[i].hd_hdwirq);
        printk("\n");
        printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n",
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);
+                        WRITE_UNLOCK_IRQRESTORE(lock_var_p, flags);
-                ip2trace (CHANN, ITRC_QUEUE, 3, 1, totalsize );
+                } else
+                        ip2trace(CHANN, ITRC_QUEUE, 3, 1, totalsize);
-                // Prepare to wait for buffers to empty
+                /* Prepare to wait for buffers to empty */
-                WRITE_UNLOCK_IRQRESTORE(lock_var_p,flags); 
                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/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_ull_function(usage)
-define_show_state_function(time)
+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 __le32         l;
-        volatile u32            p;
+        volatile __le32         p;
 };
 struct hifn_dma {
@@ -481,10 +481,10 @@ struct hifn_device
 struct hifn_base_command
 {
-        volatile u16            masks;
+        volatile __le16         masks;
-        volatile u16            session_num;
+        volatile __le16         session_num;
-        volatile u16            total_source_count;
+        volatile __le16         total_source_count;
-        volatile u16            total_dest_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 __le16                 masks;
-        volatile u16            header_skip;
+        volatile __le16                 header_skip;
-        volatile u16            source_count;
+        volatile __le16                 source_count;
-        volatile u16            reserved;
+        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 72692309398a..df163687c91a 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1021,11 +1021,11 @@ const u32 mpc8349_dma_ip_feature = FSL_DMA_IP_83XX | FSL_DMA_LITTLE_ENDIAN;
 static struct of_device_id of_fsl_dma_chan_ids[] = {
        {
-                .compatible = "fsl,mpc8540-dma-channel",
+                .compatible = "fsl,eloplus-dma-channel",
                .data = (void *)&mpc8540_dma_ip_feature,
        },
        {
-                .compatible = "fsl,mpc8349-dma-channel",
+                .compatible = "fsl,elo-dma-channel",
                .data = (void *)&mpc8349_dma_ip_feature,
        },
        {}
@@ -1107,8 +1107,8 @@ err:
 }
 static struct of_device_id of_fsl_dma_ids[] = {
-        { .compatible = "fsl,mpc8540-dma", },
+        { .compatible = "fsl,eloplus-dma", },
-        { .compatible = "fsl,mpc8349-dma", },
+        { .compatible = "fsl,elo-dma", },
        {}
 };
diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h
index fddd6aee2a63..6faf07ba0d0e 100644
--- a/drivers/dma/fsldma.h
+++ b/drivers/dma/fsldma.h
@@ -75,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;
+        v64 src_addr;
-        u64 __bitwise   dst_addr;
+        v64 dst_addr;
-        u64 __bitwise   next_ln_addr;
+        v64 next_ln_addr;
-        u32 __bitwise   count;
+        v32 count;
-        u32 __bitwise   reserve;
+        v32 reserve;
 } __attribute__((aligned(32)));
 struct fsl_desc_sw {
@@ -92,13 +95,13 @@ struct fsl_desc_sw {
 } __attribute__((aligned(32)));
 struct fsl_dma_chan_regs {
-        u32 __bitwise   mr;     /* 0x00 - Mode Register */
+        u32 mr; /* 0x00 - Mode Register */
-        u32 __bitwise   sr;     /* 0x04 - Status Register */
+        u32 sr; /* 0x04 - Status Register */
-        u64 __bitwise   cdar;   /* 0x08 - Current descriptor address register */
+        u64 cdar;       /* 0x08 - Current descriptor address register */
-        u64 __bitwise   sar;    /* 0x10 - Source Address Register */
+        u64 sar;        /* 0x10 - Source Address Register */
-        u64 __bitwise   dar;    /* 0x18 - Destination Address Register */
+        u64 dar;        /* 0x18 - Destination Address Register */
-        u32 __bitwise   bcr;    /* 0x20 - Byte Count Register */
+        u32 bcr;        /* 0x20 - Byte Count Register */
-        u64 __bitwise   ndar;   /* 0x24 - Next Descriptor Address Register */
+        u64 ndar;       /* 0x24 - Next Descriptor Address Register */
 };
 struct fsl_dma_chan;
@@ -151,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 __iomem *)addr, val >> 32);
-        out_be32((u32 *)addr + 1, (u32)val);
+        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 __iomem *)addr + 1, val >> 32);
-        out_le32((u32 *)addr, (u32)val);
+        out_le32((u32 __iomem *)addr, (u32)val);
 }
 #endif
@@ -182,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/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 4072449ad1cd..c5e3ed7e903b 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -266,7 +266,7 @@ static void __init dmi_save_ipmi_device(const struct dmi_header *dm)
        dev->name = "IPMI controller";
        dev->device_data = data;
-        list_add(&dev->list, &dmi_devices);
+        list_add_tail(&dev->list, &dmi_devices);
 }
 static void __init dmi_save_extended_devices(const struct dmi_header *dm)
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-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index cce5a614758d..fde26345a379 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -382,9 +382,8 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                        break;
                case DAVINCI_I2C_IVR_ARDY:
-                        w = davinci_i2c_read_reg(dev, DAVINCI_I2C_STR_REG);
+                        davinci_i2c_write_reg(dev,
-                        MOD_REG_BIT(w, DAVINCI_I2C_STR_ARDY, 1);
+                                DAVINCI_I2C_STR_REG, DAVINCI_I2C_STR_ARDY);
-                        davinci_i2c_write_reg(dev, DAVINCI_I2C_STR_REG, w);
                        complete(&dev->cmd_complete);
                        break;
@@ -397,12 +396,9 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                                if (dev->buf_len)
                                        continue;
-                                w = davinci_i2c_read_reg(dev,
-                                                         DAVINCI_I2C_STR_REG);
-                                MOD_REG_BIT(w, DAVINCI_I2C_IMR_RRDY, 0);
                                davinci_i2c_write_reg(dev,
-                                                      DAVINCI_I2C_STR_REG,
+                                        DAVINCI_I2C_STR_REG,
-                                                      w);
+                                        DAVINCI_I2C_IMR_RRDY);
                        } else
                                dev_err(dev->dev, "RDR IRQ while no "
                                        "data requested\n");
@@ -428,9 +424,8 @@ static irqreturn_t i2c_davinci_isr(int this_irq, void *dev_id)
                        break;
                case DAVINCI_I2C_IVR_SCD:
-                        w = davinci_i2c_read_reg(dev, DAVINCI_I2C_STR_REG);
+                        davinci_i2c_write_reg(dev,
-                        MOD_REG_BIT(w, DAVINCI_I2C_STR_SCD, 1);
+                                DAVINCI_I2C_STR_REG, DAVINCI_I2C_STR_SCD);
-                        davinci_i2c_write_reg(dev, DAVINCI_I2C_STR_REG, w);
                        complete(&dev->cmd_complete);
                        break;
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 7c7eb0cfeceb..22bb247d0e60 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(iic_force_poll, "Force polling mode");
 static int iic_force_fast;
 module_param(iic_force_fast, bool, 0);
-MODULE_PARM_DESC(iic_fast_poll, "Force fast mode (400 kHz)");
+MODULE_PARM_DESC(iic_force_fast, "Force fast mode (400 kHz)");
 #define DBG_LEVEL 0
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/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c
index cb9abe7565a7..b1c050ff311d 100644
--- a/drivers/i2c/busses/i2c-tiny-usb.c
+++ b/drivers/i2c/busses/i2c-tiny-usb.c
@@ -131,11 +131,15 @@ static const struct i2c_algorithm usb_algorithm = {
 /* ----- begin of usb layer ---------------------------------------------- */
-/* The usb i2c interface uses a vid/pid pair donated by */
+/*
-/* Future Technology Devices International Ltd. */
+ * Initially the usb i2c interface uses a vid/pid pair donated by
+ * Future Technology Devices International Ltd., later a pair was
+ * bought from EZPrototypes
+ */
 static struct usb_device_id i2c_tiny_usb_table [] = {
-        { USB_DEVICE(0x0403, 0xc631) },
+        { USB_DEVICE(0x0403, 0xc631) },   /* FTDI */
-        { }                     /* Terminating entry */
+        { USB_DEVICE(0x1c40, 0x0534) },   /* EZPrototypes */
+        { }                               /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, i2c_tiny_usb_table);
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
+ * matters.  For example, use it for I2C adapters from system-on-chip CPUs,
- * otherwise built in to the system's mainboard, and where i2c_board_info
+ * 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-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/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/pci/siimage.c b/drivers/ide/pci/siimage.c
index cc4be9621bc0..8d624afe8529 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -492,7 +492,7 @@ static void proc_reports_siimage (struct pci_dev *dev, u8 clocking, const char *
 
 static unsigned int setup_mmio_siimage (struct pci_dev *dev, const char *name)
 {
-        unsigned long bar5      = pci_resource_start(dev, 5);
+        resource_size_t bar5    = pci_resource_start(dev, 5);
        unsigned long barsize   = pci_resource_len(dev, 5);
        u8 tmpbyte      = 0;
        void __iomem *ioaddr;
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;
+        __be32 src_ip = src_in->sin_addr.s_addr;
-        u32 dst_ip = dst_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];
+                __be32 pad[3];
-                __u32 addr;
+                __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;
+        __be16 port;
-        __u16 sdp_specific2;
+        __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/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_MKRN(n)     ((((n) - 1) & 0x7) << 26) /* matrix key row number */
-#define KPC_MKCN(n)     ((((n) & 0x7) - 1) << 23) /* matrix key column number */
+#define KPC_MKCN(n)     ((((n) - 1) & 0x7) << 23) /* matrix key column number */
-#define KPC_DKN(n)      ((((n) & 0x7) - 1) << 6)  /* direct key 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/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/appletouch.c b/drivers/input/mouse/appletouch.c
index b4423a471f02..8dd3942f3022 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -62,6 +62,10 @@
 #define GEYSER4_ISO_PRODUCT_ID  0x021B
 #define GEYSER4_JIS_PRODUCT_ID  0x021C
+#define GEYSER4_HF_ANSI_PRODUCT_ID      0x0229
+#define GEYSER4_HF_ISO_PRODUCT_ID       0x022A
+#define GEYSER4_HF_JIS_PRODUCT_ID       0x022B
 #define ATP_DEVICE(prod)                                        \
        .match_flags = USB_DEVICE_ID_MATCH_DEVICE |             \
                       USB_DEVICE_ID_MATCH_INT_CLASS |          \
@@ -93,6 +97,10 @@ static struct usb_device_id atp_table [] = {
        { ATP_DEVICE(GEYSER4_ISO_PRODUCT_ID) },
        { ATP_DEVICE(GEYSER4_JIS_PRODUCT_ID) },
+        { ATP_DEVICE(GEYSER4_HF_ANSI_PRODUCT_ID) },
+        { ATP_DEVICE(GEYSER4_HF_ISO_PRODUCT_ID) },
+        { ATP_DEVICE(GEYSER4_HF_JIS_PRODUCT_ID) },
        /* Terminating entry */
        { }
 };
@@ -217,7 +225,10 @@ static inline int atp_is_geyser_3(struct atp *dev)
                (productId == GEYSER3_JIS_PRODUCT_ID) ||
                (productId == GEYSER4_ANSI_PRODUCT_ID) ||
                (productId == GEYSER4_ISO_PRODUCT_ID) ||
-                (productId == GEYSER4_JIS_PRODUCT_ID);
+                (productId == GEYSER4_JIS_PRODUCT_ID) ||
+                (productId == GEYSER4_HF_ANSI_PRODUCT_ID) ||
+                (productId == GEYSER4_HF_ISO_PRODUCT_ID) ||
+                (productId == GEYSER4_HF_JIS_PRODUCT_ID);
 }
 /*
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/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;
-                        led_dat->new_level = level;
+                schedule_work(&led_dat->work);
-                        schedule_work(&led_dat->work);
-                } else
-                        gpio_set_value_cansleep(led_dat->gpio, level);
        } 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
+ * Host to do something.  This file also contains useful helper routines. :*/
- * couple of non-obvious setup and teardown pieces which were implemented after
- * days of debugging pain. :*/
 #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
+        /* We allocate an array of struct page pointers.  map_vm_area() wants
-         * pages in this form, rather than just an array of pointers. */
+         * 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
+                /* Check if there are any interrupts which can be delivered now:
-                 * now: if so, this sets up the hander to be executed when we
+                 * if so, this sets up the hander to be executed when we next
-                 * next run the Guest. */
+                 * 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
+/*H:220 Now we've got the routines to deliver interrupts, delivering traps like
- * like page fault is easy.  The only trick is that Intel decided that some
+ * page fault is easy.  The only trick is that Intel decided that some traps
- * traps should have error codes: */
+ * 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
+         * address the Launcher gave us.  This allocates memory, so can fail. */
-         * 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
+ * it nor use it: we verify and convert it here then point the CPU to the
- * actual Guest pages when running the Guest. :*/
+ * 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
+ * This holds a reference to the page, so release_pte() is careful to put that
- * put that back. */
+ * 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
+ * The benefit is that when we have to track a new page table, we can keep all
- * all the kernel mappings.  This speeds up context switch immensely. */
+ * 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
+        /* Kernel mappings must be changed on all top levels.  Slow, but doesn't
-         * doesn't happen often. */
+         * 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
+ * If nothing else, note that all this complexity in juggling shadow page tables
- * tables in sync with the Guest's page tables is for one reason: for most
+ * in sync with the Guest's page tables is for one reason: for most Guests this
- * Guests this page table dance determines how bad performance will be.  This
+ * page table dance determines how bad performance will be.  This is why Xen
- * is why Xen uses exotic direct Guest pagetable manipulation, and why both
+ * uses exotic direct Guest pagetable manipulation, and why both Intel and AMD
- * Intel and AMD have implemented shadow page table support directly into
+ * have implemented shadow page table support directly into hardware.
- * 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
+                 * This happens a lot: we don't actually set up most of the page
-                 * page tables for the Guest at all when we start: as it runs
+                 * tables for the Guest at all when we start: as it runs it asks
-                 * it asks for more and more, and we set them up as
+                 * for more and more, and we set them up as required. In this
-                 * required. In this case, we don't even tell the Guest that
+                 * case, we don't even tell the Guest that the fault happened.
-                 * 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
+         * convenience function which returns the distance between the
-         * switcher code and the high-mapped copy we just made. */
+         * 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
+        /* The pointer to the Guest's "struct lguest_data" is the only argument.
-         * argument.  We check that address now. */
+         * 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
+/*P:900 This is the Switcher: code which sits at 0xFFC00000 astride both the
- * Guest<->Host switch.  It is as simple as it can be made, but it's naturally
+ * Host and Guest to do the low-level Guest<->Host switch.  It is as simple as
- * very specific to x86.
+ * 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);
-        /*
+        atomic_set(&ctx->pending, 1);
-         * 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);
 }
 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;
+                        ctx->sector++;
-                        /* fall through*/
+                        continue;
+                /* sync */
                case 0:
+                        atomic_dec(&ctx->pending);
                        ctx->sector++;
                        continue;
-                }
-                break;
+                /* error */
+                default:
+                        atomic_dec(&ctx->pending);
+                        return r;
+                }
        }
-        /*
+        return 0;
-         * 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;
 }
 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,
+static void segment_complete(int read_err, unsigned long write_err,
-                             unsigned int write_err, void *context)
+                             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,
+typedef void (*kcopyd_notify_fn)(int read_err, unsigned long write_err,
-                                 unsigned int write_err, void *context);
+                                 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/raid5.c b/drivers/md/raid5.c
index c574cf5efb5c..b162b839a662 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -2348,25 +2348,15 @@ static void handle_issuing_new_write_requests6(raid5_conf_t *conf,
 static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh,
                                struct stripe_head_state *s, int disks)
 {
+        int canceled_check = 0;
        set_bit(STRIPE_HANDLE, &sh->state);
-        /* Take one of the following actions:
-         * 1/ start a check parity operation if (uptodate == disks)
-         * 2/ finish a check parity operation and act on the result
-         * 3/ skip to the writeback section if we previously
-         *    initiated a recovery operation
-         */
-        if (s->failed == 0 &&
-            !test_bit(STRIPE_OP_MOD_REPAIR_PD, &sh->ops.pending)) {
-                if (!test_and_set_bit(STRIPE_OP_CHECK, &sh->ops.pending)) {
-                        BUG_ON(s->uptodate != disks);
-                        clear_bit(R5_UPTODATE, &sh->dev[sh->pd_idx].flags);
-                        sh->ops.count++;
-                        s->uptodate--;
-                } else if (
-                       test_and_clear_bit(STRIPE_OP_CHECK, &sh->ops.complete)) {
-                        clear_bit(STRIPE_OP_CHECK, &sh->ops.ack);
-                        clear_bit(STRIPE_OP_CHECK, &sh->ops.pending);
+        /* complete a check operation */
+        if (test_and_clear_bit(STRIPE_OP_CHECK, &sh->ops.complete)) {
+            clear_bit(STRIPE_OP_CHECK, &sh->ops.ack);
+            clear_bit(STRIPE_OP_CHECK, &sh->ops.pending);
+                if (s->failed == 0) {
                        if (sh->ops.zero_sum_result == 0)
                                /* parity is correct (on disc,
                                 * not in buffer any more)
@@ -2391,7 +2381,8 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh,
                                        s->uptodate++;
                                }
                        }
-                }
+                } else
+                        canceled_check = 1; /* STRIPE_INSYNC is not set */
        }
        /* check if we can clear a parity disk reconstruct */
@@ -2404,12 +2395,28 @@ static void handle_parity_checks5(raid5_conf_t *conf, struct stripe_head *sh,
                clear_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending);
        }
+        /* start a new check operation if there are no failures, the stripe is
+         * not insync, and a repair is not in flight
+         */
+        if (s->failed == 0 &&
+            !test_bit(STRIPE_INSYNC, &sh->state) &&
+            !test_bit(STRIPE_OP_MOD_REPAIR_PD, &sh->ops.pending)) {
+                if (!test_and_set_bit(STRIPE_OP_CHECK, &sh->ops.pending)) {
+                        BUG_ON(s->uptodate != disks);
+                        clear_bit(R5_UPTODATE, &sh->dev[sh->pd_idx].flags);
+                        sh->ops.count++;
+                        s->uptodate--;
+                }
+        }
        /* Wait for check parity and compute block operations to complete
-         * before write-back
+         * before write-back.  If a failure occurred while the check operation
+         * was in flight we need to cycle this stripe through handle_stripe
+         * since the parity block may not be uptodate
         */
-        if (!test_bit(STRIPE_INSYNC, &sh->state) &&
+        if (!canceled_check && !test_bit(STRIPE_INSYNC, &sh->state) &&
-                !test_bit(STRIPE_OP_CHECK, &sh->ops.pending) &&
+            !test_bit(STRIPE_OP_CHECK, &sh->ops.pending) &&
-                !test_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending)) {
+            !test_bit(STRIPE_OP_COMPUTE_BLK, &sh->ops.pending)) {
                struct r5dev *dev;
                /* either failed parity check, or recovery is happening */
                if (s->failed == 0)
diff --git a/drivers/media/Makefile b/drivers/media/Makefile
index 8cf91353b56a..7b8bb6949f5e 100644
--- a/drivers/media/Makefile
+++ b/drivers/media/Makefile
@@ -6,3 +6,6 @@ obj-y := common/
 obj-y += video/
 obj-$(CONFIG_VIDEO_DEV) += radio/
 obj-$(CONFIG_DVB_CORE)  += dvb/
+ifeq ($(CONFIG_DVB_CORE),)
+  obj-$(CONFIG_VIDEO_TUNER)  += dvb/frontends/
+endif
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 (dev->ext) {
-                if( 0 != (dev->ext->irq_mask & isr )) {
+                if (dev->ext->irq_mask & isr) {
-                        if( 0 != dev->ext->irq_func ) {
+                        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)
+        if (buffer2)
-                printk(KERN_WARNING "buffer2 not 0: %p.\n", 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/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 819433485d3b..1a4d8319773c 100644
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -445,7 +445,7 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
                        s5h1409_readreg(state, 0xe3) | 0x1100);
        else
                return s5h1409_writereg(state, 0xe3,
-                        s5h1409_readreg(state, 0xe3) & 0xeeff);
+                        s5h1409_readreg(state, 0xe3) & 0xfeff);
 }
 static int s5h1409_sleep(struct dvb_frontend* fe, int enable)
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/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/bt832.c b/drivers/media/video/bt8xx/bt832.c
index a51876137880..f92f06dec0d0 100644
--- a/drivers/media/video/bt8xx/bt832.c
+++ b/drivers/media/video/bt8xx/bt832.c
@@ -97,6 +97,11 @@ int bt832_init(struct i2c_client *i2c_client_s)
        int rc;
        buf=kmalloc(65,GFP_KERNEL);
+        if (!buf) {
+                v4l_err(&t->client,
+                        "Unable to allocate memory. Detaching.\n");
+                return 0;
+        }
        bt832_hexdump(i2c_client_s,buf);
        if(buf[0x40] != 0x31) {
@@ -211,7 +216,12 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
        switch (cmd) {
                case BT832_HEXDUMP: {
                        unsigned char *buf;
-                        buf=kmalloc(65,GFP_KERNEL);
+                        buf = kmalloc(65, GFP_KERNEL);
+                        if (!buf) {
+                                v4l_err(&t->client,
+                                        "Unable to allocate memory\n");
+                                break;
+                        }
                        bt832_hexdump(&t->client,buf);
                        kfree(buf);
                }
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index a080c149cc6c..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;
@@ -3415,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);
@@ -3429,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);
@@ -3444,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--;
@@ -3508,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;
 }
@@ -3569,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;
@@ -3583,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;
@@ -3599,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/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/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
+        if (!mxb->tea6420_1 || !mxb->tea6420_2 || !mxb->tea6415c ||
-            || 0 == mxb->tda9840        || 0 == mxb->saa7111a   || 0 == mxb->tuner ) {
+            !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-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
index 4df6d6d936fc..fe9991c10cf4 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c
@@ -155,6 +155,41 @@ static const struct pvr2_device_desc pvr2_device_onair_usb2 = {
 /*------------------------------------------------------------------------*/
+/* Hauppauge PVR-USB2 Model 73xxx */
+static const char *pvr2_client_73xxx[] = {
+        "cx25840",
+        "tuner",
+};
+static const char *pvr2_fw1_names_73xxx[] = {
+                "v4l-pvrusb2-73xxx-01.fw",
+};
+static const struct pvr2_device_desc pvr2_device_73xxx = {
+                .description = "WinTV PVR USB2 Model Category 73xxxx",
+                .shortname = "73xxx",
+                .client_modules.lst = pvr2_client_73xxx,
+                .client_modules.cnt = ARRAY_SIZE(pvr2_client_73xxx),
+                .fx2_firmware.lst = pvr2_fw1_names_73xxx,
+                .fx2_firmware.cnt = ARRAY_SIZE(pvr2_fw1_names_73xxx),
+                .flag_has_cx25840 = !0,
+                .flag_has_hauppauge_rom = !0,
+#if 0
+                .flag_has_analogtuner = !0,
+                .flag_has_composite = !0,
+                .flag_has_svideo = !0,
+                .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+                .digital_control_scheme = PVR2_DIGITAL_SCHEME_HAUPPAUGE,
+                .led_scheme = PVR2_LED_SCHEME_HAUPPAUGE,
+#else
+                .signal_routing_scheme = PVR2_ROUTING_SCHEME_HAUPPAUGE,
+#endif
+};
+/*------------------------------------------------------------------------*/
 /* Hauppauge PVR-USB2 Model 75xxx */
 static const char *pvr2_client_75xxx[] = {
@@ -198,8 +233,12 @@ struct usb_device_id pvr2_device_table[] = {
        { USB_DEVICE(0x11ba, 0x1001),
          .driver_info = (kernel_ulong_t)&pvr2_device_onair_usb2},
 #endif
+        { USB_DEVICE(0x2040, 0x7300),
+          .driver_info = (kernel_ulong_t)&pvr2_device_73xxx},
        { USB_DEVICE(0x2040, 0x7500),
          .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
+        { USB_DEVICE(0x2040, 0x7501),
+          .driver_info = (kernel_ulong_t)&pvr2_device_75xxx},
        { }
 };
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/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 d28318cb2b8d..b6e24e714a23 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -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/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/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index eb150dfb637f..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);
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/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 47794d23a42e..0080452531d6 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -718,7 +718,7 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long
                        /* Someone else might have been playing with it. */
                        return -EAGAIN;
                }
+                /* Fall through */
        case FL_READY:
        case FL_CFI_QUERY:
        case FL_JEDEC_QUERY:
@@ -778,14 +778,14 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long
                chip->state = FL_READY;
                return 0;
+        case FL_SHUTDOWN:
+                /* The machine is rebooting now,so no one can get chip anymore */
+                return -EIO;
        case FL_POINT:
                /* Only if there's no operation suspended... */
                if (mode == FL_READY && chip->oldstate == FL_READY)
                        return 0;
+                /* Fall through */
-        case FL_SHUTDOWN:
-                /* The machine is rebooting now,so no one can get chip anymore */
-                return -EIO;
        default:
        sleep:
                set_current_state(TASK_UNINTERRUPTIBLE);
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index d072e87ce4e2..458d477614d6 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1763,6 +1763,7 @@ static void cfi_amdstd_sync (struct mtd_info *mtd)
                default:
                        /* Not an idle state */
+                        set_current_state(TASK_UNINTERRUPTIBLE);
                        add_wait_queue(&chip->wq, &wait);
                        spin_unlock(chip->mutex);
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index b344ff858b2d..492e2ab27420 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -1015,6 +1015,7 @@ static void cfi_staa_sync (struct mtd_info *mtd)
                default:
                        /* Not an idle state */
+                        set_current_state(TASK_UNINTERRUPTIBLE);
                        add_wait_queue(&chip->wq, &wait);
                        spin_unlock_bh(chip->mutex);
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 && info->mtd[i]; i++)
-                for (i = 0; i < MAX_RESOURCES; i++)
+                ret |= info->mtd[i]->suspend(info->mtd[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 && info->mtd[i]; i++)
-                for (i = 0; i < MAX_RESOURCES; i++)
+                info->mtd[i]->resume(info->mtd[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++)
+        for (i = 0; i < MAX_RESOURCES && info->mtd[i]; i++)
-                if (info && info->mtd[i]->suspend(info->mtd[i]) == 0)
+                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/Kconfig b/drivers/net/Kconfig
index fe7b5ec09708..3a0b20afec7b 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2635,7 +2635,7 @@ config NIU
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"
-        depends on PPC64 && PCI
+        depends on PPC_PASEMI && PCI
        select PHYLIB
        select INET_LRO
        help
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index ea2a2b548e3c..25f1337cd02c 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2082,6 +2082,11 @@ static int __devinit b44_get_invariants(struct b44 *bp)
                addr = sdev->bus->sprom.et0mac;
                bp->phy_addr = sdev->bus->sprom.et0phyaddr;
        }
+        /* Some ROMs have buggy PHY addresses with the high
+         * bits set (sign extension?). Truncate them to a
+         * valid PHY address. */
+        bp->phy_addr &= 0x1F;
        memcpy(bp->dev->dev_addr, addr, 6);
        if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index c993a32b3f50..26b2dd5016cd 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -575,7 +575,6 @@ adjust_head:
 static int bf537mac_hard_start_xmit(struct sk_buff *skb,
                                struct net_device *dev)
 {
-        struct bf537mac_local *lp = netdev_priv(dev);
        unsigned int data;
        current_tx_ptr->skb = skb;
@@ -634,7 +633,6 @@ out:
 static void bf537mac_rx(struct net_device *dev)
 {
        struct sk_buff *skb, *new_skb;
-        struct bf537mac_local *lp = netdev_priv(dev);
        unsigned short len;
        /* allocate a new skb for next time receive */
diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c
index de32b3fba322..7bdb5af35951 100644
--- a/drivers/net/bnx2x.c
+++ b/drivers/net/bnx2x.c
@@ -63,8 +63,8 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
-#define DRV_MODULE_VERSION      "1.42.3"
+#define DRV_MODULE_VERSION      "1.42.4"
-#define DRV_MODULE_RELDATE      "2008/3/9"
+#define DRV_MODULE_RELDATE      "2008/4/9"
 #define BNX2X_BC_VER            0x040200
 /* Time in jiffies before concluding the transmitter is hung. */
@@ -6153,7 +6153,7 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode)
                   func, mode);
                REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,
                       0xffffffff);
-                REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,
+                REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
                       0xfffc);
                bnx2x_init_block(bp, MISC_COMMON_START, MISC_COMMON_END);
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index cb3c6faa7888..d16e0e1d2b30 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -310,7 +310,7 @@ static inline int __check_agg_selection_timer(struct port *port)
 */
 static inline void __get_rx_machine_lock(struct port *port)
 {
-        spin_lock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
+        spin_lock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
 }
 /**
@@ -320,7 +320,7 @@ static inline void __get_rx_machine_lock(struct port *port)
 */
 static inline void __release_rx_machine_lock(struct port *port)
 {
-        spin_unlock(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
+        spin_unlock_bh(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
 }
 /**
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index b57bc9467dbe..3f58c3d0b710 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -678,12 +678,8 @@ static struct slave *rlb_choose_channel(struct sk_buff *skb, struct bonding *bon
                }
                if (!list_empty(&bond->vlan_list)) {
-                        unsigned short vlan_id;
+                        if (!vlan_get_tag(skb, &client_info->vlan_id))
-                        int res = vlan_get_tag(skb, &vlan_id);
-                        if (!res) {
                                client_info->tag = 1;
-                                client_info->vlan_id = vlan_id;
-                        }
                }
                if (!client_info->assigned) {
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 0942d82f7cbf..0f0675319e9c 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -383,7 +383,7 @@ struct vlan_entry *bond_next_vlan(struct bonding *bond, struct vlan_entry *curr)
 */
 int bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev)
 {
-        unsigned short vlan_id;
+        unsigned short uninitialized_var(vlan_id);
        if (!list_empty(&bond->vlan_list) &&
            !(slave_dev->features & NETIF_F_HW_VLAN_TX) &&
@@ -4528,8 +4528,7 @@ static void bond_free_all(void)
                netif_tx_unlock_bh(bond_dev);
                /* Release the bonded slaves */
                bond_release_all(bond_dev);
-                bond_deinit(bond_dev);
+                bond_destroy(bond);
-                unregister_netdevice(bond_dev);
        }
 #ifdef CONFIG_PROC_FS
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 90a1f31e8e63..979c2d05ff9c 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -341,6 +341,7 @@ static ssize_t bonding_store_slaves(struct device *d,
        if (command[0] == '-') {
                dev = NULL;
+                original_mtu = 0;
                bond_for_each_slave(bond, slave, i)
                        if (strnicmp(slave->dev->name, ifname, IFNAMSIZ) == 0) {
                                dev = slave->dev;
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 67ccad69d445..a3c74e20aa53 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -22,8 +22,8 @@
 #include "bond_3ad.h"
 #include "bond_alb.h"
-#define DRV_VERSION     "3.2.4"
+#define DRV_VERSION     "3.2.5"
-#define DRV_RELDATE     "January 28, 2008"
+#define DRV_RELDATE     "March 21, 2008"
 #define DRV_NAME        "bonding"
 #define DRV_DESCRIPTION "Ethernet Channel Bonding Driver"
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c
index db586870c5f4..98a6bbd11d4c 100644
--- a/drivers/net/cxgb3/sge.c
+++ b/drivers/net/cxgb3/sge.c
@@ -557,9 +557,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q)
        for (i = 0; i < SGE_RXQ_PER_SET; ++i)
                if (q->fl[i].desc) {
-                        spin_lock(&adapter->sge.reg_lock);
+                        spin_lock_irq(&adapter->sge.reg_lock);
                        t3_sge_disable_fl(adapter, q->fl[i].cntxt_id);
-                        spin_unlock(&adapter->sge.reg_lock);
+                        spin_unlock_irq(&adapter->sge.reg_lock);
                        free_rx_bufs(pdev, &q->fl[i]);
                        kfree(q->fl[i].sdesc);
                        dma_free_coherent(&pdev->dev,
@@ -570,9 +570,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q)
        for (i = 0; i < SGE_TXQ_PER_SET; ++i)
                if (q->txq[i].desc) {
-                        spin_lock(&adapter->sge.reg_lock);
+                        spin_lock_irq(&adapter->sge.reg_lock);
                        t3_sge_enable_ecntxt(adapter, q->txq[i].cntxt_id, 0);
-                        spin_unlock(&adapter->sge.reg_lock);
+                        spin_unlock_irq(&adapter->sge.reg_lock);
                        if (q->txq[i].sdesc) {
                                free_tx_desc(adapter, &q->txq[i],
                                             q->txq[i].in_use);
@@ -586,9 +586,9 @@ static void t3_free_qset(struct adapter *adapter, struct sge_qset *q)
                }
        if (q->rspq.desc) {
-                spin_lock(&adapter->sge.reg_lock);
+                spin_lock_irq(&adapter->sge.reg_lock);
                t3_sge_disable_rspcntxt(adapter, q->rspq.cntxt_id);
-                spin_unlock(&adapter->sge.reg_lock);
+                spin_unlock_irq(&adapter->sge.reg_lock);
                dma_free_coherent(&pdev->dev,
                                  q->rspq.size * sizeof(struct rsp_desc),
                                  q->rspq.desc, q->rspq.phys_addr);
@@ -2667,7 +2667,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,
                (16 * 1024) - SKB_DATA_ALIGN(sizeof(struct skb_shared_info)) :
                MAX_FRAME_SIZE + 2 + sizeof(struct cpl_rx_pkt);
-        spin_lock(&adapter->sge.reg_lock);
+        spin_lock_irq(&adapter->sge.reg_lock);
        /* FL threshold comparison uses < */
        ret = t3_sge_init_rspcntxt(adapter, q->rspq.cntxt_id, irq_vec_idx,
@@ -2711,7 +2711,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,
                        goto err_unlock;
        }
-        spin_unlock(&adapter->sge.reg_lock);
+        spin_unlock_irq(&adapter->sge.reg_lock);
        q->adap = adapter;
        q->netdev = dev;
@@ -2728,7 +2728,7 @@ int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports,
        return 0;
      err_unlock:
-        spin_unlock(&adapter->sge.reg_lock);
+        spin_unlock_irq(&adapter->sge.reg_lock);
      err:
        t3_free_qset(adapter, q);
        return ret;
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 1fe305ca2cf0..d63cc93f055d 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -798,8 +798,6 @@ dm9000_init_dm9000(struct net_device *dev)
        /* Set address filter table */
        dm9000_hash_table(dev);
-        /* Activate DM9000 */
-        iow(db, DM9000_RCR, RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN);
        /* Enable TX/RX interrupt mask */
        iow(db, DM9000_IMR, IMR_PAR | IMR_PTM | IMR_PRM);
@@ -970,7 +968,7 @@ dm9000_interrupt(int irq, void *dev_id)
 struct dm9000_rxhdr {
        u8      RxPktReady;
        u8      RxStatus;
-        u16     RxLen;
+        __le16  RxLen;
 } __attribute__((__packed__));
 /*
@@ -1197,6 +1195,7 @@ dm9000_hash_table(struct net_device *dev)
        int i, oft;
        u32 hash_val;
        u16 hash_table[4];
+        u8 rcr = RCR_DIS_LONG | RCR_DIS_CRC | RCR_RXEN;
        unsigned long flags;
        dm9000_dbg(db, 1, "entering %s\n", __func__);
@@ -1213,6 +1212,12 @@ dm9000_hash_table(struct net_device *dev)
        /* broadcast address */
        hash_table[3] = 0x8000;
+        if (dev->flags & IFF_PROMISC)
+                rcr |= RCR_PRMSC;
+        if (dev->flags & IFF_ALLMULTI)
+                rcr |= RCR_ALL;
        /* the multicast address in Hash Table : 64 bits */
        for (i = 0; i < mc_cnt; i++, mcptr = mcptr->next) {
                hash_val = ether_crc_le(6, mcptr->dmi_addr) & 0x3f;
@@ -1225,6 +1230,7 @@ dm9000_hash_table(struct net_device *dev)
                iow(db, oft++, hash_table[i] >> 8);
        }
+        iow(db, DM9000_RCR, rcr);
        spin_unlock_irqrestore(&db->lock, flags);
 }
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index cdf3090a1885..2d139ec79777 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -960,7 +960,7 @@ static void e100_get_defaults(struct nic *nic)
        /* Template for a freshly allocated RFD */
        nic->blank_rfd.command = 0;
-        nic->blank_rfd.rbd = 0xFFFFFFFF;
+        nic->blank_rfd.rbd = cpu_to_le32(0xFFFFFFFF);
        nic->blank_rfd.size = cpu_to_le16(VLAN_ETH_FRAME_LEN);
        /* MII setup */
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 7c4ead35cfa2..93b7fb246960 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0087"
+#define DRV_VERSION     "EHEA_0089"
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 21af674b764e..07c742dd3f09 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -3108,7 +3108,7 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter,
        dev->vlan_rx_add_vid = ehea_vlan_rx_add_vid;
        dev->vlan_rx_kill_vid = ehea_vlan_rx_kill_vid;
        dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO
-                      | NETIF_F_HIGHDMA | NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_TX
+                      | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX
                      | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER
                      | NETIF_F_LLTX;
        dev->tx_timeout = &ehea_tx_watchdog;
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 58b71e60204e..fe59c27c09e3 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -1057,6 +1057,7 @@ static int mpc52xx_fec_of_resume(struct of_device *op)
 #endif
 static struct of_device_id mpc52xx_fec_match[] = {
+        { .type = "network", .compatible = "fsl,mpc5200b-fec", },
        { .type = "network", .compatible = "fsl,mpc5200-fec", },
        { .type = "network", .compatible = "mpc5200-fec", },
        { }
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 6a3ac4ea97e9..1d0cd1dd955e 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -179,6 +179,7 @@ static int mpc52xx_fec_mdio_remove(struct of_device *of)
 static struct of_device_id mpc52xx_fec_mdio_match[] = {
        { .compatible = "fsl,mpc5200b-mdio", },
+        { .compatible = "fsl,mpc5200-mdio", },
        { .compatible = "mpc5200b-fec-phy", },
        {}
 };
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 6f7e3fde9e7c..419f533006ab 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -1854,6 +1854,7 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct ring_desc* start_tx;
        struct ring_desc* prev_tx;
        struct nv_skb_map* prev_tx_ctx;
+        unsigned long flags;
        /* add fragments to entries count */
        for (i = 0; i < fragments; i++) {
@@ -1863,10 +1864,10 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
        empty_slots = nv_get_empty_tx_slots(np);
        if (unlikely(empty_slots <= entries)) {
-                spin_lock_irq(&np->lock);
+                spin_lock_irqsave(&np->lock, flags);
                netif_stop_queue(dev);
                np->tx_stop = 1;
-                spin_unlock_irq(&np->lock);
+                spin_unlock_irqrestore(&np->lock, flags);
                return NETDEV_TX_BUSY;
        }
@@ -1929,13 +1930,13 @@ static int nv_start_xmit(struct sk_buff *skb, struct net_device *dev)
                tx_flags_extra = skb->ip_summed == CHECKSUM_PARTIAL ?
                         NV_TX2_CHECKSUM_L3 | NV_TX2_CHECKSUM_L4 : 0;
-        spin_lock_irq(&np->lock);
+        spin_lock_irqsave(&np->lock, flags);
        /* set tx flags */
        start_tx->flaglen |= cpu_to_le32(tx_flags | tx_flags_extra);
        np->put_tx.orig = put_tx;
-        spin_unlock_irq(&np->lock);
+        spin_unlock_irqrestore(&np->lock, flags);
        dprintk(KERN_DEBUG "%s: nv_start_xmit: entries %d queued for transmission. tx_flags_extra: %x\n",
                dev->name, entries, tx_flags_extra);
@@ -1971,6 +1972,7 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
        struct ring_desc_ex* prev_tx;
        struct nv_skb_map* prev_tx_ctx;
        struct nv_skb_map* start_tx_ctx;
+        unsigned long flags;
        /* add fragments to entries count */
        for (i = 0; i < fragments; i++) {
@@ -1980,10 +1982,10 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
        empty_slots = nv_get_empty_tx_slots(np);
        if (unlikely(empty_slots <= entries)) {
-                spin_lock_irq(&np->lock);
+                spin_lock_irqsave(&np->lock, flags);
                netif_stop_queue(dev);
                np->tx_stop = 1;
-                spin_unlock_irq(&np->lock);
+                spin_unlock_irqrestore(&np->lock, flags);
                return NETDEV_TX_BUSY;
        }
@@ -2059,7 +2061,7 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
                        start_tx->txvlan = 0;
        }
-        spin_lock_irq(&np->lock);
+        spin_lock_irqsave(&np->lock, flags);
        if (np->tx_limit) {
                /* Limit the number of outstanding tx. Setup all fragments, but
@@ -2085,7 +2087,7 @@ static int nv_start_xmit_optimized(struct sk_buff *skb, struct net_device *dev)
        start_tx->flaglen |= cpu_to_le32(tx_flags | tx_flags_extra);
        np->put_tx.ex = put_tx;
-        spin_unlock_irq(&np->lock);
+        spin_unlock_irqrestore(&np->lock, flags);
        dprintk(KERN_DEBUG "%s: nv_start_xmit_optimized: entries %d queued for transmission. tx_flags_extra: %x\n",
                dev->name, entries, tx_flags_extra);
@@ -2110,9 +2112,8 @@ static inline void nv_tx_flip_ownership(struct net_device *dev)
        np->tx_pkts_in_progress--;
        if (np->tx_change_owner) {
-                __le32 flaglen = le32_to_cpu(np->tx_change_owner->first_tx_desc->flaglen);
+                np->tx_change_owner->first_tx_desc->flaglen |=
-                flaglen |= NV_TX2_VALID;
+                        cpu_to_le32(NV_TX2_VALID);
-                np->tx_change_owner->first_tx_desc->flaglen = cpu_to_le32(flaglen);
                np->tx_pkts_in_progress++;
                np->tx_change_owner = np->tx_change_owner->next_tx_ctx;
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 0789802d59ed..378a23963495 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1242,8 +1242,8 @@ static int emac_close(struct net_device *ndev)
 static inline u16 emac_tx_csum(struct emac_instance *dev,
                               struct sk_buff *skb)
 {
-        if (emac_has_feature(dev, EMAC_FTR_HAS_TAH &&
+        if (emac_has_feature(dev, EMAC_FTR_HAS_TAH) &&
-                             skb->ip_summed == CHECKSUM_PARTIAL)) {
+                (skb->ip_summed == CHECKSUM_PARTIAL)) {
                ++dev->stats.tx_packets_csum;
                return EMAC_TX_CTRL_TAH_CSUM;
        }
diff --git a/drivers/net/igb/e1000_82575.h b/drivers/net/igb/e1000_82575.h
index 6604d96bd567..76ea846663db 100644
--- a/drivers/net/igb/e1000_82575.h
+++ b/drivers/net/igb/e1000_82575.h
@@ -61,28 +61,28 @@
 /* Receive Descriptor - Advanced */
 union e1000_adv_rx_desc {
        struct {
-                u64 pkt_addr;             /* Packet buffer address */
+                __le64 pkt_addr;             /* Packet buffer address */
-                u64 hdr_addr;             /* Header buffer address */
+                __le64 hdr_addr;             /* Header buffer address */
        } read;
        struct {
                struct {
                        struct {
-                                u16 pkt_info;   /* RSS type, Packet type */
+                                __le16 pkt_info;   /* RSS type, Packet type */
-                                u16 hdr_info;   /* Split Header,
+                                __le16 hdr_info;   /* Split Header,
-                                                 * header buffer length */
+                                                    * header buffer length */
                        } lo_dword;
                        union {
-                                u32 rss;          /* RSS Hash */
+                                __le32 rss;          /* RSS Hash */
                                struct {
-                                        u16 ip_id;    /* IP id */
+                                        __le16 ip_id;    /* IP id */
-                                        u16 csum;     /* Packet Checksum */
+                                        __le16 csum;     /* Packet Checksum */
                                } csum_ip;
                        } hi_dword;
                } lower;
                struct {
-                        u32 status_error;     /* ext status/error */
+                        __le32 status_error;     /* ext status/error */
-                        u16 length;           /* Packet length */
+                        __le16 length;           /* Packet length */
-                        u16 vlan;             /* VLAN tag */
+                        __le16 vlan;             /* VLAN tag */
                } upper;
        } wb;  /* writeback */
 };
@@ -97,14 +97,14 @@ union e1000_adv_rx_desc {
 /* Transmit Descriptor - Advanced */
 union e1000_adv_tx_desc {
        struct {
-                u64 buffer_addr;    /* Address of descriptor's data buf */
+                __le64 buffer_addr;    /* Address of descriptor's data buf */
-                u32 cmd_type_len;
+                __le32 cmd_type_len;
-                u32 olinfo_status;
+                __le32 olinfo_status;
        } read;
        struct {
-                u64 rsvd;       /* Reserved */
+                __le64 rsvd;       /* Reserved */
-                u32 nxtseq_seed;
+                __le32 nxtseq_seed;
-                u32 status;
+                __le32 status;
        } wb;
 };
@@ -119,10 +119,10 @@ union e1000_adv_tx_desc {
 /* Context descriptors */
 struct e1000_adv_tx_context_desc {
-        u32 vlan_macip_lens;
+        __le32 vlan_macip_lens;
-        u32 seqnum_seed;
+        __le32 seqnum_seed;
-        u32 type_tucmd_mlhl;
+        __le32 type_tucmd_mlhl;
-        u32 mss_l4len_idx;
+        __le32 mss_l4len_idx;
 };
 #define E1000_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index 161fb68764af..7b2c70a3b8cc 100644
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -143,35 +143,35 @@ enum e1000_fc_type {
 /* Receive Descriptor */
 struct e1000_rx_desc {
-        u64 buffer_addr; /* Address of the descriptor's data buffer */
+        __le64 buffer_addr; /* Address of the descriptor's data buffer */
-        u16 length;      /* Length of data DMAed into data buffer */
+        __le16 length;      /* Length of data DMAed into data buffer */
-        u16 csum;        /* Packet checksum */
+        __le16 csum;        /* Packet checksum */
        u8  status;      /* Descriptor status */
        u8  errors;      /* Descriptor Errors */
-        u16 special;
+        __le16 special;
 };
 /* Receive Descriptor - Extended */
 union e1000_rx_desc_extended {
        struct {
-                u64 buffer_addr;
+                __le64 buffer_addr;
-                u64 reserved;
+                __le64 reserved;
        } read;
        struct {
                struct {
-                        u32 mrq;              /* Multiple Rx Queues */
+                        __le32 mrq;              /* Multiple Rx Queues */
                        union {
-                                u32 rss;            /* RSS Hash */
+                                __le32 rss;            /* RSS Hash */
                                struct {
-                                        u16 ip_id;  /* IP id */
+                                        __le16 ip_id;  /* IP id */
-                                        u16 csum;   /* Packet Checksum */
+                                        __le16 csum;   /* Packet Checksum */
                                } csum_ip;
                        } hi_dword;
                } lower;
                struct {
-                        u32 status_error;     /* ext status/error */
+                        __le32 status_error;     /* ext status/error */
-                        u16 length;
+                        __le16 length;
-                        u16 vlan;             /* VLAN tag */
+                        __le16 vlan;             /* VLAN tag */
                } upper;
        } wb;  /* writeback */
 };
@@ -181,49 +181,49 @@ union e1000_rx_desc_extended {
 union e1000_rx_desc_packet_split {
        struct {
                /* one buffer for protocol header(s), three data buffers */
-                u64 buffer_addr[MAX_PS_BUFFERS];
+                __le64 buffer_addr[MAX_PS_BUFFERS];
        } read;
        struct {
                struct {
-                        u32 mrq;              /* Multiple Rx Queues */
+                        __le32 mrq;              /* Multiple Rx Queues */
                        union {
-                                u32 rss;              /* RSS Hash */
+                                __le32 rss;              /* RSS Hash */
                                struct {
-                                        u16 ip_id;    /* IP id */
+                                        __le16 ip_id;    /* IP id */
-                                        u16 csum;     /* Packet Checksum */
+                                        __le16 csum;     /* Packet Checksum */
                                } csum_ip;
                        } hi_dword;
                } lower;
                struct {
-                        u32 status_error;     /* ext status/error */
+                        __le32 status_error;     /* ext status/error */
-                        u16 length0;          /* length of buffer 0 */
+                        __le16 length0;          /* length of buffer 0 */
-                        u16 vlan;             /* VLAN tag */
+                        __le16 vlan;             /* VLAN tag */
                } middle;
                struct {
-                        u16 header_status;
+                        __le16 header_status;
-                        u16 length[3];        /* length of buffers 1-3 */
+                        __le16 length[3];        /* length of buffers 1-3 */
                } upper;
-                u64 reserved;
+                __le64 reserved;
        } wb; /* writeback */
 };
 /* Transmit Descriptor */
 struct e1000_tx_desc {
-        u64 buffer_addr;      /* Address of the descriptor's data buffer */
+        __le64 buffer_addr;      /* Address of the descriptor's data buffer */
        union {
-                u32 data;
+                __le32 data;
                struct {
-                        u16 length;    /* Data buffer length */
+                        __le16 length;    /* Data buffer length */
                        u8 cso;        /* Checksum offset */
                        u8 cmd;        /* Descriptor control */
                } flags;
        } lower;
        union {
-                u32 data;
+                __le32 data;
                struct {
                        u8 status;     /* Descriptor status */
                        u8 css;        /* Checksum start */
-                        u16 special;
+                        __le16 special;
                } fields;
        } upper;
 };
@@ -231,49 +231,49 @@ struct e1000_tx_desc {
 /* Offload Context Descriptor */
 struct e1000_context_desc {
        union {
-                u32 ip_config;
+                __le32 ip_config;
                struct {
                        u8 ipcss;      /* IP checksum start */
                        u8 ipcso;      /* IP checksum offset */
-                        u16 ipcse;     /* IP checksum end */
+                        __le16 ipcse;     /* IP checksum end */
                } ip_fields;
        } lower_setup;
        union {
-                u32 tcp_config;
+                __le32 tcp_config;
                struct {
                        u8 tucss;      /* TCP checksum start */
                        u8 tucso;      /* TCP checksum offset */
-                        u16 tucse;     /* TCP checksum end */
+                        __le16 tucse;     /* TCP checksum end */
                } tcp_fields;
        } upper_setup;
-        u32 cmd_and_length;
+        __le32 cmd_and_length;
        union {
-                u32 data;
+                __le32 data;
                struct {
                        u8 status;     /* Descriptor status */
                        u8 hdr_len;    /* Header length */
-                        u16 mss;       /* Maximum segment size */
+                        __le16 mss;       /* Maximum segment size */
                } fields;
        } tcp_seg_setup;
 };
 /* Offload data descriptor */
 struct e1000_data_desc {
-        u64 buffer_addr;   /* Address of the descriptor's buffer address */
+        __le64 buffer_addr;   /* Address of the descriptor's buffer address */
        union {
-                u32 data;
+                __le32 data;
                struct {
-                        u16 length;    /* Data buffer length */
+                        __le16 length;    /* Data buffer length */
                        u8 typ_len_ext;
                        u8 cmd;
                } flags;
        } lower;
        union {
-                u32 data;
+                __le32 data;
                struct {
                        u8 status;     /* Descriptor status */
                        u8 popts;      /* Packet Options */
-                        u16 special;
+                        __le16 special;
                } fields;
        } upper;
 };
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 928ce8287e69..aaee02e9e3f0 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3254,6 +3254,13 @@ quit_polling:
        return 1;
 }
+static inline u32 get_head(struct igb_ring *tx_ring)
+{
+        void *end = (struct e1000_tx_desc *)tx_ring->desc + tx_ring->count;
+        return le32_to_cpu(*(volatile __le32 *)end);
+}
 /**
 * igb_clean_tx_irq - Reclaim resources after transmit completes
 * @adapter: board private structure
@@ -3275,9 +3282,7 @@ static bool igb_clean_tx_irq(struct igb_adapter *adapter,
        unsigned int total_bytes = 0, total_packets = 0;
        rmb();
-        head = *(volatile u32 *)((struct e1000_tx_desc *)tx_ring->desc
+        head = get_head(tx_ring);
-                                 + tx_ring->count);
-        head = le32_to_cpu(head);
        i = tx_ring->next_to_clean;
        while (1) {
                while (i != head) {
@@ -3312,9 +3317,7 @@ static bool igb_clean_tx_irq(struct igb_adapter *adapter,
                }
                oldhead = head;
                rmb();
-                head = *(volatile u32 *)((struct e1000_tx_desc *)tx_ring->desc
+                head = get_head(tx_ring);
-                                         + tx_ring->count);
-                head = le32_to_cpu(head);
                if (head == oldhead)
                        goto done_cleaning;
        }  /* while (1) */
@@ -3388,7 +3391,7 @@ done_cleaning:
 * @vlan: descriptor vlan field as written by hardware (no le/be conversion)
 * @skb: pointer to sk_buff to be indicated to stack
 **/
-static void igb_receive_skb(struct igb_adapter *adapter, u8 status, u16 vlan,
+static void igb_receive_skb(struct igb_adapter *adapter, u8 status, __le16 vlan,
                            struct sk_buff *skb)
 {
        if (adapter->vlgrp && (status & E1000_RXD_STAT_VP))
@@ -3452,8 +3455,8 @@ static bool igb_clean_rx_irq_adv(struct igb_adapter *adapter,
                 * that case, it fills the header buffer and spills the rest
                 * into the page.
                 */
-                hlen = le16_to_cpu((rx_desc->wb.lower.lo_dword.hdr_info &
+                hlen = (le16_to_cpu(rx_desc->wb.lower.lo_dword.hdr_info) &
-                  E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT);
+                  E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT;
                if (hlen > adapter->rx_ps_hdr_size)
                        hlen = adapter->rx_ps_hdr_size;
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 269e6f805f47..6738b4d097fe 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -2088,14 +2088,12 @@ ixgb_alloc_rx_buffers(struct ixgb_adapter *adapter)
        struct ixgb_buffer *buffer_info;
        struct sk_buff *skb;
        unsigned int i;
-        int num_group_tail_writes;
        long cleancount;
        i = rx_ring->next_to_use;
        buffer_info = &rx_ring->buffer_info[i];
        cleancount = IXGB_DESC_UNUSED(rx_ring);
-        num_group_tail_writes = IXGB_RX_BUFFER_WRITE;
        /* leave three descriptors unused */
        while(--cleancount > 2) {
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 2bc5eaae141f..7f20a03623a0 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -85,7 +85,7 @@
        (sizeof(struct netxen_cmd_buffer) * adapter->max_tx_desc_count)
 #define RCV_BUFFSIZE    \
        (sizeof(struct netxen_rx_buffer) * rcv_desc->max_rx_desc_count)
-#define find_diff_among(a,b,range) ((a)<=(b)?((b)-(a)):((b)+(range)-(a)))
+#define find_diff_among(a,b,range) ((a)<(b)?((b)-(a)):((b)+(range)-(a)))
 #define NETXEN_NETDEV_STATUS            0x1
 #define NETXEN_RCV_PRODUCER_OFFSET      0
@@ -204,7 +204,7 @@ enum {
                        ? RCV_DESC_LRO :        \
                        (RCV_DESC_NORMAL)))
-#define MAX_CMD_DESCRIPTORS             1024
+#define MAX_CMD_DESCRIPTORS             4096
 #define MAX_RCV_DESCRIPTORS             16384
 #define MAX_CMD_DESCRIPTORS_HOST        (MAX_CMD_DESCRIPTORS / 4)
 #define MAX_RCV_DESCRIPTORS_1G          (MAX_RCV_DESCRIPTORS / 4)
@@ -818,15 +818,8 @@ struct netxen_adapter_stats {
        u64  badskblen;
        u64  nocmddescriptor;
        u64  polled;
-        u64  uphappy;
+        u64  rxdropped;
-        u64  updropped;
-        u64  uplcong;
-        u64  uphcong;
-        u64  upmcong;
-        u64  updunno;
-        u64  skbfreed;
        u64  txdropped;
-        u64  txnullskb;
        u64  csummed;
        u64  no_rcv;
        u64  rxbytes;
@@ -842,7 +835,6 @@ struct netxen_rcv_desc_ctx {
        u32 flags;
        u32 producer;
        u32 rcv_pending;        /* Num of bufs posted in phantom */
-        u32 rcv_free;           /* Num of bufs in free list */
        dma_addr_t phys_addr;
        struct pci_dev *phys_pdev;
        struct rcv_desc *desc_head;     /* address of rx ring in Phantom */
@@ -889,8 +881,6 @@ struct netxen_adapter {
        int mtu;
        int portnum;
-        spinlock_t tx_lock;
-        spinlock_t lock;
        struct work_struct watchdog_task;
        struct timer_list watchdog_timer;
        struct work_struct  tx_timeout_task;
@@ -899,16 +889,12 @@ struct netxen_adapter {
        u32 cmd_producer;
        __le32 *cmd_consumer;
        u32 last_cmd_consumer;
        u32 max_tx_desc_count;
        u32 max_rx_desc_count;
        u32 max_jumbo_rx_desc_count;
        u32 max_lro_rx_desc_count;
-        /* Num of instances active on cmd buffer ring */
-        u32 proc_cmd_buf_counter;
-        u32 num_threads, total_threads; /*Use to keep track of xmit threads */
        u32 flags;
        u32 irq;
@@ -942,6 +928,7 @@ struct netxen_adapter {
        struct pci_dev *ctx_desc_pdev;
        dma_addr_t ctx_desc_phys_addr;
        int intr_scheme;
+        int msi_mode;
        int (*enable_phy_interrupts) (struct netxen_adapter *);
        int (*disable_phy_interrupts) (struct netxen_adapter *);
        void (*handle_phy_intr) (struct netxen_adapter *);
@@ -1075,12 +1062,10 @@ void netxen_tso_check(struct netxen_adapter *adapter,
                      struct cmd_desc_type0 *desc, struct sk_buff *skb);
 int netxen_nic_hw_resources(struct netxen_adapter *adapter);
 void netxen_nic_clear_stats(struct netxen_adapter *adapter);
-int netxen_nic_rx_has_work(struct netxen_adapter *adapter);
-int netxen_nic_tx_has_work(struct netxen_adapter *adapter);
 void netxen_watchdog_task(struct work_struct *work);
 void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx,
                            u32 ringid);
-int netxen_process_cmd_ring(unsigned long data);
+int netxen_process_cmd_ring(struct netxen_adapter *adapter);
 u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctx, int max);
 void netxen_nic_set_multi(struct net_device *netdev);
 int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index 7a876f4b8db2..6e98d830eefb 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -64,15 +64,7 @@ static const struct netxen_nic_stats netxen_nic_gstrings_stats[] = {
        {"bad_skb_len", NETXEN_NIC_STAT(stats.badskblen)},
        {"no_cmd_desc", NETXEN_NIC_STAT(stats.nocmddescriptor)},
        {"polled", NETXEN_NIC_STAT(stats.polled)},
-        {"uphappy", NETXEN_NIC_STAT(stats.uphappy)},
-        {"updropped", NETXEN_NIC_STAT(stats.updropped)},
-        {"uplcong", NETXEN_NIC_STAT(stats.uplcong)},
-        {"uphcong", NETXEN_NIC_STAT(stats.uphcong)},
-        {"upmcong", NETXEN_NIC_STAT(stats.upmcong)},
-        {"updunno", NETXEN_NIC_STAT(stats.updunno)},
-        {"skb_freed", NETXEN_NIC_STAT(stats.skbfreed)},
        {"tx_dropped", NETXEN_NIC_STAT(stats.txdropped)},
-        {"tx_null_skb", NETXEN_NIC_STAT(stats.txnullskb)},
        {"csummed", NETXEN_NIC_STAT(stats.csummed)},
        {"no_rcv", NETXEN_NIC_STAT(stats.no_rcv)},
        {"rx_bytes", NETXEN_NIC_STAT(stats.rxbytes)},
diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index d72f8f8fcb50..160f605e58db 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -456,6 +456,12 @@ enum {
 #define ISR_INT_MASK_SLOW       (NETXEN_PCIX_PS_REG(PCIX_INT_MASK))
 #define ISR_INT_TARGET_STATUS   (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS))
 #define ISR_INT_TARGET_MASK     (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK))
+#define ISR_INT_TARGET_STATUS_F1   (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F1))
+#define ISR_INT_TARGET_MASK_F1     (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F1))
+#define ISR_INT_TARGET_STATUS_F2   (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F2))
+#define ISR_INT_TARGET_MASK_F2     (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F2))
+#define ISR_INT_TARGET_STATUS_F3   (NETXEN_PCIX_PS_REG(PCIX_TARGET_STATUS_F3))
+#define ISR_INT_TARGET_MASK_F3     (NETXEN_PCIX_PS_REG(PCIX_TARGET_MASK_F3))
 #define NETXEN_PCI_MAPSIZE      128
 #define NETXEN_PCI_DDR_NET      (0x00000000UL)
@@ -662,6 +668,12 @@ enum {
 #define PCIX_TARGET_STATUS      (0x10118)
 #define PCIX_TARGET_MASK        (0x10128)
+#define PCIX_TARGET_STATUS_F1 (0x10160)
+#define PCIX_TARGET_MASK_F1   (0x10170)
+#define PCIX_TARGET_STATUS_F2 (0x10164)
+#define PCIX_TARGET_MASK_F2   (0x10174)
+#define PCIX_TARGET_STATUS_F3 (0x10168)
+#define PCIX_TARGET_MASK_F3   (0x10178)
 #define PCIX_MSI_F0             (0x13000)
 #define PCIX_MSI_F1             (0x13004)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 01355701bf8e..05748ca6f216 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -398,6 +398,8 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
                NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_FW));
        printk(KERN_NOTICE "%s: FW capabilities:0x%x\n", netxen_nic_driver_name,
                        adapter->intr_scheme);
+        adapter->msi_mode = readl(
+                NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_FW));
        DPRINTK(INFO, "Receive Peg ready too. starting stuff\n");
        addr = netxen_alloc(adapter->ahw.pdev,
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 9e38bcb3fba9..45fa33e0cb90 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -145,6 +145,8 @@ int netxen_init_firmware(struct netxen_adapter *adapter)
        /* Window 1 call */
        writel(INTR_SCHEME_PERPORT,
               NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_CAPABILITIES_HOST));
+        writel(MSI_MODE_MULTIFUNC,
+               NETXEN_CRB_NORMALIZE(adapter, CRB_NIC_MSI_MODE_HOST));
        writel(MPORT_MULTI_FUNCTION_MODE,
               NETXEN_CRB_NORMALIZE(adapter, CRB_MPORT_MODE));
        writel(PHAN_INITIALIZE_ACK,
@@ -183,7 +185,6 @@ void netxen_initialize_adapter_sw(struct netxen_adapter *adapter)
                for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
                        struct netxen_rx_buffer *rx_buf;
                        rcv_desc = &adapter->recv_ctx[ctxid].rcv_desc[ring];
-                        rcv_desc->rcv_free = rcv_desc->max_rx_desc_count;
                        rcv_desc->begin_alloc = 0;
                        rx_buf = rcv_desc->rx_buf_arr;
                        num_rx_bufs = rcv_desc->max_rx_desc_count;
@@ -974,28 +975,6 @@ int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val)
        return 0;
 }
-int netxen_nic_rx_has_work(struct netxen_adapter *adapter)
-{
-        int ctx;
-        for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
-                struct netxen_recv_context *recv_ctx =
-                    &(adapter->recv_ctx[ctx]);
-                u32 consumer;
-                struct status_desc *desc_head;
-                struct status_desc *desc;
-                consumer = recv_ctx->status_rx_consumer;
-                desc_head = recv_ctx->rcv_status_desc_head;
-                desc = &desc_head[consumer];
-                if (netxen_get_sts_owner(desc) & STATUS_OWNER_HOST)
-                        return 1;
-        }
-        return 0;
-}
 static int netxen_nic_check_temp(struct netxen_adapter *adapter)
 {
        struct net_device *netdev = adapter->netdev;
@@ -1038,7 +1017,6 @@ static int netxen_nic_check_temp(struct netxen_adapter *adapter)
 void netxen_watchdog_task(struct work_struct *work)
 {
-        struct net_device *netdev;
        struct netxen_adapter *adapter =
                container_of(work, struct netxen_adapter, watchdog_task);
@@ -1048,20 +1026,6 @@ void netxen_watchdog_task(struct work_struct *work)
        if (adapter->handle_phy_intr)
                adapter->handle_phy_intr(adapter);
-        netdev = adapter->netdev;
-        if ((netif_running(netdev)) && !netif_carrier_ok(netdev) &&
-                        netxen_nic_link_ok(adapter) ) {
-                printk(KERN_INFO "%s %s (port %d), Link is up\n",
-                               netxen_nic_driver_name, netdev->name, adapter->portnum);
-                netif_carrier_on(netdev);
-                netif_wake_queue(netdev);
-        } else if(!(netif_running(netdev)) && netif_carrier_ok(netdev)) {
-                printk(KERN_ERR "%s %s Link is Down\n",
-                                netxen_nic_driver_name, netdev->name);
-                netif_carrier_off(netdev);
-                netif_stop_queue(netdev);
-        }
        mod_timer(&adapter->watchdog_timer, jiffies + 2 * HZ);
 }
@@ -1125,7 +1089,7 @@ static void netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
        skb = (struct sk_buff *)buffer->skb;
        if (likely(adapter->rx_csum &&
-                                netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) {
+                        netxen_get_sts_status(sts_data) == STATUS_CKSUM_OK)) {
                adapter->stats.csummed++;
                skb->ip_summed = CHECKSUM_UNNECESSARY;
        } else
@@ -1142,40 +1106,8 @@ static void netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
        skb->protocol = eth_type_trans(skb, netdev);
        ret = netif_receive_skb(skb);
-        /*
-         * RH: Do we need these stats on a regular basis. Can we get it from
-         * Linux stats.
-         */
-        switch (ret) {
-        case NET_RX_SUCCESS:
-                adapter->stats.uphappy++;
-                break;
-        case NET_RX_CN_LOW:
-                adapter->stats.uplcong++;
-                break;
-        case NET_RX_CN_MOD:
-                adapter->stats.upmcong++;
-                break;
-        case NET_RX_CN_HIGH:
-                adapter->stats.uphcong++;
-                break;
-        case NET_RX_DROP:
-                adapter->stats.updropped++;
-                break;
-        default:
-                adapter->stats.updunno++;
-                break;
-        }
        netdev->last_rx = jiffies;
-        rcv_desc->rcv_free++;
        rcv_desc->rcv_pending--;
        /*
@@ -1200,13 +1132,6 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
        u32 producer = 0;
        int count = 0, ring;
-        DPRINTK(INFO, "procesing receive\n");
-        /*
-         * we assume in this case that there is only one port and that is
-         * port #1...changes need to be done in firmware to indicate port
-         * number as part of the descriptor. This way we will be able to get
-         * the netdev which is associated with that device.
-         */
        while (count < max) {
                desc = &desc_head[consumer];
                if (!(netxen_get_sts_owner(desc) & STATUS_OWNER_HOST)) {
@@ -1219,11 +1144,8 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                consumer = (consumer + 1) & (adapter->max_rx_desc_count - 1);
                count++;
        }
-        if (count) {
+        for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++)
-                for (ring = 0; ring < NUM_RCV_DESC_RINGS; ring++) {
+                netxen_post_rx_buffers_nodb(adapter, ctxid, ring);
-                        netxen_post_rx_buffers_nodb(adapter, ctxid, ring);
-                }
-        }
        /* update the consumer index in phantom */
        if (count) {
@@ -1233,108 +1155,60 @@ u32 netxen_process_rcv_ring(struct netxen_adapter *adapter, int ctxid, int max)
                /* Window = 1 */
                writel(consumer,
                       NETXEN_CRB_NORMALIZE(adapter,
-                                            recv_crb_registers[adapter->portnum].
+                                    recv_crb_registers[adapter->portnum].
                                            crb_rcv_status_consumer));
-                wmb();
        }
        return count;
 }
 /* Process Command status ring */
-int netxen_process_cmd_ring(unsigned long data)
+int netxen_process_cmd_ring(struct netxen_adapter *adapter)
 {
-        u32 last_consumer;
+        u32 last_consumer, consumer;
-        u32 consumer;
+        int count = 0, i;
-        struct netxen_adapter *adapter = (struct netxen_adapter *)data;
-        int count1 = 0;
-        int count2 = 0;
        struct netxen_cmd_buffer *buffer;
-        struct pci_dev *pdev;
+        struct pci_dev *pdev = adapter->pdev;
+        struct net_device *netdev = adapter->netdev;
        struct netxen_skb_frag *frag;
-        u32 i;
+        int done = 0;
-        int done;
-        spin_lock(&adapter->tx_lock);
        last_consumer = adapter->last_cmd_consumer;
-        DPRINTK(INFO, "procesing xmit complete\n");
-        /* we assume in this case that there is only one port and that is
-         * port #1...changes need to be done in firmware to indicate port
-         * number as part of the descriptor. This way we will be able to get
-         * the netdev which is associated with that device.
-         */
        consumer = le32_to_cpu(*(adapter->cmd_consumer));
-        if (last_consumer == consumer) {        /* Ring is empty    */
-                DPRINTK(INFO, "last_consumer %d == consumer %d\n",
-                        last_consumer, consumer);
-                spin_unlock(&adapter->tx_lock);
-                return 1;
-        }
-        adapter->proc_cmd_buf_counter++;
-        /*
-         * Not needed - does not seem to be used anywhere.
-         * adapter->cmd_consumer = consumer;
-         */
-        spin_unlock(&adapter->tx_lock);
-        while ((last_consumer != consumer) && (count1 < MAX_STATUS_HANDLE)) {
+        while (last_consumer != consumer) {
                buffer = &adapter->cmd_buf_arr[last_consumer];
-                pdev = adapter->pdev;
                if (buffer->skb) {
                        frag = &buffer->frag_array[0];
                        pci_unmap_single(pdev, frag->dma, frag->length,
                                         PCI_DMA_TODEVICE);
                        frag->dma = 0ULL;
                        for (i = 1; i < buffer->frag_count; i++) {
-                                DPRINTK(INFO, "getting fragment no %d\n", i);
                                frag++; /* Get the next frag */
                                pci_unmap_page(pdev, frag->dma, frag->length,
                                               PCI_DMA_TODEVICE);
                                frag->dma = 0ULL;
                        }
-                        adapter->stats.skbfreed++;
+                        adapter->stats.xmitfinished++;
                        dev_kfree_skb_any(buffer->skb);
                        buffer->skb = NULL;
-                } else if (adapter->proc_cmd_buf_counter == 1) {
-                        adapter->stats.txnullskb++;
-                }
-                if (unlikely(netif_queue_stopped(adapter->netdev)
-                             && netif_carrier_ok(adapter->netdev))
-                    && ((jiffies - adapter->netdev->trans_start) >
-                        adapter->netdev->watchdog_timeo)) {
-                        SCHEDULE_WORK(&adapter->tx_timeout_task);
                }
                last_consumer = get_next_index(last_consumer,
                                               adapter->max_tx_desc_count);
-                count1++;
+                if (++count >= MAX_STATUS_HANDLE)
+                        break;
        }
-        count2 = 0;
+        if (count) {
-        spin_lock(&adapter->tx_lock);
-        if ((--adapter->proc_cmd_buf_counter) == 0) {
                adapter->last_cmd_consumer = last_consumer;
-                while ((adapter->last_cmd_consumer != consumer)
+                smp_mb();
-                       && (count2 < MAX_STATUS_HANDLE)) {
+                if (netif_queue_stopped(netdev) && netif_running(netdev)) {
-                        buffer =
+                        netif_tx_lock(netdev);
-                            &adapter->cmd_buf_arr[adapter->last_cmd_consumer];
+                        netif_wake_queue(netdev);
-                        count2++;
+                        smp_mb();
-                        if (buffer->skb)
+                        netif_tx_unlock(netdev);
-                                break;
-                        else
-                                adapter->last_cmd_consumer =
-                                    get_next_index(adapter->last_cmd_consumer,
-                                                   adapter->max_tx_desc_count);
-                }
-        }
-        if (count1 || count2) {
-                if (netif_queue_stopped(adapter->netdev)
-                    && (adapter->flags & NETXEN_NETDEV_STATUS)) {
-                        netif_wake_queue(adapter->netdev);
-                        adapter->flags &= ~NETXEN_NETDEV_STATUS;
                }
        }
        /*
@@ -1350,16 +1224,9 @@ int netxen_process_cmd_ring(unsigned long data)
         * There is still a possible race condition and the host could miss an
         * interrupt. The card has to take care of this.
         */
-        if (adapter->last_cmd_consumer == consumer &&
+        consumer = le32_to_cpu(*(adapter->cmd_consumer));
-            (((adapter->cmd_producer + 1) %
+        done = (last_consumer == consumer);
-              adapter->max_tx_desc_count) == adapter->last_cmd_consumer)) {
-                consumer = le32_to_cpu(*(adapter->cmd_consumer));
-        }
-        done = (adapter->last_cmd_consumer == consumer);
-        spin_unlock(&adapter->tx_lock);
-        DPRINTK(INFO, "last consumer is %d in %s\n", last_consumer,
-                __FUNCTION__);
        return (done);
 }
@@ -1433,8 +1300,6 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                rcv_desc->begin_alloc = index;
                rcv_desc->rcv_pending += count;
                rcv_desc->producer = producer;
-                if (rcv_desc->rcv_free >= 32) {
-                        rcv_desc->rcv_free = 0;
                        /* Window = 1 */
                        writel((producer - 1) &
                               (rcv_desc->max_rx_desc_count - 1),
@@ -1458,8 +1323,6 @@ void netxen_post_rx_buffers(struct netxen_adapter *adapter, u32 ctx, u32 ringid)
                        writel(msg,
                               DB_NORMALIZE(adapter,
                                            NETXEN_RCV_PRODUCER_OFFSET));
-                        wmb();
-                }
        }
 }
@@ -1523,8 +1386,6 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
                rcv_desc->begin_alloc = index;
                rcv_desc->rcv_pending += count;
                rcv_desc->producer = producer;
-                if (rcv_desc->rcv_free >= 32) {
-                        rcv_desc->rcv_free = 0;
                        /* Window = 1 */
                        writel((producer - 1) &
                               (rcv_desc->max_rx_desc_count - 1),
@@ -1534,21 +1395,9 @@ static void netxen_post_rx_buffers_nodb(struct netxen_adapter *adapter,
                                                    rcv_desc_crb[ringid].
                                                    crb_rcv_producer_offset));
                        wmb();
-                }
        }
 }
-int netxen_nic_tx_has_work(struct netxen_adapter *adapter)
-{
-        if (find_diff_among(adapter->last_cmd_consumer,
-                            adapter->cmd_producer,
-                            adapter->max_tx_desc_count) > 0)
-                return 1;
-        return 0;
-}
 void netxen_nic_clear_stats(struct netxen_adapter *adapter)
 {
        memset(&adapter->stats, 0, sizeof(adapter->stats));
diff --git a/drivers/net/netxen/netxen_nic_isr.c b/drivers/net/netxen/netxen_nic_isr.c
index 48a404aa66ce..c81313b717bd 100644
--- a/drivers/net/netxen/netxen_nic_isr.c
+++ b/drivers/net/netxen/netxen_nic_isr.c
@@ -59,7 +59,7 @@ struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
        /* packet transmit problems */
        stats->tx_errors = adapter->stats.nocmddescriptor;
        /* no space in linux buffers    */
-        stats->rx_dropped = adapter->stats.updropped;
+        stats->rx_dropped = adapter->stats.rxdropped;
        /* no space available in linux  */
        stats->tx_dropped = adapter->stats.txdropped;
@@ -193,14 +193,14 @@ int netxen_nic_link_ok(struct netxen_adapter *adapter)
 void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter)
 {
        struct net_device *netdev = adapter->netdev;
-        u32 val, val1;
+        u32 val;
        /* WINDOW = 1 */
        val = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_XG_STATE));
        val >>= (physical_port[adapter->portnum] * 8);
-        val1 = val & 0xff;
+        val &= 0xff;
-        if (adapter->ahw.xg_linkup == 1 && val1 != XG_LINK_UP) {
+        if (adapter->ahw.xg_linkup == 1 && val != XG_LINK_UP) {
                printk(KERN_INFO "%s: %s NIC Link is down\n",
                       netxen_nic_driver_name, netdev->name);
                adapter->ahw.xg_linkup = 0;
@@ -208,16 +208,7 @@ void netxen_nic_xgbe_handle_phy_intr(struct netxen_adapter *adapter)
                        netif_carrier_off(netdev);
                        netif_stop_queue(netdev);
                }
-                /* read twice to clear sticky bits */
+        } else if (adapter->ahw.xg_linkup == 0 && val == XG_LINK_UP) {
-                /* WINDOW = 0 */
-                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val1);
-                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_STATUS, &val1);
-                if ((val & 0xffb) != 0xffb) {
-                        printk(KERN_INFO "%s ISR: Sync/Align BAD: 0x%08x\n",
-                               netxen_nic_driver_name, val1);
-                }
-        } else if (adapter->ahw.xg_linkup == 0 && val1 == XG_LINK_UP) {
                printk(KERN_INFO "%s: %s NIC Link is up\n",
                       netxen_nic_driver_name, netdev->name);
                adapter->ahw.xg_linkup = 1;
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 9737eae5ef11..a8fb439a4d03 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -63,12 +63,12 @@ static int netxen_nic_xmit_frame(struct sk_buff *, struct net_device *);
 static void netxen_tx_timeout(struct net_device *netdev);
 static void netxen_tx_timeout_task(struct work_struct *work);
 static void netxen_watchdog(unsigned long);
-static int netxen_handle_int(struct netxen_adapter *, struct net_device *);
 static int netxen_nic_poll(struct napi_struct *napi, int budget);
 #ifdef CONFIG_NET_POLL_CONTROLLER
 static void netxen_nic_poll_controller(struct net_device *netdev);
 #endif
 static irqreturn_t netxen_intr(int irq, void *data);
+static irqreturn_t netxen_msi_intr(int irq, void *data);
 int physical_port[] = {0, 1, 2, 3};
@@ -149,33 +149,30 @@ static void netxen_nic_update_cmd_consumer(struct netxen_adapter *adapter,
 #define ADAPTER_LIST_SIZE 12
+static uint32_t msi_tgt_status[4] = {
+        ISR_INT_TARGET_STATUS, ISR_INT_TARGET_STATUS_F1,
+        ISR_INT_TARGET_STATUS_F2, ISR_INT_TARGET_STATUS_F3
+};
+static uint32_t sw_int_mask[4] = {
+        CRB_SW_INT_MASK_0, CRB_SW_INT_MASK_1,
+        CRB_SW_INT_MASK_2, CRB_SW_INT_MASK_3
+};
 static void netxen_nic_disable_int(struct netxen_adapter *adapter)
 {
-        uint32_t        mask = 0x7ff;
+        u32 mask = 0x7ff;
        int retries = 32;
+        int port = adapter->portnum;
+        int pci_fn = adapter->ahw.pci_func;
-        DPRINTK(1, INFO, "Entered ISR Disable \n");
+        if (adapter->msi_mode != MSI_MODE_MULTIFUNC)
+                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port]));
-        switch (adapter->portnum) {
-        case 0:
-                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_0));
-                break;
-        case 1:
-                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_1));
-                break;
-        case 2:
-                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_2));
-                break;
-        case 3:
-                writel(0x0, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_3));
-                break;
-        }
        if (adapter->intr_scheme != -1 &&
            adapter->intr_scheme != INTR_SCHEME_PERPORT)
                writel(mask,PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK));
-        /* Window = 0 or 1 */
        if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
                do {
                        writel(0xffffffff,
@@ -190,14 +187,18 @@ static void netxen_nic_disable_int(struct netxen_adapter *adapter)
                        printk(KERN_NOTICE "%s: Failed to disable interrupt completely\n",
                                        netxen_nic_driver_name);
                }
+        } else {
+                if (adapter->msi_mode == MSI_MODE_MULTIFUNC) {
+                        writel(0xffffffff, PCI_OFFSET_SECOND_RANGE(adapter,
+                                                msi_tgt_status[pci_fn]));
+                }
        }
-        DPRINTK(1, INFO, "Done with Disable Int\n");
 }
 static void netxen_nic_enable_int(struct netxen_adapter *adapter)
 {
        u32 mask;
+        int port = adapter->portnum;
        DPRINTK(1, INFO, "Entered ISR Enable \n");
@@ -218,20 +219,7 @@ static void netxen_nic_enable_int(struct netxen_adapter *adapter)
                writel(mask, PCI_OFFSET_SECOND_RANGE(adapter, ISR_INT_MASK));
        }
-        switch (adapter->portnum) {
+        writel(0x1, NETXEN_CRB_NORMALIZE(adapter, sw_int_mask[port]));
-        case 0:
-                writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_0));
-                break;
-        case 1:
-                writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_1));
-                break;
-        case 2:
-                writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_2));
-                break;
-        case 3:
-                writel(0x1, NETXEN_CRB_NORMALIZE(adapter, CRB_SW_INT_MASK_3));
-                break;
-        }
        if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
                mask = 0xbff;
@@ -328,7 +316,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        adapter->ahw.pdev = pdev;
        adapter->ahw.pci_func  = pci_func_id;
-        spin_lock_init(&adapter->tx_lock);
        /* remap phys address */
        mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */
@@ -401,6 +388,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* this will be read from FW later */
        adapter->intr_scheme = -1;
+        adapter->msi_mode = -1;
        /* This will be reset for mezz cards  */
        adapter->portnum = pci_func_id;
@@ -415,7 +403,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev->set_mac_address    = netxen_nic_set_mac;
        netdev->change_mtu         = netxen_nic_change_mtu;
        netdev->tx_timeout         = netxen_tx_timeout;
-        netdev->watchdog_timeo     = HZ;
+        netdev->watchdog_timeo     = 2*HZ;
        netxen_nic_change_mtu(netdev, netdev->mtu);
@@ -543,7 +531,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        adapter->watchdog_timer.data = (unsigned long)adapter;
        INIT_WORK(&adapter->watchdog_task, netxen_watchdog_task);
        adapter->ahw.pdev = pdev;
-        adapter->proc_cmd_buf_counter = 0;
        adapter->ahw.revision_id = pdev->revision;
        /* make sure Window == 1 */
@@ -833,6 +820,8 @@ static int netxen_nic_open(struct net_device *netdev)
        struct netxen_adapter *adapter = (struct netxen_adapter *)netdev->priv;
        int err = 0;
        int ctx, ring;
+        irq_handler_t handler;
+        unsigned long flags = IRQF_SAMPLE_RANDOM;
        if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC) {
                err = netxen_init_firmware(adapter);
@@ -856,9 +845,14 @@ static int netxen_nic_open(struct net_device *netdev)
                                netxen_post_rx_buffers(adapter, ctx, ring);
                }
                adapter->irq = adapter->ahw.pdev->irq;
-                err = request_irq(adapter->ahw.pdev->irq, netxen_intr,
+                if (adapter->flags & NETXEN_NIC_MSI_ENABLED)
-                                  IRQF_SHARED|IRQF_SAMPLE_RANDOM, netdev->name,
+                        handler = netxen_msi_intr;
-                                  adapter);
+                else {
+                        flags |= IRQF_SHARED;
+                        handler = netxen_intr;
+                }
+                err = request_irq(adapter->irq, handler,
+                                  flags, netdev->name, adapter);
                if (err) {
                        printk(KERN_ERR "request_irq failed with: %d\n", err);
                        netxen_free_hw_resources(adapter);
@@ -867,21 +861,12 @@ static int netxen_nic_open(struct net_device *netdev)
                adapter->is_up = NETXEN_ADAPTER_UP_MAGIC;
        }
-        if (!adapter->driver_mismatch)
-                mod_timer(&adapter->watchdog_timer, jiffies);
-        napi_enable(&adapter->napi);
-        netxen_nic_enable_int(adapter);
        /* Done here again so that even if phantom sw overwrote it,
         * we set it */
        if (adapter->init_port
            && adapter->init_port(adapter, adapter->portnum) != 0) {
-            del_timer_sync(&adapter->watchdog_timer);
                printk(KERN_ERR "%s: Failed to initialize port %d\n",
                                netxen_nic_driver_name, adapter->portnum);
-                napi_disable(&adapter->napi);
                return -EIO;
        }
        if (adapter->macaddr_set)
@@ -894,6 +879,12 @@ static int netxen_nic_open(struct net_device *netdev)
                adapter->set_mtu(adapter, netdev->mtu);
        if (!adapter->driver_mismatch)
+                mod_timer(&adapter->watchdog_timer, jiffies);
+        napi_enable(&adapter->napi);
+        netxen_nic_enable_int(adapter);
+        if (!adapter->driver_mismatch)
                netif_start_queue(netdev);
        return 0;
@@ -958,41 +949,17 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        struct netxen_skb_frag *buffrag;
        unsigned int i;
-        u32 producer = 0;
+        u32 producer, consumer;
        u32 saved_producer = 0;
        struct cmd_desc_type0 *hwdesc;
        int k;
        struct netxen_cmd_buffer *pbuf = NULL;
-        static int dropped_packet = 0;
        int frag_count;
-        u32 local_producer = 0;
-        u32 max_tx_desc_count = 0;
-        u32 last_cmd_consumer = 0;
        int no_of_desc;
+        u32 num_txd = adapter->max_tx_desc_count;
-        adapter->stats.xmitcalled++;
        frag_count = skb_shinfo(skb)->nr_frags + 1;
-        if (unlikely(skb->len <= 0)) {
-                dev_kfree_skb_any(skb);
-                adapter->stats.badskblen++;
-                return NETDEV_TX_OK;
-        }
-        if (frag_count > MAX_BUFFERS_PER_CMD) {
-                printk("%s: %s netxen_nic_xmit_frame: frag_count (%d) "
-                       "too large, can handle only %d frags\n",
-                       netxen_nic_driver_name, netdev->name,
-                       frag_count, MAX_BUFFERS_PER_CMD);
-                adapter->stats.txdropped++;
-                if ((++dropped_packet & 0xff) == 0xff)
-                        printk("%s: %s droppped packets = %d\n",
-                               netxen_nic_driver_name, netdev->name,
-                               dropped_packet);
-                return NETDEV_TX_OK;
-        }
        /* There 4 fragments per descriptor */
        no_of_desc = (frag_count + 3) >> 2;
        if (netdev->features & NETIF_F_TSO) {
@@ -1007,27 +974,16 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                }
        }
-        spin_lock_bh(&adapter->tx_lock);
+        producer = adapter->cmd_producer;
-        if (adapter->total_threads >= MAX_XMIT_PRODUCERS) {
+        smp_mb();
-                goto out_requeue;
+        consumer = adapter->last_cmd_consumer;
-        }
+        if ((no_of_desc+2) > find_diff_among(producer, consumer, num_txd)) {
-        local_producer = adapter->cmd_producer;
+                netif_stop_queue(netdev);
-        k = adapter->cmd_producer;
+                smp_mb();
-        max_tx_desc_count = adapter->max_tx_desc_count;
+                return NETDEV_TX_BUSY;
-        last_cmd_consumer = adapter->last_cmd_consumer;
-        if ((k + no_of_desc) >=
-            ((last_cmd_consumer <= k) ? last_cmd_consumer + max_tx_desc_count :
-             last_cmd_consumer)) {
-                goto out_requeue;
        }
-        k = get_index_range(k, max_tx_desc_count, no_of_desc);
-        adapter->cmd_producer = k;
-        adapter->total_threads++;
-        adapter->num_threads++;
-        spin_unlock_bh(&adapter->tx_lock);
        /* Copy the descriptors into the hardware    */
-        producer = local_producer;
        saved_producer = producer;
        hwdesc = &hw->cmd_desc_head[producer];
        memset(hwdesc, 0, sizeof(struct cmd_desc_type0));
@@ -1067,8 +1023,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                /* move to next desc. if there is a need */
                if ((i & 0x3) == 0) {
                        k = 0;
-                        producer = get_next_index(producer,
+                        producer = get_next_index(producer, num_txd);
-                                                  adapter->max_tx_desc_count);
                        hwdesc = &hw->cmd_desc_head[producer];
                        memset(hwdesc, 0, sizeof(struct cmd_desc_type0));
                        pbuf = &adapter->cmd_buf_arr[producer];
@@ -1086,7 +1041,6 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                buffrag->dma = temp_dma;
                buffrag->length = temp_len;
-                DPRINTK(INFO, "for loop. i=%d k=%d\n", i, k);
                switch (k) {
                case 0:
                        hwdesc->buffer1_length = cpu_to_le16(temp_len);
@@ -1107,7 +1061,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                }
                frag++;
        }
-        producer = get_next_index(producer, adapter->max_tx_desc_count);
+        producer = get_next_index(producer, num_txd);
        /* might change opcode to TX_TCP_LSO */
        netxen_tso_check(adapter, &hw->cmd_desc_head[saved_producer], skb);
@@ -1134,7 +1088,7 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                /* copy the first 64 bytes */
                memcpy(((void *)hwdesc) + 2,
                       (void *)(skb->data), first_hdr_len);
-                producer = get_next_index(producer, max_tx_desc_count);
+                producer = get_next_index(producer, num_txd);
                if (more_hdr) {
                        hwdesc = &hw->cmd_desc_head[producer];
@@ -1147,35 +1101,19 @@ static int netxen_nic_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                                                         hwdesc,
                                                         (hdr_len -
                                                          first_hdr_len));
-                        producer = get_next_index(producer, max_tx_desc_count);
+                        producer = get_next_index(producer, num_txd);
                }
        }
-        spin_lock_bh(&adapter->tx_lock);
+        adapter->cmd_producer = producer;
        adapter->stats.txbytes += skb->len;
-        /* Code to update the adapter considering how many producer threads
+        netxen_nic_update_cmd_producer(adapter, adapter->cmd_producer);
-           are currently working */
-        if ((--adapter->num_threads) == 0) {
-                /* This is the last thread */
-                u32 crb_producer = adapter->cmd_producer;
-                netxen_nic_update_cmd_producer(adapter, crb_producer);
-                wmb();
-                adapter->total_threads = 0;
-        }
-        adapter->stats.xmitfinished++;
+        adapter->stats.xmitcalled++;
        netdev->trans_start = jiffies;
-        spin_unlock_bh(&adapter->tx_lock);
        return NETDEV_TX_OK;
-out_requeue:
-        netif_stop_queue(netdev);
-        adapter->flags |= NETXEN_NETDEV_STATUS;
-        spin_unlock_bh(&adapter->tx_lock);
-        return NETDEV_TX_BUSY;
 }
 static void netxen_watchdog(unsigned long v)
@@ -1200,87 +1138,60 @@ static void netxen_tx_timeout_task(struct work_struct *work)
        printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
               netxen_nic_driver_name, adapter->netdev->name);
-        netxen_nic_close(adapter->netdev);
+        netxen_nic_disable_int(adapter);
-        netxen_nic_open(adapter->netdev);
+        napi_disable(&adapter->napi);
        adapter->netdev->trans_start = jiffies;
+        napi_enable(&adapter->napi);
+        netxen_nic_enable_int(adapter);
        netif_wake_queue(adapter->netdev);
 }
-static int
+static inline void
-netxen_handle_int(struct netxen_adapter *adapter, struct net_device *netdev)
+netxen_handle_int(struct netxen_adapter *adapter)
 {
-        u32 ret = 0;
-        DPRINTK(INFO, "Entered handle ISR\n");
-        adapter->stats.ints++;
        netxen_nic_disable_int(adapter);
+        napi_schedule(&adapter->napi);
-        if (netxen_nic_rx_has_work(adapter) || netxen_nic_tx_has_work(adapter)) {
-                if (netif_rx_schedule_prep(netdev, &adapter->napi)) {
-                        /*
-                         * Interrupts are already disabled.
-                         */
-                        __netif_rx_schedule(netdev, &adapter->napi);
-                } else {
-                        static unsigned int intcount = 0;
-                        if ((++intcount & 0xfff) == 0xfff)
-                                DPRINTK(KERN_ERR
-                                       "%s: %s interrupt %d while in poll\n",
-                                       netxen_nic_driver_name, netdev->name,
-                                       intcount);
-                }
-                ret = 1;
-        }
-        if (ret == 0) {
-                netxen_nic_enable_int(adapter);
-        }
-        return ret;
 }
-/*
- * netxen_intr - Interrupt Handler
- * @irq: interrupt number
- * data points to adapter stucture (which may be handling more than 1 port
- */
 irqreturn_t netxen_intr(int irq, void *data)
 {
        struct netxen_adapter *adapter = data;
-        struct net_device *netdev = adapter->netdev;
        u32 our_int = 0;
-        if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
+        our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
-                our_int = readl(NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
+        /* not our interrupt */
-                /* not our interrupt */
+        if ((our_int & (0x80 << adapter->portnum)) == 0)
-                if ((our_int & (0x80 << adapter->portnum)) == 0)
+                return IRQ_NONE;
-                        return IRQ_NONE;
-        }
        if (adapter->intr_scheme == INTR_SCHEME_PERPORT) {
                /* claim interrupt */
-                if (!(adapter->flags & NETXEN_NIC_MSI_ENABLED)) {
+                writel(our_int & ~((u32)(0x80 << adapter->portnum)),
-                        writel(our_int & ~((u32)(0x80 << adapter->portnum)),
                        NETXEN_CRB_NORMALIZE(adapter, CRB_INT_VECTOR));
-                }
        }
-        if (netif_running(netdev))
+        netxen_handle_int(adapter);
-                netxen_handle_int(adapter, netdev);
        return IRQ_HANDLED;
 }
+irqreturn_t netxen_msi_intr(int irq, void *data)
+{
+        struct netxen_adapter *adapter = data;
+        netxen_handle_int(adapter);
+        return IRQ_HANDLED;
+}
 static int netxen_nic_poll(struct napi_struct *napi, int budget)
 {
        struct netxen_adapter *adapter = container_of(napi, struct netxen_adapter, napi);
-        struct net_device *netdev = adapter->netdev;
+        int tx_complete;
-        int done = 1;
        int ctx;
        int work_done;
-        DPRINTK(INFO, "polling for %d descriptors\n", *budget);
+        tx_complete = netxen_process_cmd_ring(adapter);
        work_done = 0;
        for (ctx = 0; ctx < MAX_RCV_CTX; ++ctx) {
@@ -1300,16 +1211,8 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget)
                                                     budget / MAX_RCV_CTX);
        }
-        if (work_done >= budget)
+        if ((work_done < budget) && tx_complete) {
-                done = 0;
+                netif_rx_complete(adapter->netdev, &adapter->napi);
-        if (netxen_process_cmd_ring((unsigned long)adapter) == 0)
-                done = 0;
-        DPRINTK(INFO, "new work_done: %d work_to_do: %d\n",
-                work_done, work_to_do);
-        if (done) {
-                netif_rx_complete(netdev, napi);
                netxen_nic_enable_int(adapter);
        }
diff --git a/drivers/net/netxen/netxen_nic_phan_reg.h b/drivers/net/netxen/netxen_nic_phan_reg.h
index ffa3b7215ce8..a566b50f36f5 100644
--- a/drivers/net/netxen/netxen_nic_phan_reg.h
+++ b/drivers/net/netxen/netxen_nic_phan_reg.h
@@ -126,8 +126,11 @@
 */
 #define CRB_NIC_CAPABILITIES_HOST       NETXEN_NIC_REG(0x1a8)
 #define CRB_NIC_CAPABILITIES_FW         NETXEN_NIC_REG(0x1dc)
+#define CRB_NIC_MSI_MODE_HOST           NETXEN_NIC_REG(0x270)
+#define CRB_NIC_MSI_MODE_FW                     NETXEN_NIC_REG(0x274)
 #define INTR_SCHEME_PERPORT             0x1
+#define MSI_MODE_MULTIFUNC              0x1
 /* used for ethtool tests */
 #define CRB_SCRATCHPAD_TEST         NETXEN_NIC_REG(0x280)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index f0574073a2a3..32a8503a7acd 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -58,9 +58,25 @@
 #define MII_M1111_RX_DELAY              0x80
 #define MII_M1111_TX_DELAY              0x2
 #define MII_M1111_PHY_EXT_SR            0x1b
-#define MII_M1111_HWCFG_MODE_MASK       0xf
-#define MII_M1111_HWCFG_MODE_RGMII      0xb
+#define MII_M1111_HWCFG_MODE_MASK               0xf
+#define MII_M1111_HWCFG_MODE_COPPER_RGMII       0xb
+#define MII_M1111_HWCFG_MODE_FIBER_RGMII        0x3
 #define MII_M1111_HWCFG_MODE_SGMII_NO_CLK       0x4
+#define MII_M1111_HWCFG_FIBER_COPPER_AUTO       0x8000
+#define MII_M1111_HWCFG_FIBER_COPPER_RES        0x2000
+#define MII_M1111_COPPER                0
+#define MII_M1111_FIBER                 1
+#define MII_M1011_PHY_STATUS            0x11
+#define MII_M1011_PHY_STATUS_1000       0x8000
+#define MII_M1011_PHY_STATUS_100        0x4000
+#define MII_M1011_PHY_STATUS_SPD_MASK   0xc000
+#define MII_M1011_PHY_STATUS_FULLDUPLEX 0x2000
+#define MII_M1011_PHY_STATUS_RESOLVED   0x0800
+#define MII_M1011_PHY_STATUS_LINK       0x0400
 MODULE_DESCRIPTION("Marvell PHY driver");
 MODULE_AUTHOR("Andy Fleming");
@@ -141,12 +157,22 @@ static int marvell_config_aneg(struct phy_device *phydev)
 static int m88e1111_config_init(struct phy_device *phydev)
 {
        int err;
+        int temp;
+        int mode;
+        /* Enable Fiber/Copper auto selection */
+        temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
+        temp |= MII_M1111_HWCFG_FIBER_COPPER_AUTO;
+        phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
+        temp = phy_read(phydev, MII_BMCR);
+        temp |= BMCR_RESET;
+        phy_write(phydev, MII_BMCR, temp);
        if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
            (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
            (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
            (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
-                int temp;
                temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
                if (temp < 0)
@@ -171,7 +197,13 @@ static int m88e1111_config_init(struct phy_device *phydev)
                        return temp;
                temp &= ~(MII_M1111_HWCFG_MODE_MASK);
-                temp |= MII_M1111_HWCFG_MODE_RGMII;
+                mode = phy_read(phydev, MII_M1111_PHY_EXT_CR);
+                if (mode & MII_M1111_HWCFG_FIBER_COPPER_RES)
+                        temp |= MII_M1111_HWCFG_MODE_FIBER_RGMII;
+                else
+                        temp |= MII_M1111_HWCFG_MODE_COPPER_RGMII;
                err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
                if (err < 0)
@@ -179,8 +211,6 @@ static int m88e1111_config_init(struct phy_device *phydev)
        }
        if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
-                int temp;
                temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
                if (temp < 0)
                        return temp;
@@ -262,6 +292,93 @@ static int m88e1145_config_init(struct phy_device *phydev)
        return 0;
 }
+/* marvell_read_status
+ *
+ * Generic status code does not detect Fiber correctly!
+ * Description:
+ *   Check the link, then figure out the current state
+ *   by comparing what we advertise with what the link partner
+ *   advertises.  Start by checking the gigabit possibilities,
+ *   then move on to 10/100.
+ */
+static int marvell_read_status(struct phy_device *phydev)
+{
+        int adv;
+        int err;
+        int lpa;
+        int status = 0;
+        /* Update the link, but return if there
+         * was an error */
+        err = genphy_update_link(phydev);
+        if (err)
+                return err;
+        if (AUTONEG_ENABLE == phydev->autoneg) {
+                status = phy_read(phydev, MII_M1011_PHY_STATUS);
+                if (status < 0)
+                        return status;
+                lpa = phy_read(phydev, MII_LPA);
+                if (lpa < 0)
+                        return lpa;
+                adv = phy_read(phydev, MII_ADVERTISE);
+                if (adv < 0)
+                        return adv;
+                lpa &= adv;
+                if (status & MII_M1011_PHY_STATUS_FULLDUPLEX)
+                        phydev->duplex = DUPLEX_FULL;
+                else
+                        phydev->duplex = DUPLEX_HALF;
+                status = status & MII_M1011_PHY_STATUS_SPD_MASK;
+                phydev->pause = phydev->asym_pause = 0;
+                switch (status) {
+                case MII_M1011_PHY_STATUS_1000:
+                        phydev->speed = SPEED_1000;
+                        break;
+                case MII_M1011_PHY_STATUS_100:
+                        phydev->speed = SPEED_100;
+                        break;
+                default:
+                        phydev->speed = SPEED_10;
+                        break;
+                }
+                if (phydev->duplex == DUPLEX_FULL) {
+                        phydev->pause = lpa & LPA_PAUSE_CAP ? 1 : 0;
+                        phydev->asym_pause = lpa & LPA_PAUSE_ASYM ? 1 : 0;
+                }
+        } else {
+                int bmcr = phy_read(phydev, MII_BMCR);
+                if (bmcr < 0)
+                        return bmcr;
+                if (bmcr & BMCR_FULLDPLX)
+                        phydev->duplex = DUPLEX_FULL;
+                else
+                        phydev->duplex = DUPLEX_HALF;
+                if (bmcr & BMCR_SPEED1000)
+                        phydev->speed = SPEED_1000;
+                else if (bmcr & BMCR_SPEED100)
+                        phydev->speed = SPEED_100;
+                else
+                        phydev->speed = SPEED_10;
+                phydev->pause = phydev->asym_pause = 0;
+        }
+        return 0;
+}
 static struct phy_driver marvell_drivers[] = {
        {
                .phy_id = 0x01410c60,
@@ -296,7 +413,7 @@ static struct phy_driver marvell_drivers[] = {
                .flags = PHY_HAS_INTERRUPT,
                .config_init = &m88e1111_config_init,
                .config_aneg = &marvell_config_aneg,
-                .read_status = &genphy_read_status,
+                .read_status = &marvell_read_status,
                .ack_interrupt = &marvell_ack_interrupt,
                .config_intr = &marvell_config_intr,
                .driver = { .owner = THIS_MODULE },
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/s2io.c b/drivers/net/s2io.c
index c72787adeba3..c082cf0b1ac6 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -84,7 +84,7 @@
 #include "s2io.h"
 #include "s2io-regs.h"
-#define DRV_VERSION "2.0.26.15-2"
+#define DRV_VERSION "2.0.26.20"
 /* S2io Driver name & version. */
 static char s2io_driver_name[] = "Neterion";
@@ -4172,6 +4172,9 @@ static int s2io_xmit(struct sk_buff *skb, struct net_device *dev)
        dev->trans_start = jiffies;
        spin_unlock_irqrestore(&fifo->tx_lock, flags);
+        if (sp->config.intr_type == MSI_X)
+                tx_intr_handler(fifo);
        return 0;
 pci_map_failed:
        stats->pci_map_fail_cnt++;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 186eb8ebfda6..2e26dced13a1 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -3199,12 +3199,14 @@ static int skge_poll(struct napi_struct *napi, int to_do)
        skge_write8(hw, Q_ADDR(rxqaddr[skge->port], Q_CSR), CSR_START);
        if (work_done < to_do) {
-                spin_lock_irq(&hw->hw_lock);
+                unsigned long flags;
+                spin_lock_irqsave(&hw->hw_lock, flags);
                __netif_rx_complete(dev, napi);
                hw->intr_mask |= napimask[skge->port];
                skge_write32(hw, B0_IMSK, hw->intr_mask);
                skge_read32(hw, B0_IMSK);
-                spin_unlock_irq(&hw->hw_lock);
+                spin_unlock_irqrestore(&hw->hw_lock, flags);
        }
        return work_done;
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/starfire.c b/drivers/net/starfire.c
index c49214feae91..7b7b1717b0d1 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -1472,13 +1472,12 @@ static int __netdev_rx(struct net_device *dev, int *quota)
 #ifndef final_version                   /* Remove after testing. */
                /* You will want this info for the initial debug. */
                if (debug > 5) {
-                        DECLARE_MAC_BUF(mac);
+                        printk(KERN_DEBUG "  Rx data " MAC_FMT " " MAC_FMT
-                        DECLARE_MAC_BUF(mac2);
-                        printk(KERN_DEBUG "  Rx data %s %s"
                               " %2.2x%2.2x.\n",
-                               print_mac(mac, &skb->data[0]),
+                               skb->data[0], skb->data[1], skb->data[2],
-                               print_mac(mac2, &skb->data[6]),
+                               skb->data[3], skb->data[4], skb->data[5],
+                               skb->data[6], skb->data[7], skb->data[8],
+                               skb->data[9], skb->data[10], skb->data[11],
                               skb->data[12], skb->data[13]);
                }
 #endif
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f9ef8bd8b11e..d4655b2d1f3f 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -64,8 +64,8 @@
 #define DRV_MODULE_NAME         "tg3"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "3.88"
+#define DRV_MODULE_VERSION      "3.89"
-#define DRV_MODULE_RELDATE      "March 20, 2008"
+#define DRV_MODULE_RELDATE      "April 03, 2008"
 #define TG3_DEF_MAC_MODE        0
 #define TG3_DEF_RX_MODE         0
@@ -804,6 +804,12 @@ static int tg3_writephy(struct tg3 *tp, int reg, u32 val)
        return ret;
 }
+static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val)
+{
+        tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg);
+        tg3_writephy(tp, MII_TG3_DSP_RW_PORT, val);
+}
 static void tg3_phy_toggle_automdix(struct tg3 *tp, int enable)
 {
        u32 phy;
@@ -886,6 +892,49 @@ static int tg3_bmcr_reset(struct tg3 *tp)
        return 0;
 }
+static void tg3_phy_apply_otp(struct tg3 *tp)
+{
+        u32 otp, phy;
+        if (!tp->phy_otp)
+                return;
+        otp = tp->phy_otp;
+        /* Enable SM_DSP clock and tx 6dB coding. */
+        phy = MII_TG3_AUXCTL_SHDWSEL_AUXCTL |
+              MII_TG3_AUXCTL_ACTL_SMDSP_ENA |
+              MII_TG3_AUXCTL_ACTL_TX_6DB;
+        tg3_writephy(tp, MII_TG3_AUX_CTRL, phy);
+        phy = ((otp & TG3_OTP_AGCTGT_MASK) >> TG3_OTP_AGCTGT_SHIFT);
+        phy |= MII_TG3_DSP_TAP1_AGCTGT_DFLT;
+        tg3_phydsp_write(tp, MII_TG3_DSP_TAP1, phy);
+        phy = ((otp & TG3_OTP_HPFFLTR_MASK) >> TG3_OTP_HPFFLTR_SHIFT) |
+              ((otp & TG3_OTP_HPFOVER_MASK) >> TG3_OTP_HPFOVER_SHIFT);
+        tg3_phydsp_write(tp, MII_TG3_DSP_AADJ1CH0, phy);
+        phy = ((otp & TG3_OTP_LPFDIS_MASK) >> TG3_OTP_LPFDIS_SHIFT);
+        phy |= MII_TG3_DSP_AADJ1CH3_ADCCKADJ;
+        tg3_phydsp_write(tp, MII_TG3_DSP_AADJ1CH3, phy);
+        phy = ((otp & TG3_OTP_VDAC_MASK) >> TG3_OTP_VDAC_SHIFT);
+        tg3_phydsp_write(tp, MII_TG3_DSP_EXP75, phy);
+        phy = ((otp & TG3_OTP_10BTAMP_MASK) >> TG3_OTP_10BTAMP_SHIFT);
+        tg3_phydsp_write(tp, MII_TG3_DSP_EXP96, phy);
+        phy = ((otp & TG3_OTP_ROFF_MASK) >> TG3_OTP_ROFF_SHIFT) |
+              ((otp & TG3_OTP_RCOFF_MASK) >> TG3_OTP_RCOFF_SHIFT);
+        tg3_phydsp_write(tp, MII_TG3_DSP_EXP97, phy);
+        /* Turn off SM_DSP clock. */
+        phy = MII_TG3_AUXCTL_SHDWSEL_AUXCTL |
+              MII_TG3_AUXCTL_ACTL_TX_6DB;
+        tg3_writephy(tp, MII_TG3_AUX_CTRL, phy);
+}
 static int tg3_wait_macro_done(struct tg3 *tp)
 {
        int limit = 100;
@@ -1073,6 +1122,7 @@ static void tg3_link_report(struct tg3 *);
 */
 static int tg3_phy_reset(struct tg3 *tp)
 {
+        u32 cpmuctrl;
        u32 phy_status;
        int err;
@@ -1102,10 +1152,28 @@ static int tg3_phy_reset(struct tg3 *tp)
                goto out;
        }
+        cpmuctrl = 0;
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 &&
+            GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5784_AX) {
+                cpmuctrl = tr32(TG3_CPMU_CTRL);
+                if (cpmuctrl & CPMU_CTRL_GPHY_10MB_RXONLY)
+                        tw32(TG3_CPMU_CTRL,
+                             cpmuctrl & ~CPMU_CTRL_GPHY_10MB_RXONLY);
+        }
        err = tg3_bmcr_reset(tp);
        if (err)
                return err;
+        if (cpmuctrl & CPMU_CTRL_GPHY_10MB_RXONLY) {
+                u32 phy;
+                phy = MII_TG3_DSP_EXP8_AEDW | MII_TG3_DSP_EXP8_REJ2MHz;
+                tg3_phydsp_write(tp, MII_TG3_DSP_EXP8, phy);
+                tw32(TG3_CPMU_CTRL, cpmuctrl);
+        }
        if (tp->tg3_flags3 & TG3_FLG3_5761_5784_AX_FIXES) {
                u32 val;
@@ -1124,6 +1192,8 @@ static int tg3_phy_reset(struct tg3 *tp)
                             MII_TG3_MISC_SHDW_APD_WKTM_84MS);
        }
+        tg3_phy_apply_otp(tp);
 out:
        if (tp->tg3_flags2 & TG3_FLG2_PHY_ADC_BUG) {
                tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x0c00);
@@ -9464,7 +9534,8 @@ static int tg3_test_loopback(struct tg3 *tp)
        if (err)
                return TG3_LOOPBACK_FAILED;
-        if (tp->tg3_flags3 & TG3_FLG3_5761_5784_AX_FIXES) {
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761) {
                int i;
                u32 status;
@@ -9481,17 +9552,23 @@ static int tg3_test_loopback(struct tg3 *tp)
                if (status != CPMU_MUTEX_GNT_DRIVER)
                        return TG3_LOOPBACK_FAILED;
-                /* Turn off power management based on link speed. */
+                /* Turn off link-based power management. */
                cpmuctrl = tr32(TG3_CPMU_CTRL);
-                tw32(TG3_CPMU_CTRL,
+                if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||
-                     cpmuctrl & ~(CPMU_CTRL_LINK_SPEED_MODE |
+                    GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5761_AX)
-                                  CPMU_CTRL_LINK_AWARE_MODE));
+                        tw32(TG3_CPMU_CTRL,
+                             cpmuctrl & ~(CPMU_CTRL_LINK_SPEED_MODE |
+                                          CPMU_CTRL_LINK_AWARE_MODE));
+                else
+                        tw32(TG3_CPMU_CTRL,
+                             cpmuctrl & ~CPMU_CTRL_LINK_AWARE_MODE);
        }
        if (tg3_run_loopback(tp, TG3_MAC_LOOPBACK))
                err |= TG3_MAC_LOOPBACK_FAILED;
-        if (tp->tg3_flags3 & TG3_FLG3_5761_5784_AX_FIXES) {
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||
+            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5761) {
                tw32(TG3_CPMU_CTRL, cpmuctrl);
                /* Release the mutex */
@@ -10724,9 +10801,8 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                    tp->pdev->subsystem_vendor == PCI_VENDOR_ID_DELL)
                        tp->led_ctrl = LED_CTRL_MODE_PHY_2;
-                if (tp->pci_chip_rev_id == CHIPREV_ID_5784_A0 ||
+                if (GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5784_AX)
-                    tp->pci_chip_rev_id == CHIPREV_ID_5784_A1)
+                        tp->led_ctrl = LED_CTRL_MODE_PHY_1;
-                        tp->led_ctrl = LED_CTRL_MODE_MAC;
                if (nic_cfg & NIC_SRAM_DATA_CFG_EEPROM_WP) {
                        tp->tg3_flags |= TG3_FLAG_EEPROM_WRITE_PROT;
@@ -10773,6 +10849,55 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
        }
 }
+static int __devinit tg3_issue_otp_command(struct tg3 *tp, u32 cmd)
+{
+        int i;
+        u32 val;
+        tw32(OTP_CTRL, cmd | OTP_CTRL_OTP_CMD_START);
+        tw32(OTP_CTRL, cmd);
+        /* Wait for up to 1 ms for command to execute. */
+        for (i = 0; i < 100; i++) {
+                val = tr32(OTP_STATUS);
+                if (val & OTP_STATUS_CMD_DONE)
+                        break;
+                udelay(10);
+        }
+        return (val & OTP_STATUS_CMD_DONE) ? 0 : -EBUSY;
+}
+/* Read the gphy configuration from the OTP region of the chip.  The gphy
+ * configuration is a 32-bit value that straddles the alignment boundary.
+ * We do two 32-bit reads and then shift and merge the results.
+ */
+static u32 __devinit tg3_read_otp_phycfg(struct tg3 *tp)
+{
+        u32 bhalf_otp, thalf_otp;
+        tw32(OTP_MODE, OTP_MODE_OTP_THRU_GRC);
+        if (tg3_issue_otp_command(tp, OTP_CTRL_OTP_CMD_INIT))
+                return 0;
+        tw32(OTP_ADDRESS, OTP_ADDRESS_MAGIC1);
+        if (tg3_issue_otp_command(tp, OTP_CTRL_OTP_CMD_READ))
+                return 0;
+        thalf_otp = tr32(OTP_READ_DATA);
+        tw32(OTP_ADDRESS, OTP_ADDRESS_MAGIC2);
+        if (tg3_issue_otp_command(tp, OTP_CTRL_OTP_CMD_READ))
+                return 0;
+        bhalf_otp = tr32(OTP_READ_DATA);
+        return ((thalf_otp & 0x0000ffff) << 16) | (bhalf_otp >> 16);
+}
 static int __devinit tg3_phy_probe(struct tg3 *tp)
 {
        u32 hw_phy_id_1, hw_phy_id_2;
@@ -11586,6 +11711,13 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
                        tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;
        }
+        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 &&
+            GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5784_AX) {
+                tp->phy_otp = tg3_read_otp_phycfg(tp);
+                if (tp->phy_otp == 0)
+                        tp->phy_otp = TG3_OTP_DEFAULT;
+        }
        tp->coalesce_mode = 0;
        if (GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_AX &&
            GET_CHIP_REV(tp->pci_chip_rev_id) != CHIPREV_5700_BX)
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index 3938eb35ce8c..c1075a73d66c 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -138,6 +138,8 @@
 #define   CHIPREV_5704_BX                0x21
 #define   CHIPREV_5750_AX                0x40
 #define   CHIPREV_5750_BX                0x41
+#define   CHIPREV_5784_AX                0x57840
+#define   CHIPREV_5761_AX                0x57610
 #define  GET_METAL_REV(CHIP_REV_ID)     ((CHIP_REV_ID) & 0xff)
 #define   METAL_REV_A0                   0x00
 #define   METAL_REV_A1                   0x01
@@ -866,6 +868,7 @@
 #define  CPMU_CTRL_LINK_IDLE_MODE        0x00000200
 #define  CPMU_CTRL_LINK_AWARE_MODE       0x00000400
 #define  CPMU_CTRL_LINK_SPEED_MODE       0x00004000
+#define  CPMU_CTRL_GPHY_10MB_RXONLY      0x00010000
 #define TG3_CPMU_LSPD_10MB_CLK          0x00003604
 #define  CPMU_LSPD_10MB_MACCLK_MASK      0x001f0000
 #define  CPMU_LSPD_10MB_MACCLK_6_25      0x00130000
@@ -1559,7 +1562,24 @@
 /* 0x702c unused */
 #define NVRAM_ADDR_LOCKOUT              0x00007030
-/* 0x7034 --> 0x7c00 unused */
+/* 0x7034 --> 0x7500 unused */
+#define OTP_MODE                        0x00007500
+#define OTP_MODE_OTP_THRU_GRC            0x00000001
+#define OTP_CTRL                        0x00007504
+#define OTP_CTRL_OTP_PROG_ENABLE         0x00200000
+#define OTP_CTRL_OTP_CMD_READ            0x00000000
+#define OTP_CTRL_OTP_CMD_INIT            0x00000008
+#define OTP_CTRL_OTP_CMD_START           0x00000001
+#define OTP_STATUS                      0x00007508
+#define OTP_STATUS_CMD_DONE              0x00000001
+#define OTP_ADDRESS                     0x0000750c
+#define OTP_ADDRESS_MAGIC1               0x000000a0
+#define OTP_ADDRESS_MAGIC2               0x00000080
+/* 0x7510 unused */
+#define OTP_READ_DATA                   0x00007514
+/* 0x7518 --> 0x7c04 unused */
 #define PCIE_TRANSACTION_CFG            0x00007c04
 #define PCIE_TRANS_CFG_1SHOT_MSI         0x20000000
@@ -1568,6 +1588,28 @@
 #define PCIE_PWR_MGMT_THRESH            0x00007d28
 #define PCIE_PWR_MGMT_L1_THRESH_MSK      0x0000ff00
+/* OTP bit definitions */
+#define TG3_OTP_AGCTGT_MASK             0x000000e0
+#define TG3_OTP_AGCTGT_SHIFT            1
+#define TG3_OTP_HPFFLTR_MASK            0x00000300
+#define TG3_OTP_HPFFLTR_SHIFT           1
+#define TG3_OTP_HPFOVER_MASK            0x00000400
+#define TG3_OTP_HPFOVER_SHIFT           1
+#define TG3_OTP_LPFDIS_MASK             0x00000800
+#define TG3_OTP_LPFDIS_SHIFT            11
+#define TG3_OTP_VDAC_MASK               0xff000000
+#define TG3_OTP_VDAC_SHIFT              24
+#define TG3_OTP_10BTAMP_MASK            0x0000f000
+#define TG3_OTP_10BTAMP_SHIFT           8
+#define TG3_OTP_ROFF_MASK               0x00e00000
+#define TG3_OTP_ROFF_SHIFT              11
+#define TG3_OTP_RCOFF_MASK              0x001c0000
+#define TG3_OTP_RCOFF_SHIFT             16
+#define TG3_OTP_DEFAULT                 0x286c1640
 #define TG3_EEPROM_MAGIC                0x669955aa
 #define TG3_EEPROM_MAGIC_FW             0xa5000000
 #define TG3_EEPROM_MAGIC_FW_MSK         0xff000000
@@ -1705,15 +1747,31 @@
 #define MII_TG3_DSP_RW_PORT             0x15 /* DSP coefficient read/write port */
-#define MII_TG3_DSP_ADDRESS             0x17 /* DSP address register */
 #define MII_TG3_EPHY_PTEST              0x17 /* 5906 PHY register */
+#define MII_TG3_DSP_ADDRESS             0x17 /* DSP address register */
+#define MII_TG3_DSP_TAP1                0x0001
+#define  MII_TG3_DSP_TAP1_AGCTGT_DFLT   0x0007
+#define MII_TG3_DSP_AADJ1CH0            0x001f
+#define MII_TG3_DSP_AADJ1CH3            0x601f
+#define  MII_TG3_DSP_AADJ1CH3_ADCCKADJ  0x0002
+#define MII_TG3_DSP_EXP8                0x0708
+#define  MII_TG3_DSP_EXP8_REJ2MHz       0x0001
+#define  MII_TG3_DSP_EXP8_AEDW          0x0200
+#define MII_TG3_DSP_EXP75               0x0f75
+#define MII_TG3_DSP_EXP96               0x0f96
+#define MII_TG3_DSP_EXP97               0x0f97
 #define MII_TG3_AUX_CTRL                0x18 /* auxilliary control register */
 #define MII_TG3_AUXCTL_MISC_WREN        0x8000
 #define MII_TG3_AUXCTL_MISC_FORCE_AMDIX 0x0200
 #define MII_TG3_AUXCTL_MISC_RDSEL_MISC  0x7000
-#define MII_TG3_AUXCTL_SHDWSEL_MISC             0x0007
+#define MII_TG3_AUXCTL_SHDWSEL_MISC     0x0007
+#define MII_TG3_AUXCTL_ACTL_SMDSP_ENA   0x0800
+#define MII_TG3_AUXCTL_ACTL_TX_6DB      0x0400
+#define MII_TG3_AUXCTL_SHDWSEL_AUXCTL   0x0000
 #define MII_TG3_AUX_STAT                0x19 /* auxilliary status register */
 #define MII_TG3_AUX_STAT_LPASS          0x0004
@@ -1743,6 +1801,20 @@
 #define MII_TG3_INT_DUPLEXCHG           0x0008
 #define MII_TG3_INT_ANEG_PAGE_RX        0x0400
+#define MII_TG3_MISC_SHDW               0x1c
+#define MII_TG3_MISC_SHDW_WREN          0x8000
+#define MII_TG3_MISC_SHDW_SCR5_SEL      0x1400
+#define MII_TG3_MISC_SHDW_APD_SEL       0x2800
+#define MII_TG3_MISC_SHDW_SCR5_C125OE   0x0001
+#define MII_TG3_MISC_SHDW_SCR5_DLLAPD   0x0002
+#define MII_TG3_MISC_SHDW_SCR5_SDTL     0x0004
+#define MII_TG3_MISC_SHDW_SCR5_DLPTLM   0x0008
+#define MII_TG3_MISC_SHDW_SCR5_LPED     0x0010
+#define MII_TG3_MISC_SHDW_APD_WKTM_84MS 0x0001
+#define MII_TG3_MISC_SHDW_APD_ENABLE    0x0020
 #define MII_TG3_EPHY_TEST               0x1f /* 5906 PHY register */
 #define MII_TG3_EPHY_SHADOW_EN          0x80
@@ -2473,6 +2545,7 @@ struct tg3 {
 #define PHY_REV_BCM5411_X0              0x1 /* Found on Netgear GA302T */
        u32                             led_ctrl;
+        u32                             phy_otp;
        u16                             pci_cmd;
        char                            board_part_number[24];
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 433c994ea9d8..0ab51a0f35fc 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -117,7 +117,7 @@
 * Official releases will only have an a.b.c version number format. 
 */
-static char version[] __devinitdata = 
+static char version[] =
 "Olympic.c v1.0.5 6/04/02 - Peter De Schrijver & Mike Phillips" ; 
 static char *open_maj_error[]  = {"No error", "Lobe Media Test", "Physical Insertion",
@@ -290,7 +290,7 @@ op_disable_dev:
        return i;
 }
-static int __devinit olympic_init(struct net_device *dev)
+static int olympic_init(struct net_device *dev)
 {
        struct olympic_private *olympic_priv;
        u8 __iomem *olympic_mmio, *init_srb,*adapter_addr;
@@ -434,7 +434,7 @@ static int __devinit olympic_init(struct net_device *dev)
 }
-static int __devinit olympic_open(struct net_device *dev) 
+static int olympic_open(struct net_device *dev)
 {
        struct olympic_private *olympic_priv=netdev_priv(dev);
        u8 __iomem *olympic_mmio=olympic_priv->olympic_mmio,*init_srb;
@@ -1438,13 +1438,18 @@ static void olympic_arb_cmd(struct net_device *dev)
                if (olympic_priv->olympic_network_monitor) { 
                        struct trh_hdr *mac_hdr;
-                        DECLARE_MAC_BUF(mac);
                        printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name);
                        mac_hdr = tr_hdr(mac_frame);
-                        printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %s\n",
+                        printk(KERN_WARNING "%s: MAC Frame Dest. Addr: "
-                               dev->name, print_mac(mac, mac_hdr->daddr));
+                               MAC_FMT " \n", dev->name,
-                        printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %s\n",
+                               mac_hdr->daddr[0], mac_hdr->daddr[1],
-                               dev->name, print_mac(mac, mac_hdr->saddr));
+                               mac_hdr->daddr[2], mac_hdr->daddr[3],
+                               mac_hdr->daddr[4], mac_hdr->daddr[5]);
+                        printk(KERN_WARNING "%s: MAC Frame Srce. Addr: "
+                               MAC_FMT " \n", dev->name,
+                               mac_hdr->saddr[0], mac_hdr->saddr[1],
+                               mac_hdr->saddr[2], mac_hdr->saddr[3],
+                               mac_hdr->saddr[4], mac_hdr->saddr[5]);
                }
                netif_rx(mac_frame);
                dev->last_rx = jiffies;
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c
index 8909050b8ea7..5f1c5072b96f 100644
--- a/drivers/net/tokenring/smctr.c
+++ b/drivers/net/tokenring/smctr.c
@@ -3413,7 +3413,7 @@ static int smctr_make_tx_status_code(struct net_device *dev,
        tsv->svi = TRANSMIT_STATUS_CODE;
        tsv->svl = S_TRANSMIT_STATUS_CODE;
-        tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) || IBM_PASS_SOURCE_ADDR);
+        tsv->svv[0] = ((tx_fstatus & 0x0100 >> 6) | IBM_PASS_SOURCE_ADDR);
        /* Stripped frame status of Transmitted Frame */
        tsv->svv[1] = tx_fstatus & 0xff;
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
index 206918bad539..da2206f6021d 100644
--- a/drivers/net/tulip/eeprom.c
+++ b/drivers/net/tulip/eeprom.c
@@ -343,6 +343,12 @@ int __devinit tulip_read_eeprom(struct net_device *dev, int location, int addr_l
        void __iomem *ee_addr = tp->base_addr + CSR9;
        int read_cmd = location | (EE_READ_CMD << addr_len);
+        /* If location is past the end of what we can address, don't
+         * read some other location (ie truncate). Just return zero.
+         */
+        if (location > (1 << addr_len) - 1)
+                return 0;
        iowrite32(EE_ENB & ~EE_CS, ee_addr);
        iowrite32(EE_ENB, ee_addr);
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index ed600bf56e78..82f404b76d81 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1437,6 +1437,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
           EEPROM.
           */
        ee_data = tp->eeprom;
+        memset(ee_data, 0, sizeof(tp->eeprom));
        sum = 0;
        if (chip_idx == LC82C168) {
                for (i = 0; i < 3; i++) {
@@ -1458,8 +1459,12 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                /* A serial EEPROM interface, we read now and sort it out later. */
                int sa_offset = 0;
                int ee_addr_size = tulip_read_eeprom(dev, 0xff, 8) & 0x40000 ? 8 : 6;
+                int ee_max_addr = ((1 << ee_addr_size) - 1) * sizeof(u16);
-                for (i = 0; i < sizeof(tp->eeprom); i+=2) {
+                if (ee_max_addr > sizeof(tp->eeprom))
+                        ee_max_addr = sizeof(tp->eeprom);
+                for (i = 0; i < ee_max_addr ; i += sizeof(u16)) {
                        u16 data = tulip_read_eeprom(dev, i/2, ee_addr_size);
                        ee_data[i] = data & 0xff;
                        ee_data[i + 1] = data >> 8;
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index a12c9c41b217..0604f3faf043 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -129,7 +129,7 @@ config USB_USBNET
 config USB_NET_AX8817X
        tristate "ASIX AX88xxx Based USB 2.0 Ethernet Adapters"
-        depends on USB_USBNET && NET_ETHERNET
+        depends on USB_USBNET
        select CRC32
        default y
        help
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 4b131a6c6b70..01660f68943a 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -341,7 +341,7 @@ static void dm9601_set_multicast(struct net_device *net)
        /* We use the 20 byte dev->data for our 8 byte filter buffer
         * to avoid allocating memory that is tricky to free later */
        u8 *hashes = (u8 *) & dev->data;
-        u8 rx_ctl = 0x01;
+        u8 rx_ctl = 0x31;
        memset(hashes, 0x00, DM_MCAST_SIZE);
        hashes[DM_MCAST_SIZE - 1] |= 0x80;      /* broadcast address */
@@ -354,7 +354,7 @@ static void dm9601_set_multicast(struct net_device *net)
                struct dev_mc_list *mc_list = net->mc_list;
                int i;
-                for (i = 0; i < net->mc_count; i++) {
+                for (i = 0; i < net->mc_count; i++, mc_list = mc_list->next) {
                        u32 crc = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26;
                        hashes[crc >> 3] |= 1 << (crc & 0x7);
                }
@@ -562,6 +562,10 @@ static const struct usb_device_id products[] = {
         USB_DEVICE(0x0a46, 0x8515),    /* ADMtek ADM8515 USB NIC */
         .driver_info = (unsigned long)&dm9601_info,
         },
+        {
+        USB_DEVICE(0x0a47, 0x9601),     /* Hirose USB-100 */
+        .driver_info = (unsigned long)&dm9601_info,
+         },
        {},                     // END
 };
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index d1ed68a11e70..b588c890ea70 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1128,12 +1128,8 @@ pegasus_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
        pegasus_t *pegasus;
-        if (in_atomic())
-                return 0;
        pegasus = netdev_priv(dev);
        mii_ethtool_gset(&pegasus->mii, ecmd);
        return 0;
 }
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 727547a28992..369c731114b3 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -283,7 +283,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
                struct rndis_set_c      *set_c;
                struct rndis_halt       *halt;
        } u;
-        u32                     tmp, *phym;
+        u32                     tmp, phym_unspec, *phym;
        int                     reply_len;
        unsigned char           *bp;
@@ -363,12 +363,15 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
                goto halt_fail_and_release;
        /* Check physical medium */
+        phym = NULL;
        reply_len = sizeof *phym;
        retval = rndis_query(dev, intf, u.buf, OID_GEN_PHYSICAL_MEDIUM,
                        0, (void **) &phym, &reply_len);
-        if (retval != 0)
+        if (retval != 0 || !phym) {
                /* OID is optional so don't fail here. */
-                *phym = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
+                phym_unspec = RNDIS_PHYSICAL_MEDIUM_UNSPECIFIED;
+                phym = &phym_unspec;
+        }
        if ((flags & FLAG_RNDIS_PHYM_WIRELESS) &&
                        *phym != RNDIS_PHYSICAL_MEDIUM_WIRELESS_LAN) {
                if (netif_msg_probe(dev))
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index b58472cf76f8..555b70c8b863 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -234,11 +234,12 @@ static int start_xmit(struct sk_buff *skb, struct net_device *dev)
        struct scatterlist sg[1+MAX_SKB_FRAGS];
        struct virtio_net_hdr *hdr;
        const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
-        DECLARE_MAC_BUF(mac);
        sg_init_table(sg, 1+MAX_SKB_FRAGS);
-        pr_debug("%s: xmit %p %s\n", dev->name, skb, print_mac(mac, dest));
+        pr_debug("%s: xmit %p " MAC_FMT "\n", dev->name, skb,
+                 dest[0], dest[1], dest[2],
+                 dest[3], dest[4], dest[5]);
        /* Encode metadata header at front. */
        hdr = skb_vnet_hdr(skb);
@@ -284,7 +285,6 @@ again:
                /* Activate callback for using skbs: if this returns false it
                 * means some were used in the meantime. */
                if (unlikely(!vi->svq->vq_ops->enable_cb(vi->svq))) {
-                        printk("Unlikely: restart svq race\n");
                        vi->svq->vq_ops->disable_cb(vi->svq);
                        netif_start_queue(dev);
                        goto again;
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
index fb37b8095231..824df3b5ea49 100644
--- a/drivers/net/wan/lapbether.c
+++ b/drivers/net/wan/lapbether.c
@@ -58,7 +58,7 @@ struct lapbethdev {
        struct net_device_stats stats;          /* some statistics */
 };
-static struct list_head lapbeth_devices = LIST_HEAD_INIT(lapbeth_devices);
+static LIST_HEAD(lapbeth_devices);
 /* ------------------------------------------------------------------------ */
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c
index c6e70dbc5de8..2ab1d59870f4 100644
--- a/drivers/net/wireless/arlan-proc.c
+++ b/drivers/net/wireless/arlan-proc.c
@@ -1202,13 +1202,6 @@ static ctl_table arlan_table[MAX_ARLANS + 1] =
        { .ctl_name = 0 }
 };
 #endif
-#else
-static ctl_table arlan_table[MAX_ARLANS + 1] =
-{
-        { .ctl_name = 0 }
-};
-#endif
 // static int mmtu = 1234;
@@ -1233,7 +1226,6 @@ static ctl_table arlan_root_table[] =
 //};
-#ifdef CONFIG_PROC_FS
 static struct ctl_table_header *arlan_device_sysctl_header;
 int __init init_arlan_proc(void)
diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index e38ed0fe72e9..7fca2ebc747f 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -618,6 +618,7 @@ void b43_debugfs_remove_device(struct b43_wldev *dev)
        kfree(e);
 }
+/* Called with IRQs disabled. */
 void b43_debugfs_log_txstat(struct b43_wldev *dev,
                            const struct b43_txstatus *status)
 {
@@ -629,8 +630,7 @@ void b43_debugfs_log_txstat(struct b43_wldev *dev,
        if (!e)
                return;
        log = &e->txstatlog;
-        B43_WARN_ON(!irqs_disabled());
+        spin_lock(&log->lock); /* IRQs are already disabled. */
-        spin_lock(&log->lock);
        i = log->end + 1;
        if (i == B43_NR_LOGGED_TXSTATUS)
                i = 0;
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 3dfb28a34be9..948eb1fe916b 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -560,7 +560,7 @@ static int b43_dmacontroller_tx_reset(struct b43_wldev *dev, u16 mmio_base,
 /* Check if a DMA mapping address is invalid. */
 static bool b43_dma_mapping_error(struct b43_dmaring *ring,
                                  dma_addr_t addr,
-                                  size_t buffersize)
+                                  size_t buffersize, bool dma_to_device)
 {
        if (unlikely(dma_mapping_error(addr)))
                return 1;
@@ -568,11 +568,11 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
        switch (ring->type) {
        case B43_DMA_30BIT:
                if ((u64)addr + buffersize > (1ULL << 30))
-                        return 1;
+                        goto address_error;
                break;
        case B43_DMA_32BIT:
                if ((u64)addr + buffersize > (1ULL << 32))
-                        return 1;
+                        goto address_error;
                break;
        case B43_DMA_64BIT:
                /* Currently we can't have addresses beyond
@@ -582,6 +582,12 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
        /* The address is OK. */
        return 0;
+address_error:
+        /* We can't support this address. Unmap it again. */
+        unmap_descbuffer(ring, addr, buffersize, dma_to_device);
+        return 1;
 }
 static int setup_rx_descbuffer(struct b43_dmaring *ring,
@@ -599,7 +605,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
        if (unlikely(!skb))
                return -ENOMEM;
        dmaaddr = map_descbuffer(ring, skb->data, ring->rx_buffersize, 0);
-        if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize)) {
+        if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
                /* ugh. try to realloc in zone_dma */
                gfp_flags |= GFP_DMA;
@@ -612,7 +618,8 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
                                         ring->rx_buffersize, 0);
        }
-        if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize)) {
+        if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
+                b43err(ring->dev->wl, "RX DMA buffer allocation failed\n");
                dev_kfree_skb_any(skb);
                return -EIO;
        }
@@ -852,7 +859,8 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
                                          b43_txhdr_size(dev),
                                          DMA_TO_DEVICE);
-                if (b43_dma_mapping_error(ring, dma_test, b43_txhdr_size(dev))) {
+                if (b43_dma_mapping_error(ring, dma_test,
+                                          b43_txhdr_size(dev), 1)) {
                        /* ugh realloc */
                        kfree(ring->txhdr_cache);
                        ring->txhdr_cache = kcalloc(nr_slots,
@@ -867,8 +875,12 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
                                                  DMA_TO_DEVICE);
                        if (b43_dma_mapping_error(ring, dma_test,
-                                                  b43_txhdr_size(dev)))
+                                                  b43_txhdr_size(dev), 1)) {
+                                b43err(dev->wl,
+                                       "TXHDR DMA allocation failed\n");
                                goto err_kfree_txhdr_cache;
+                        }
                }
                dma_unmap_single(dev->dev->dev,
@@ -1189,7 +1201,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
        meta_hdr->dmaaddr = map_descbuffer(ring, (unsigned char *)header,
                                           hdrsize, 1);
-        if (b43_dma_mapping_error(ring, meta_hdr->dmaaddr, hdrsize)) {
+        if (b43_dma_mapping_error(ring, meta_hdr->dmaaddr, hdrsize, 1)) {
                ring->current_slot = old_top_slot;
                ring->used_slots = old_used_slots;
                return -EIO;
@@ -1208,7 +1220,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
        meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
        /* create a bounce buffer in zone_dma on mapping failure. */
-        if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len)) {
+        if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
                bounce_skb = __dev_alloc_skb(skb->len, GFP_ATOMIC | GFP_DMA);
                if (!bounce_skb) {
                        ring->current_slot = old_top_slot;
@@ -1222,7 +1234,7 @@ static int dma_tx_fragment(struct b43_dmaring *ring,
                skb = bounce_skb;
                meta->skb = skb;
                meta->dmaaddr = map_descbuffer(ring, skb->data, skb->len, 1);
-                if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len)) {
+                if (b43_dma_mapping_error(ring, meta->dmaaddr, skb->len, 1)) {
                        ring->current_slot = old_top_slot;
                        ring->used_slots = old_used_slots;
                        err = -EIO;
@@ -1337,6 +1349,7 @@ out_unlock:
        return err;
 }
+/* Called with IRQs disabled. */
 void b43_dma_handle_txstatus(struct b43_wldev *dev,
                             const struct b43_txstatus *status)
 {
@@ -1349,8 +1362,8 @@ void b43_dma_handle_txstatus(struct b43_wldev *dev,
        ring = parse_cookie(dev, status->cookie, &slot);
        if (unlikely(!ring))
                return;
-        B43_WARN_ON(!irqs_disabled());
-        spin_lock(&ring->lock);
+        spin_lock(&ring->lock); /* IRQs are already disabled. */
        B43_WARN_ON(!ring->tx);
        ops = ring->ops;
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 51dfce16178a..c73a75b24cd6 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2049,7 +2049,6 @@ void b43_mac_enable(struct b43_wldev *dev)
 {
        dev->mac_suspended--;
        B43_WARN_ON(dev->mac_suspended < 0);
-        B43_WARN_ON(irqs_disabled());
        if (dev->mac_suspended == 0) {
                b43_write32(dev, B43_MMIO_MACCTL,
                            b43_read32(dev, B43_MMIO_MACCTL)
@@ -2075,7 +2074,6 @@ void b43_mac_suspend(struct b43_wldev *dev)
        u32 tmp;
        might_sleep();
-        B43_WARN_ON(irqs_disabled());
        B43_WARN_ON(dev->mac_suspended < 0);
        if (dev->mac_suspended == 0) {
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index b79a6bd5396d..371e4a119511 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -91,6 +91,8 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
        dev->conf.ConfigBase = parse.config.base;
        dev->conf.Present = parse.config.rmask[0];
+        dev->conf.Attributes = CONF_ENABLE_IRQ;
+        dev->conf.IntType = INT_MEMORY_AND_IO;
        dev->io.BasePort2 = 0;
        dev->io.NumPorts2 = 0;
@@ -112,8 +114,8 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
        if (res != CS_SUCCESS)
                goto err_disable;
-        dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FIRST_SHARED;
+        dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-        dev->irq.IRQInfo1 = IRQ_LEVEL_ID | IRQ_SHARE_ID;
+        dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
        dev->irq.Handler = NULL; /* The handler is registered later. */
        dev->irq.Instance = NULL;
        res = pcmcia_request_irq(dev, &dev->irq);
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index 49978bdb4324..4fd73809602e 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -635,7 +635,6 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
 {
        struct ieee80211_hdr_4addr *hdr;
        int res, hdrlen;
-        DECLARE_MAC_BUF(mac);
        if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
                return 0;
@@ -647,8 +646,10 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
            strcmp(crypt->ops->name, "TKIP") == 0) {
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
-                               "received packet from %s\n",
+                               "received packet from " MAC_FMT "\n",
-                               local->dev->name, print_mac(mac, hdr->addr2));
+                               local->dev->name,
+                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
                }
                return -1;
        }
@@ -657,9 +658,12 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
        res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
        atomic_dec(&crypt->refcnt);
        if (res < 0) {
-                printk(KERN_DEBUG "%s: decryption failed (SA=%s"
+                printk(KERN_DEBUG "%s: decryption failed (SA=" MAC_FMT
                       ") res=%d\n",
-                       local->dev->name, print_mac(mac, hdr->addr2), res);
+                       local->dev->name,
+                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+                       res);
                local->comm_tallies.rx_discards_wep_undecryptable++;
                return -1;
        }
@@ -721,7 +725,6 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
        struct ieee80211_crypt_data *crypt = NULL;
        void *sta = NULL;
        int keyidx = 0;
-        DECLARE_MAC_BUF(mac);
        iface = netdev_priv(dev);
        local = iface->local;
@@ -798,8 +801,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                         * frames silently instead of filling system log with
                         * these reports. */
                        printk(KERN_DEBUG "%s: WEP decryption failed (not set)"
-                               " (SA=%s)\n",
+                               " (SA=" MAC_FMT ")\n",
-                               local->dev->name, print_mac(mac, hdr->addr2));
+                               local->dev->name,
+                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
 #endif
                        local->comm_tallies.rx_discards_wep_undecryptable++;
                        goto rx_dropped;
@@ -813,8 +818,9 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                    (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)
                {
                        printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
-                               "from %s\n", dev->name,
+                               "from " MAC_FMT "\n", dev->name,
-                               print_mac(mac, hdr->addr2));
+                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
                        /* TODO: could inform hostapd about this so that it
                         * could send auth failure report */
                        goto rx_dropped;
@@ -982,8 +988,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                               "unencrypted EAPOL frame\n", local->dev->name);
                } else {
                        printk(KERN_DEBUG "%s: encryption configured, but RX "
-                               "frame not encrypted (SA=%s)\n",
+                               "frame not encrypted (SA=" MAC_FMT ")\n",
-                               local->dev->name, print_mac(mac, hdr->addr2));
+                               local->dev->name,
+                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
                        goto rx_dropped;
                }
        }
@@ -992,9 +1000,10 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
            !hostap_is_eapol_frame(local, skb)) {
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "%s: dropped unencrypted RX data "
-                               "frame from %s"
+                               "frame from " MAC_FMT " (drop_unencrypted=1)\n",
-                               " (drop_unencrypted=1)\n",
+                               dev->name,
-                               dev->name, print_mac(mac, hdr->addr2));
+                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
                }
                goto rx_dropped;
        }
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index e7afc3ec3e6d..921c984416f8 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -314,7 +314,6 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
        struct ieee80211_hdr_4addr *hdr;
        u16 fc;
        int prefix_len, postfix_len, hdr_len, res;
-        DECLARE_MAC_BUF(mac);
        iface = netdev_priv(skb->dev);
        local = iface->local;
@@ -329,8 +328,10 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
                hdr = (struct ieee80211_hdr_4addr *) skb->data;
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
-                               "TX packet to %s\n",
+                               "TX packet to " MAC_FMT "\n",
-                               local->dev->name, print_mac(mac, hdr->addr1));
+                               local->dev->name,
+                               hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                               hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
                }
                kfree_skb(skb);
                return NULL;
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index ad040a3bb8a7..0acd9589c48c 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -632,7 +632,6 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)
        __le16 *pos;
        struct sta_info *sta = NULL;
        char *txt = NULL;
-        DECLARE_MAC_BUF(mac);
        if (ap->local->hostapd) {
                dev_kfree_skb(skb);
@@ -684,10 +683,12 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)
        if (sta)
                atomic_dec(&sta->users);
        if (txt) {
-                PDEBUG(DEBUG_AP, "%s: %s auth_cb - alg=%d "
+                PDEBUG(DEBUG_AP, "%s: " MAC_FMT " auth_cb - alg=%d "
                       "trans#=%d status=%d - %s\n",
-                       dev->name, print_mac(mac, hdr->addr1), auth_alg,
+                       dev->name,
-                       auth_transaction, status, txt);
+                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
+                       auth_alg, auth_transaction, status, txt);
        }
        dev_kfree_skb(skb);
 }
@@ -703,7 +704,6 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
        __le16 *pos;
        struct sta_info *sta = NULL;
        char *txt = NULL;
-        DECLARE_MAC_BUF(mac);
        if (ap->local->hostapd) {
                dev_kfree_skb(skb);
@@ -754,8 +754,11 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
        if (sta)
                atomic_dec(&sta->users);
        if (txt) {
-                PDEBUG(DEBUG_AP, "%s: %s assoc_cb - %s\n",
+                PDEBUG(DEBUG_AP, "%s: " MAC_FMT " assoc_cb - %s\n",
-                       dev->name, print_mac(mac, hdr->addr1), txt);
+                       dev->name,
+                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
+                       txt);
        }
        dev_kfree_skb(skb);
 }
@@ -767,7 +770,6 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)
        struct ap_data *ap = data;
        struct ieee80211_hdr_4addr *hdr;
        struct sta_info *sta;
-        DECLARE_MAC_BUF(mac);
        if (skb->len < 24)
                goto fail;
@@ -779,9 +781,11 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)
                        sta->flags &= ~WLAN_STA_PENDING_POLL;
                spin_unlock(&ap->sta_table_lock);
        } else {
-                PDEBUG(DEBUG_AP, "%s: STA %s"
+                PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
                       " did not ACK activity poll frame\n",
-                       ap->local->dev->name, print_mac(mac, hdr->addr1));
+                       ap->local->dev->name,
+                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
        }
 fail:
@@ -1306,7 +1310,6 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
        struct sta_info *sta = NULL;
        struct ieee80211_crypt_data *crypt;
        char *txt = "";
-        DECLARE_MAC_BUF(mac);
        len = skb->len - IEEE80211_MGMT_HDR_LEN;
@@ -1315,8 +1318,9 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
        if (len < 6) {
                PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload "
-                       "(len=%d) from %s\n", dev->name, len,
+                       "(len=%d) from " MAC_FMT "\n", dev->name, len,
-                       print_mac(mac, hdr->addr2));
+                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
                return;
        }
@@ -1381,8 +1385,10 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
                if (time_after(jiffies, sta->u.ap.last_beacon +
                               (10 * sta->listen_interval * HZ) / 1024)) {
                        PDEBUG(DEBUG_AP, "%s: no beacons received for a while,"
-                               " assuming AP %s is now STA\n",
+                               " assuming AP " MAC_FMT " is now STA\n",
-                               dev->name, print_mac(mac, sta->addr));
+                               dev->name,
+                               sta->addr[0], sta->addr[1], sta->addr[2],
+                               sta->addr[3], sta->addr[4], sta->addr[5]);
                        sta->ap = 0;
                        sta->flags = 0;
                        sta->u.sta.challenge = NULL;
@@ -1497,10 +1503,13 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
        }
        if (resp) {
-                PDEBUG(DEBUG_AP, "%s: %s auth (alg=%d "
+                PDEBUG(DEBUG_AP, "%s: " MAC_FMT " auth (alg=%d "
                       "trans#=%d stat=%d len=%d fc=%04x) ==> %d (%s)\n",
-                       dev->name, print_mac(mac, hdr->addr2), auth_alg,
+                       dev->name,
-                       auth_transaction, status_code, len, fc, resp, txt);
+                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+                       auth_alg, auth_transaction, status_code, len,
+                       fc, resp, txt);
        }
 }
@@ -1519,14 +1528,15 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
        int send_deauth = 0;
        char *txt = "";
        u8 prev_ap[ETH_ALEN];
-        DECLARE_MAC_BUF(mac);
        left = len = skb->len - IEEE80211_MGMT_HDR_LEN;
        if (len < (reassoc ? 10 : 4)) {
                PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload "
-                       "(len=%d, reassoc=%d) from %s\n",
+                       "(len=%d, reassoc=%d) from " MAC_FMT "\n",
-                       dev->name, len, reassoc, print_mac(mac, hdr->addr2));
+                       dev->name, len, reassoc,
+                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
                return;
        }
@@ -1603,9 +1613,12 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
                }
                if (left > 0) {
-                        PDEBUG(DEBUG_AP, "%s: assoc from %s"
+                        PDEBUG(DEBUG_AP, "%s: assoc from " MAC_FMT
                               " with extra data (%d bytes) [",
-                               dev->name, print_mac(mac, hdr->addr2), left);
+                               dev->name,
+                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+                               left);
                        while (left > 0) {
                                PDEBUG2(DEBUG_AP, "<%02x>", *u);
                                u++; left--;
@@ -1704,10 +1717,15 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
        }
 #if 0
-        PDEBUG(DEBUG_AP, "%s: %s %sassoc (len=%d "
+        PDEBUG(DEBUG_AP, "%s: " MAC_FMT" %sassoc (len=%d "
-               "prev_ap=%s) => %d(%d) (%s)\n",
+               "prev_ap=" MAC_FMT") => %d(%d) (%s)\n",
-               dev->name, print_mac(mac, hdr->addr2), reassoc ? "re" : "", len,
+               dev->name,
-               print_mac(mac, prev_ap), resp, send_deauth, txt);
+               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+               reassoc ? "re" : "", len,
+               prev_ap[0], prev_ap[1], prev_ap[2],
+               prev_ap[3], prev_ap[4], prev_ap[5],
+               resp, send_deauth, txt);
 #endif
 }
@@ -1735,9 +1753,11 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
        pos = (__le16 *) body;
        reason_code = le16_to_cpu(*pos);
-        PDEBUG(DEBUG_AP, "%s: deauthentication: %s len=%d, "
+        PDEBUG(DEBUG_AP, "%s: deauthentication: " MAC_FMT " len=%d, "
-               "reason_code=%d\n", dev->name, print_mac(mac, hdr->addr2), len,
+               "reason_code=%d\n", dev->name,
-               reason_code);
+               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+               len, reason_code);
        spin_lock_bh(&local->ap->sta_table_lock);
        sta = ap_get_sta(local->ap, hdr->addr2);
@@ -1748,9 +1768,11 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
        }
        spin_unlock_bh(&local->ap->sta_table_lock);
        if (sta == NULL) {
-                printk("%s: deauthentication from %s, "
+                printk("%s: deauthentication from " MAC_FMT ", "
               "reason_code=%d, but STA not authenticated\n", dev->name,
-                       print_mac(mac, hdr->addr2), reason_code);
+                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+                       reason_code);
        }
 }
@@ -1766,7 +1788,6 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
        u16 reason_code;
        __le16 *pos;
        struct sta_info *sta = NULL;
-        DECLARE_MAC_BUF(mac);
        len = skb->len - IEEE80211_MGMT_HDR_LEN;
@@ -1778,9 +1799,11 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
        pos = (__le16 *) body;
        reason_code = le16_to_cpu(*pos);
-        PDEBUG(DEBUG_AP, "%s: disassociation: %s len=%d, "
+        PDEBUG(DEBUG_AP, "%s: disassociation: " MAC_FMT " len=%d, "
-               "reason_code=%d\n", dev->name, print_mac(mac, hdr->addr2), len,
+               "reason_code=%d\n", dev->name,
-               reason_code);
+               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+               len, reason_code);
        spin_lock_bh(&local->ap->sta_table_lock);
        sta = ap_get_sta(local->ap, hdr->addr2);
@@ -1791,9 +1814,12 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
        }
        spin_unlock_bh(&local->ap->sta_table_lock);
        if (sta == NULL) {
-                printk("%s: disassociation from %s, "
+                printk("%s: disassociation from " MAC_FMT ", "
                       "reason_code=%d, but STA not authenticated\n",
-                       dev->name, print_mac(mac, hdr->addr2), reason_code);
+                       dev->name,
+                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+                       reason_code);
        }
 }
@@ -1882,16 +1908,20 @@ static void handle_pspoll(local_info_t *local,
        struct sta_info *sta;
        u16 aid;
        struct sk_buff *skb;
-        DECLARE_MAC_BUF(mac);
-        PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=%s"
+        PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=" MAC_FMT
-               ", TA=%s PWRMGT=%d\n",
+               ", TA=" MAC_FMT " PWRMGT=%d\n",
-               print_mac(mac, hdr->addr1), print_mac(mac, hdr->addr2),
+               hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+               hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
+               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
+               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
               !!(le16_to_cpu(hdr->frame_ctl) & IEEE80211_FCTL_PM));
        if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=%s"
+                PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=" MAC_FMT
-                       " not own MAC\n", print_mac(mac, hdr->addr1));
+                       " not own MAC\n",
+                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
                return;
        }
@@ -1969,7 +1999,6 @@ static void handle_wds_oper_queue(struct work_struct *work)
                                          wds_oper_queue);
        local_info_t *local = ap->local;
        struct wds_oper_data *entry, *prev;
-        DECLARE_MAC_BUF(mac);
        spin_lock_bh(&local->lock);
        entry = local->ap->wds_oper_entries;
@@ -1978,10 +2007,11 @@ static void handle_wds_oper_queue(struct work_struct *work)
        while (entry) {
                PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection "
-                       "to AP %s\n",
+                       "to AP " MAC_FMT "\n",
                       local->dev->name,
                       entry->type == WDS_ADD ? "adding" : "removing",
-                       print_mac(mac, entry->addr));
+                       entry->addr[0], entry->addr[1], entry->addr[2],
+                       entry->addr[3], entry->addr[4], entry->addr[5]);
                if (entry->type == WDS_ADD)
                        prism2_wds_add(local, entry->addr, 0);
                else if (entry->type == WDS_DEL)
@@ -2158,7 +2188,6 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
        u16 fc, type, stype;
        struct ieee80211_hdr_4addr *hdr;
-        DECLARE_MAC_BUF(mac);
        /* FIX: should give skb->len to handler functions and check that the
         * buffer is long enough */
@@ -2187,8 +2216,9 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
                if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
                        PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)="
-                               "%s not own MAC\n",
+                               MAC_FMT " not own MAC\n",
-                               print_mac(mac, hdr->addr1));
+                               hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                               hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
                        goto done;
                }
@@ -2224,14 +2254,18 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
        }
        if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=%s"
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=" MAC_FMT
-                       " not own MAC\n", print_mac(mac, hdr->addr1));
+                       " not own MAC\n",
+                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
                goto done;
        }
        if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=%s"
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=" MAC_FMT
-                       " not own MAC\n", print_mac(mac, hdr->addr3));
+                       " not own MAC\n",
+                       hdr->addr3[0], hdr->addr3[1], hdr->addr3[2],
+                       hdr->addr3[3], hdr->addr3[4], hdr->addr3[5]);
                goto done;
        }
@@ -2312,7 +2346,6 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
        struct sk_buff *skb;
        struct ieee80211_hdr_4addr *hdr;
        struct hostap_80211_rx_status rx_stats;
-        DECLARE_MAC_BUF(mac);
        if (skb_queue_empty(&sta->tx_buf))
                return;
@@ -2334,7 +2367,9 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
        hdr->duration_id = cpu_to_le16(sta->aid | BIT(15) | BIT(14));
        PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for STA "
-               "%s\n", local->dev->name, print_mac(mac, sta->addr));
+               MAC_FMT "\n", local->dev->name,
+               sta->addr[0], sta->addr[1], sta->addr[2],
+               sta->addr[3], sta->addr[4], sta->addr[5]);
        skb->dev = local->dev;
@@ -2661,7 +2696,6 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)
        int ret = sta->tx_rate;
        struct hostap_interface *iface;
        local_info_t *local;
-        DECLARE_MAC_BUF(mac);
        iface = netdev_priv(dev);
        local = iface->local;
@@ -2689,9 +2723,12 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)
                        case 3: sta->tx_rate = 110; break;
                        default: sta->tx_rate = 0; break;
                        }
-                        PDEBUG(DEBUG_AP, "%s: STA %s"
+                        PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
                               " TX rate raised to %d\n",
-                               dev->name, print_mac(mac, sta->addr), sta->tx_rate);
+                               dev->name,
+                               sta->addr[0], sta->addr[1], sta->addr[2],
+                               sta->addr[3], sta->addr[4], sta->addr[5],
+                               sta->tx_rate);
                }
                sta->tx_since_last_failure = 0;
        }
@@ -2709,7 +2746,6 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
        int set_tim, ret;
        struct ieee80211_hdr_4addr *hdr;
        struct hostap_skb_tx_data *meta;
-        DECLARE_MAC_BUF(mac);
        meta = (struct hostap_skb_tx_data *) skb->cb;
        ret = AP_TX_CONTINUE;
@@ -2745,8 +2781,9 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
                 * print out any errors here. */
                if (net_ratelimit()) {
                        printk(KERN_DEBUG "AP: drop packet to non-associated "
-                               "STA %s\n",
+                               "STA " MAC_FMT "\n",
-                               print_mac(mac, hdr->addr1));
+                               hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                               hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
                }
 #endif
                local->ap->tx_drop_nonassoc++;
@@ -2784,9 +2821,11 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
        }
        if (skb_queue_len(&sta->tx_buf) >= STA_MAX_TX_BUFFER) {
-                PDEBUG(DEBUG_PS, "%s: No more space in STA (%s"
+                PDEBUG(DEBUG_PS, "%s: No more space in STA (" MAC_FMT
                       ")'s PS mode buffer\n",
-                       local->dev->name, print_mac(mac, sta->addr));
+                       local->dev->name,
+                       sta->addr[0], sta->addr[1], sta->addr[2],
+                       sta->addr[3], sta->addr[4], sta->addr[5]);
                /* Make sure that TIM is set for the station (it might not be
                 * after AP wlan hw reset). */
                /* FIX: should fix hw reset to restore bits based on STA
@@ -2850,7 +2889,6 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
        struct sta_info *sta;
        struct ieee80211_hdr_4addr *hdr;
        struct hostap_skb_tx_data *meta;
-        DECLARE_MAC_BUF(mac);
        hdr = (struct ieee80211_hdr_4addr *) skb->data;
        meta = (struct hostap_skb_tx_data *) skb->cb;
@@ -2859,9 +2897,12 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
        sta = ap_get_sta(local->ap, hdr->addr1);
        if (!sta) {
                spin_unlock(&local->ap->sta_table_lock);
-                PDEBUG(DEBUG_AP, "%s: Could not find STA %s"
+                PDEBUG(DEBUG_AP, "%s: Could not find STA " MAC_FMT
                       " for this TX error (@%lu)\n",
-                       local->dev->name, print_mac(mac, hdr->addr1), jiffies);
+                       local->dev->name,
+                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
+                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
+                       jiffies);
                return;
        }
@@ -2888,9 +2929,11 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
                        case 3: sta->tx_rate = 110; break;
                        default: sta->tx_rate = 0; break;
                        }
-                        PDEBUG(DEBUG_AP, "%s: STA %s"
+                        PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
                               " TX rate lowered to %d\n",
-                               local->dev->name, print_mac(mac, sta->addr),
+                               local->dev->name,
+                               sta->addr[0], sta->addr[1], sta->addr[2],
+                               sta->addr[3], sta->addr[4], sta->addr[5],
                               sta->tx_rate);
                }
                sta->tx_consecutive_exc = 0;
@@ -2956,7 +2999,6 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
        struct sta_info *sta;
        u16 fc, type, stype;
        struct ieee80211_hdr_4addr *hdr;
-        DECLARE_MAC_BUF(mac);
        if (local->ap == NULL)
                return AP_RX_CONTINUE;
@@ -2988,9 +3030,12 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
                        } else {
                                printk(KERN_DEBUG "%s: dropped received packet"
                                       " from non-associated STA "
-                                       "%s"
+                                       MAC_FMT
                                       " (type=0x%02x, subtype=0x%02x)\n",
-                                       dev->name, print_mac(mac, hdr->addr2),
+                                       dev->name,
+                                       hdr->addr2[0], hdr->addr2[1],
+                                       hdr->addr2[2], hdr->addr2[3],
+                                       hdr->addr2[4], hdr->addr2[5],
                                       type >> 2, stype >> 4);
                                hostap_rx(dev, skb, rx_stats);
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
@@ -3025,8 +3070,11 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
                         * being associated. */
                        printk(KERN_DEBUG "%s: rejected received nullfunc "
                               "frame without ToDS from not associated STA "
-                               "%s\n",
+                               MAC_FMT "\n",
-                               dev->name, print_mac(mac, hdr->addr2));
+                               dev->name,
+                               hdr->addr2[0], hdr->addr2[1],
+                               hdr->addr2[2], hdr->addr2[3],
+                               hdr->addr2[4], hdr->addr2[5]);
                        hostap_rx(dev, skb, rx_stats);
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
                }
@@ -3043,9 +3091,12 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
                 * If BSSID is own, report the dropping of this frame. */
                if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) {
                        printk(KERN_DEBUG "%s: dropped received packet from "
-                               "%s with no ToDS flag "
+                               MAC_FMT " with no ToDS flag "
                               "(type=0x%02x, subtype=0x%02x)\n", dev->name,
-                               print_mac(mac, hdr->addr2), type >> 2, stype >> 4);
+                               hdr->addr2[0], hdr->addr2[1],
+                               hdr->addr2[2], hdr->addr2[3],
+                               hdr->addr2[4], hdr->addr2[5],
+                               type >> 2, stype >> 4);
                        hostap_dump_rx_80211(dev->name, skb, rx_stats);
                }
                ret = AP_RX_DROP;
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index a56d9fc6354f..98d6ff69d375 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -10192,7 +10192,6 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
        u8 id, hdr_len, unicast;
        u16 remaining_bytes;
        int fc;
-        DECLARE_MAC_BUF(mac);
        hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
        switch (priv->ieee->iw_mode) {
@@ -10203,8 +10202,10 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
                        id = ipw_add_station(priv, hdr->addr1);
                        if (id == IPW_INVALID_STATION) {
                                IPW_WARNING("Attempt to send data to "
-                                            "invalid cell: %s\n",
+                                            "invalid cell: " MAC_FMT "\n",
-                                            print_mac(mac, hdr->addr1));
+                                            hdr->addr1[0], hdr->addr1[1],
+                                            hdr->addr1[2], hdr->addr1[3],
+                                            hdr->addr1[4], hdr->addr1[5]);
                                goto drop;
                        }
                }
@@ -11576,6 +11577,7 @@ static int ipw_prom_alloc(struct ipw_priv *priv)
        priv->prom_priv->priv = priv;
        strcpy(priv->prom_net_dev->name, "rtap%d");
+        memcpy(priv->prom_net_dev->dev_addr, priv->mac_addr, ETH_ALEN);
        priv->prom_net_dev->type = ARPHRD_IEEE80211_RADIOTAP;
        priv->prom_net_dev->open = ipw_prom_open;
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig
index d1af938b9aa6..b54ff712e703 100644
--- a/drivers/net/wireless/iwlwifi/Kconfig
+++ b/drivers/net/wireless/iwlwifi/Kconfig
@@ -20,7 +20,7 @@ config IWL4965
          runs.
          If you want to compile the driver as a module ( = code which can be
-          inserted in and remvoed from the running kernel whenever you want),
+          inserted in and removed from the running kernel whenever you want),
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl4965.ko.
@@ -35,7 +35,6 @@ config IWL4965_HT
        bool "Enable 802.11n HT features in iwl4965 driver"
        depends on EXPERIMENTAL
        depends on IWL4965 && IWL4965_QOS
-        depends on n
        ---help---
          This option enables IEEE 802.11n High Throughput features
          for the iwl4965 driver.
@@ -101,7 +100,7 @@ config IWL3945
          runs.
          If you want to compile the driver as a module ( = code which can be
-          inserted in and remvoed from the running kernel whenever you want),
+          inserted in and removed from the running kernel whenever you want),
          say M here and read <file:Documentation/kbuild/modules.txt>.  The
          module will be called iwl3945.ko.
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index d727de8b96fe..65767570be68 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4589,7 +4589,7 @@ static u8 iwl4965_is_fat_tx_allowed(struct iwl4965_priv *priv,
        if (sta_ht_inf) {
                if ((!sta_ht_inf->ht_supported) ||
-                   (!sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH))
+                   (!(sta_ht_inf->cap & IEEE80211_HT_CAP_SUP_WIDTH)))
                        return 0;
        }
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 40b71bc2c4a4..cbaeaf186494 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -6206,11 +6206,11 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
        /* At this point, the NIC is initialized and operational */
        priv->notif_missed_beacons = 0;
-        set_bit(STATUS_READY, &priv->status);
        iwl3945_reg_txpower_periodic(priv);
        IWL_DEBUG_INFO("ALIVE processing complete.\n");
+        set_bit(STATUS_READY, &priv->status);
        wake_up_interruptible(&priv->wait_command_queue);
        if (priv->error_recovering)
@@ -8706,7 +8706,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
        return err;
 }
-static void iwl3945_pci_remove(struct pci_dev *pdev)
+static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
 {
        struct iwl3945_priv *priv = pci_get_drvdata(pdev);
        struct list_head *p, *q;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index a23d4798653b..60ec29eab85a 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -6628,11 +6628,11 @@ static void iwl4965_alive_start(struct iwl4965_priv *priv)
        /* At this point, the NIC is initialized and operational */
        priv->notif_missed_beacons = 0;
-        set_bit(STATUS_READY, &priv->status);
        iwl4965_rf_kill_ct_config(priv);
        IWL_DEBUG_INFO("ALIVE processing complete.\n");
+        set_bit(STATUS_READY, &priv->status);
        wake_up_interruptible(&priv->wait_command_queue);
        if (priv->error_recovering)
@@ -9282,7 +9282,7 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
        return err;
 }
-static void iwl4965_pci_remove(struct pci_dev *pdev)
+static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
 {
        struct iwl4965_priv *priv = pci_get_drvdata(pdev);
        struct list_head *p, *q;
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 87e145ffe8f1..6a24ed6067e0 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -541,7 +541,7 @@ void lbs_association_worker(struct work_struct *work)
        }
        if (find_any_ssid) {
-                u8 new_mode;
+                u8 new_mode = assoc_req->mode;
                ret = lbs_find_best_network_ssid(priv, assoc_req->ssid,
                                &assoc_req->ssid_len, assoc_req->mode, &new_mode);
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 5a9cadb97503..038c66a98f15 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -677,9 +677,7 @@ sbi_get_int_status_exit:
        /* Card has a command result for us */
        if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) {
-                spin_lock(&priv->driver_lock);
                ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len);
-                spin_unlock(&priv->driver_lock);
                if (ret < 0)
                        lbs_pr_err("could not receive cmd from card\n");
        }
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index bd305f7f3efd..e873a39fcce3 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1393,11 +1393,20 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
 exit:
        /*
-         * Set device mode to sleep for power management.
+         * Set device mode to sleep for power management,
+         * on some hardware this call seems to consistently fail.
+         * From the specifications it is hard to tell why it fails,
+         * and if this is a "bad thing".
+         * Overall it is safe to just ignore the failure and
+         * continue suspending. The only downside is that the
+         * device will not be in optimal power save mode, but with
+         * the radio and the other components already disabled the
+         * device is as good as disabled.
         */
        retval = rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP);
        if (retval)
-                return retval;
+                WARNING(rt2x00dev, "Device failed to enter sleep state, "
+                        "continue suspending.\n");
        return 0;
 }
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 93ea212fedd5..ad2e7d53b3da 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2399,10 +2399,8 @@ static int rt61pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
         * beacon frame.
         */
        if (skb_headroom(skb) < TXD_DESC_SIZE) {
-                if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC)) {
+                if (pskb_expand_head(skb, TXD_DESC_SIZE, 0, GFP_ATOMIC))
-                        dev_kfree_skb(skb);
                        return -ENOMEM;
-                }
        }
        /*
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 8103d41a1543..3909cf42f472 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2095,6 +2095,8 @@ static struct usb_device_id rt73usb_device_table[] = {
        { USB_DEVICE(0x1371, 0x9032), USB_DEVICE_DATA(&rt73usb_ops) },
        /* Conceptronic */
        { USB_DEVICE(0x14b2, 0x3c22), USB_DEVICE_DATA(&rt73usb_ops) },
+        /* Corega */
+        { USB_DEVICE(0x07aa, 0x002e), USB_DEVICE_DATA(&rt73usb_ops) },
        /* D-Link */
        { USB_DEVICE(0x07d1, 0x3c03), USB_DEVICE_DATA(&rt73usb_ops) },
        { USB_DEVICE(0x07d1, 0x3c04), USB_DEVICE_DATA(&rt73usb_ops) },
diff --git a/drivers/net/wireless/wavelan_cs.h b/drivers/net/wireless/wavelan_cs.h
index fabc63ee153c..2e4bfe4147c6 100644
--- a/drivers/net/wireless/wavelan_cs.h
+++ b/drivers/net/wireless/wavelan_cs.h
@@ -309,7 +309,7 @@ struct mmw_t
 #define MMW_EXT_ANT_INTERNAL    0x00    /* Internal antenna */
 #define MMW_EXT_ANT_EXTERNAL    0x03    /* External antenna */
 #define MMW_EXT_ANT_IQ_TEST     0x1C    /* IQ test pattern (set to 0) */
-};
+} __attribute__((packed));
 /* Size for structure checking (if padding is correct) */
 #define MMW_SIZE        37
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index d76d37bcb9cc..a85808938205 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1568,9 +1568,8 @@ static void __devinit detect_and_report_it87(void)
                outb(r | 8, 0x2F);
                outb(0x02, 0x2E);       /* Lock */
                outb(0x02, 0x2F);
-                release_region(0x2e, 1);
        }
+        release_region(0x2e, 1);
 }
 #endif /* CONFIG_PARPORT_PC_SUPERIO */
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/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 9e7de63b26ef..02a4c8cf2b2d 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -252,6 +252,7 @@ config RTC_DRV_TWL92330
 config RTC_DRV_S35390A
        tristate "Seiko Instruments S-35390A"
+        select BITREVERSE
        help
          If you say yes here you will get support for the Seiko
          Instruments S-35390A.
diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c
index d3b9b14267ab..42244f14b41c 100644
--- a/drivers/rtc/rtc-at32ap700x.c
+++ b/drivers/rtc/rtc-at32ap700x.c
@@ -290,7 +290,7 @@ static int __exit at32_rtc_remove(struct platform_device *pdev)
        return 0;
 }
-MODULE_ALIAS("at32ap700x_rtc");
+MODULE_ALIAS("platform:at32ap700x_rtc");
 static struct platform_driver at32_rtc_driver = {
        .remove         = __exit_p(at32_rtc_remove),
diff --git a/drivers/rtc/rtc-at91rm9200.c b/drivers/rtc/rtc-at91rm9200.c
index 33795e5a5595..52abffc86bcd 100644
--- a/drivers/rtc/rtc-at91rm9200.c
+++ b/drivers/rtc/rtc-at91rm9200.c
@@ -407,3 +407,4 @@ module_exit(at91_rtc_exit);
 MODULE_AUTHOR("Rick Bronson");
 MODULE_DESCRIPTION("RTC driver for Atmel AT91RM9200");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:at91_rtc");
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c
index d90ba860d216..4f28045d9ef2 100644
--- a/drivers/rtc/rtc-bfin.c
+++ b/drivers/rtc/rtc-bfin.c
@@ -470,3 +470,4 @@ module_exit(bfin_rtc_exit);
 MODULE_DESCRIPTION("Blackfin On-Chip Real Time Clock Driver");
 MODULE_AUTHOR("Mike Frysinger <vapier@gentoo.org>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:rtc-bfin");
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index f3ee2ad566b4..b48517021ee6 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -943,6 +943,9 @@ static void cmos_platform_shutdown(struct platform_device *pdev)
        cmos_do_shutdown();
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:rtc_cmos");
 static struct platform_driver cmos_platform_driver = {
        .remove         = __exit_p(cmos_platform_remove),
        .shutdown       = cmos_platform_shutdown,
diff --git a/drivers/rtc/rtc-ds1216.c b/drivers/rtc/rtc-ds1216.c
index 83efb88f8f23..0b17770b032b 100644
--- a/drivers/rtc/rtc-ds1216.c
+++ b/drivers/rtc/rtc-ds1216.c
@@ -221,6 +221,7 @@ MODULE_AUTHOR("Thomas Bogendoerfer <tsbogend@alpha.franken.de>");
 MODULE_DESCRIPTION("DS1216 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("platform:rtc-ds1216");
 module_init(ds1216_rtc_init);
 module_exit(ds1216_rtc_exit);
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index d74b8086fa31..d08912f18ddd 100644
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -626,6 +626,9 @@ ds1511_rtc_remove(struct platform_device *pdev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:ds1511");
 static struct platform_driver ds1511_rtc_driver = {
        .probe          = ds1511_rtc_probe,
        .remove         = __devexit_p(ds1511_rtc_remove),
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index d9e848dcd450..a19f11415540 100644
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -391,6 +391,9 @@ static int __devexit ds1553_rtc_remove(struct platform_device *pdev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:rtc-ds1553");
 static struct platform_driver ds1553_rtc_driver = {
        .probe          = ds1553_rtc_probe,
        .remove         = __devexit_p(ds1553_rtc_remove),
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 2e73f0b183b2..24d35ede2dbf 100644
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -276,3 +276,4 @@ MODULE_AUTHOR("Atsushi Nemoto <anemo@mba.ocn.ne.jp>");
 MODULE_DESCRIPTION("Dallas DS1742 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("platform:rtc-ds1742");
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c
index ef4f147f3c0c..1e99325270df 100644
--- a/drivers/rtc/rtc-ep93xx.c
+++ b/drivers/rtc/rtc-ep93xx.c
@@ -132,6 +132,9 @@ static int __devexit ep93xx_rtc_remove(struct platform_device *dev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:ep93xx-rtc");
 static struct platform_driver ep93xx_rtc_platform_driver = {
        .driver         = {
                .name   = "ep93xx-rtc",
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index cd0bbc0e8038..013e6c103b9c 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -465,6 +465,9 @@ static int __devexit m48t59_rtc_remove(struct platform_device *pdev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:rtc-m48t59");
 static struct platform_driver m48t59_rtc_driver = {
        .driver         = {
                .name   = "rtc-m48t59",
diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index 8ff4a1221f59..3f7f99a5d96a 100644
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -199,6 +199,7 @@ MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
 MODULE_DESCRIPTION("M48T86 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
+MODULE_ALIAS("platform:rtc-m48t86");
 module_init(m48t86_rtc_init);
 module_exit(m48t86_rtc_exit);
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index a2f84f169588..58f81c774943 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -497,7 +497,7 @@ static void omap_rtc_shutdown(struct platform_device *pdev)
        rtc_write(0, OMAP_RTC_INTERRUPTS_REG);
 }
-MODULE_ALIAS("omap_rtc");
+MODULE_ALIAS("platform:omap_rtc");
 static struct platform_driver omap_rtc_driver = {
        .probe          = omap_rtc_probe,
        .remove         = __devexit_p(omap_rtc_remove),
diff --git a/drivers/rtc/rtc-rs5c313.c b/drivers/rtc/rtc-rs5c313.c
index 66eb133bf5fd..664e89a817ed 100644
--- a/drivers/rtc/rtc-rs5c313.c
+++ b/drivers/rtc/rtc-rs5c313.c
@@ -421,3 +421,4 @@ MODULE_VERSION(DRV_VERSION);
 MODULE_AUTHOR("kogiidena , Nobuhiro Iwamatsu <iwamatsu@nigauri.org>");
 MODULE_DESCRIPTION("Ricoh RS5C313 RTC device driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 86766f1f2496..9f4d5129a496 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -592,3 +592,4 @@ module_exit(s3c_rtc_exit);
 MODULE_DESCRIPTION("Samsung S3C RTC Driver");
 MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:s3c2410-rtc");
diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index ee253cc45de1..82f62d25f921 100644
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -399,3 +399,4 @@ module_exit(sa1100_rtc_exit);
 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
 MODULE_DESCRIPTION("SA11x0/PXA2xx Realtime Clock Driver (RTC)");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:sa1100-rtc");
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index c1d6a1880ccf..9e9caa5d7f5f 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -664,3 +664,4 @@ MODULE_DESCRIPTION("SuperH on-chip RTC driver");
 MODULE_VERSION(DRV_VERSION);
 MODULE_AUTHOR("Paul Mundt <lethal@linux-sh.org>, Jamie Lenehan <lenehan@twibble.org>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:" DRV_NAME);
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index a265da7c6ff8..31d3c8c28588 100644
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -394,6 +394,9 @@ static int __devexit stk17ta8_rtc_remove(struct platform_device *pdev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:stk17ta8");
 static struct platform_driver stk17ta8_rtc_driver = {
        .probe          = stk17ta8_rtc_probe,
        .remove         = __devexit_p(stk17ta8_rtc_remove),
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c
index a6b572978dc0..24203a06051a 100644
--- a/drivers/rtc/rtc-v3020.c
+++ b/drivers/rtc/rtc-v3020.c
@@ -264,3 +264,4 @@ module_exit(v3020_exit);
 MODULE_DESCRIPTION("V3020 RTC");
 MODULE_AUTHOR("Raphael Assenat");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:v3020");
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index ce2f78de7a80..be9c70d0b193 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -422,6 +422,9 @@ static int __devexit rtc_remove(struct platform_device *pdev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:RTC");
 static struct platform_driver rtc_platform_driver = {
        .probe          = rtc_probe,
        .remove         = __devexit_p(rtc_remove),
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 &&
+        if (shost->transportt->host_size) {
-            (shost->shost_data = kzalloc(shost->transportt->host_size,
+                shost->shost_data = kzalloc(shost->transportt->host_size,
-                                         GFP_KERNEL)) == NULL)
+                                         GFP_KERNEL);
-                goto out_del_classdev;
+                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 DRV_VERSION     "0.5.2"
-#define _MV_DUMP 0
+#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];
+#ifdef MVS_USE_TASKLET
-        u32                     can_queue;      /* per adapter */
+        struct tasklet_struct   tasklet;
-        u32                     tag_out;        /*Get*/
+#endif
-        u32                     tag_in;         /*Give*/
-};
-struct mvs_queue_task {
-        struct list_head list;
-        void   *uldd_task;
 };
 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;
+        w_ptr = slot->tx;
-        r_ptr = mr32(TX_CONS_IDX) & TX_RING_SZ_MASK;
        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",
+                "Delivery Queue Size=%04d , WRT_PTR=%04X\n", sz, w_ptr);
-                sz, w_ptr, r_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",
+        dev_printk(KERN_DEBUG, &pdev->dev, "Completion Task = 0x%p\n",
-                   (u32) mvi->slot_info[rx_desc & RXQ_SLOT_MASK].task);
+                   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);
+        void *bitmap = (void *) &mvi->tags;
-        mvi->tags[mvi->tag_in] = tag;
+        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) {
+        unsigned int index, tag;
-                *tag_out = mvi->tags[mvi->tag_out];
+        void *bitmap = (void *) &mvi->tags;
-                mvi->tag_out = (mvi->tag_out + 1) & (MVS_SLOTS - 1);
-                return 0;
+        index = find_first_zero_bit(bitmap, MVS_SLOTS);
-        }
+        tag = index;
-        return -EBUSY;
+        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;
+                mvs_tag_clear(mvi, i);
-        mvi->tag_out = 0;
-        mvi->tag_in = MVS_SLOTS - 1;
 }
 #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);
+                        u32 tmp = mvs_read_port_irq_mask(mvi, phy_no);
-                        mvs_write_port_irq_mask(mvi, port_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;
+        u32 err_dw0 = le32_to_cpu(*(u32 *) (slot->response));
-        void __iomem *regs = mvi->regs;
+        u32 err_dw1 = le32_to_cpu(*(u32 *) (slot->response + 4));
-        u32 tmp;
+        int stat = SAM_CHECK_COND;
-        if (err_dw0 & CMD_ISS_STPD)
+        if (err_dw1 & SLOT_BSY_ERR) {
-                if (sas_protocol_ata(task->task_proto)) {
+                stat = SAS_QUEUE_FULL;
-                        tmp = mr32(INT_STAT_SRS);
+                mvs_slot_reset(mvi, task, slot_idx);
-                        mw32(INT_STAT_SRS, tmp & 0xFFFF);
+        }
-                }
+        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 task_status_struct *tstat;
-        struct mvs_port *port = &mvi->port[task->dev->port->id];
+        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 || flags)) {
-        if (unlikely(!port->port_attached)) {
+                mvs_slot_err(mvi, task, slot_idx);
-                tstat->stat = SAS_PHY_DOWN;
+                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)) {
+        if (unlikely((rx_desc & RXQ_ERR) && (*(u64 *) slot->response))) {
-                tstat->stat = SAM_CHECK_COND;
+                tstat->stat = mvs_slot_err(mvi, task, slot_idx);
-                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 =
+                        tstat->stat = mvs_sata_done(mvi, task, slot_idx, 0);
-                            (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);
                        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;
+        rx_prod_idx = mvi->rx_cons;
-        if (rx_prod_idx == 0xfff) {     /* h/w hasn't touched RX ring yet */
+        mvi->rx_cons = le32_to_cpu(mvi->rx[0]);
-                mvi->rx_cons = 0xfff;
+        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)
+        if (mvi->rx_cons == rx_prod_idx)
-                mvi->rx_cons = MVS_RX_RING_SZ - 1;
+                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]);
+                rx_desc = le32_to_cpu(mvi->rx[rx_prod_idx + 1]);
-                mvs_hba_cq_dump(mvi);
                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)
+        if (qc) {
-                tag = qc->tag;
+                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) {
+        if (task->ata_task.use_ncq && mvs_get_ncq_tag(task, &hdr->tags))
-                hdr->tags = cpu_to_le32(mvs_get_ncq_tag(task));
+                task->ata_task.fis.sector_count |= hdr->tags << 3;
-                /*Fill in task file */
+        else
-                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;
+                        if (sas_protocol_ata(t->task_proto)) {
-                        ts->stat = SAS_PHY_DOWN;
+                                rc = SAS_PHY_DOWN;
-                        t->task_done(t);
+                                goto out_done;
-                        rc = 0;
+                        } else {
-                        goto exec_exit;
+                                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;
+                slot = &mvi->slot_info[tag];
-                mvi->slot_info[tag].n_elem = n_elem;
+                t->lldd_task = NULL;
-                memset(mvi->slot_info[tag].buf, 0, MVS_SLOT_BUF_SZ);
+                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)
-                if (n == 1)
+                        t = list_entry(t->list.next, struct sas_task, list);
-                        break;
-                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! "
+                dev_printk(KERN_DEBUG, &pdev->dev, "STP Abort! \n");
-                        "Dump D2H FIS: \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;
+                phy->minimum_linkrate =
-                /* Updated attached_sas_addr */
+                        (phy->phy_status &
-                mvs_write_port_cfg_addr(mvi, i, PHYR_ATT_ADDR_HI);
+                                PHY_MIN_SPP_PHYS_LINK_RATE_MASK) >> 8;
-                phy->att_dev_sas_addr =
+                phy->maximum_linkrate =
-                                (u64) mvs_read_port_cfg_data(mvi, i) << 32;
+                        (phy->phy_status &
+                                PHY_MAX_SPP_PHYS_LINK_RATE_MASK) >> 12;
-                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);
                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.c b/drivers/scsi/scsi.c
index e5c6f6af8765..c78b836f59dd 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -181,6 +181,18 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
        cmd = kmem_cache_alloc(shost->cmd_pool->cmd_slab,
                               gfp_mask | shost->cmd_pool->gfp_mask);
+        if (likely(cmd)) {
+                buf = kmem_cache_alloc(shost->cmd_pool->sense_slab,
+                                       gfp_mask | shost->cmd_pool->gfp_mask);
+                if (likely(buf)) {
+                        memset(cmd, 0, sizeof(*cmd));
+                        cmd->sense_buffer = buf;
+                } else {
+                        kmem_cache_free(shost->cmd_pool->cmd_slab, cmd);
+                        cmd = NULL;
+                }
+        }
        if (unlikely(!cmd)) {
                unsigned long flags;
@@ -197,16 +209,6 @@ struct scsi_cmnd *__scsi_get_command(struct Scsi_Host *shost, gfp_t gfp_mask)
                        memset(cmd, 0, sizeof(*cmd));
                        cmd->sense_buffer = buf;
                }
-        } else {
-                buf = kmem_cache_alloc(shost->cmd_pool->sense_slab,
-                                       gfp_mask | shost->cmd_pool->gfp_mask);
-                if (likely(buf)) {
-                        memset(cmd, 0, sizeof(*cmd));
-                        cmd->sense_buffer = buf;
-                } else {
-                        kmem_cache_free(shost->cmd_pool->cmd_slab, cmd);
-                        cmd = NULL;
-                }
        }
        return cmd;
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index b9b09a704584..ed83cdb6e67d 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -294,7 +294,6 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)
        }
        if (sdev->request_queue) {
-                bsg_unregister_queue(sdev->request_queue);
                sdev->request_queue->queuedata = NULL;
                /* user context needed to free queue */
                scsi_free_queue(sdev->request_queue);
@@ -858,6 +857,7 @@ void __scsi_remove_device(struct scsi_device *sdev)
        if (scsi_device_set_state(sdev, SDEV_CANCEL) != 0)
                return;
+        bsg_unregister_queue(sdev->request_queue);
        class_device_unregister(&sdev->sdev_classdev);
        transport_remove_device(dev);
        device_del(dev);
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 */
+        /* disable PDC transmit */
-                UART_PUT_PTCR(port, ATMEL_PDC_TXTDIS);
+        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/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 85687aaf9cab..1749a27be066 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -863,3 +863,4 @@ module_exit(atmel_spi_exit);
 MODULE_DESCRIPTION("Atmel AT32/AT91 SPI Controller driver");
 MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:atmel_spi");
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c
index 41a3d00c4515..072c4a595334 100644
--- a/drivers/spi/au1550_spi.c
+++ b/drivers/spi/au1550_spi.c
@@ -958,6 +958,9 @@ static int __exit au1550_spi_remove(struct platform_device *pdev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:au1550-spi");
 static struct platform_driver au1550_spi_drv = {
        .remove = __exit_p(au1550_spi_remove),
        .driver = {
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index a86315a0c5b8..90729469d481 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -500,6 +500,9 @@ static int __exit mpc52xx_psc_spi_remove(struct platform_device *dev)
        return mpc52xx_psc_spi_do_remove(&dev->dev);
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:mpc52xx-psc-spi");
 static struct platform_driver mpc52xx_psc_spi_platform_driver = {
        .remove = __exit_p(mpc52xx_psc_spi_remove),
        .driver = {
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c
index a6ba11afb03f..b1cc148036c1 100644
--- a/drivers/spi/omap2_mcspi.c
+++ b/drivers/spi/omap2_mcspi.c
@@ -1084,6 +1084,9 @@ static int __exit omap2_mcspi_remove(struct platform_device *pdev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:omap2_mcspi");
 static struct platform_driver omap2_mcspi_driver = {
        .driver = {
                .name =         "omap2_mcspi",
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index 8245b5153f30..5f00bd6500ef 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -537,10 +537,12 @@ static int __exit uwire_remove(struct platform_device *pdev)
        return status;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:omap_uwire");
 static struct platform_driver uwire_driver = {
        .driver = {
                .name           = "omap_uwire",
-                .bus            = &platform_bus_type,
                .owner          = THIS_MODULE,
        },
        .remove         = __exit_p(uwire_remove),
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 59deed79e0ab..147e26a78d64 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -44,6 +44,7 @@
 MODULE_AUTHOR("Stephen Street");
 MODULE_DESCRIPTION("PXA2xx SSP SPI Controller");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-spi");
 #define MAX_BUSES 3
@@ -1581,7 +1582,6 @@ static int pxa2xx_spi_resume(struct platform_device *pdev)
 static struct platform_driver driver = {
        .driver = {
                .name = "pxa2xx-spi",
-                .bus = &platform_bus_type,
                .owner = THIS_MODULE,
        },
        .remove = pxa2xx_spi_remove,
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c
index d853fceb6bf0..a9ac1fdb3094 100644
--- a/drivers/spi/spi_bfin5xx.c
+++ b/drivers/spi/spi_bfin5xx.c
@@ -713,8 +713,8 @@ static void pump_transfers(unsigned long data)
        } else {
                drv_data->len = transfer->len;
        }
-        dev_dbg(&drv_data->pdev->dev, "transfer: ",
+        dev_dbg(&drv_data->pdev->dev,
-                "drv_data->write is %p, chip->write is %p, null_wr is %p\n",
+                "transfer: drv_data->write is %p, chip->write is %p, null_wr is %p\n",
                drv_data->write, chip->write, null_writer);
        /* speed and width has been set on per message */
@@ -1294,6 +1294,12 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
                goto out_error_queue_alloc;
        }
+        status = peripheral_request_list(drv_data->pin_req, DRV_NAME);
+        if (status != 0) {
+                dev_err(&pdev->dev, ": Requesting Peripherals failed\n");
+                goto out_error_queue_alloc;
+        }
        /* Register with the SPI framework */
        platform_set_drvdata(pdev, drv_data);
        status = spi_register_master(master);
@@ -1302,12 +1308,6 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
                goto out_error_queue_alloc;
        }
-        status = peripheral_request_list(drv_data->pin_req, DRV_NAME);
-        if (status != 0) {
-                dev_err(&pdev->dev, ": Requesting Peripherals failed\n");
-                goto out_error;
-        }
        dev_info(dev, "%s, Version %s, regs_base@%p, dma channel@%d\n",
                DRV_DESC, DRV_VERSION, drv_data->regs_base,
                drv_data->dma_channel);
@@ -1319,7 +1319,6 @@ out_error_no_dma_ch:
        iounmap((void *) drv_data->regs_base);
 out_error_ioremap:
 out_error_get_res:
-out_error:
        spi_master_put(master);
        return status;
@@ -1397,7 +1396,7 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
 #define bfin5xx_spi_resume NULL
 #endif                          /* CONFIG_PM */
-MODULE_ALIAS("bfin-spi-master");        /* for platform bus hotplug */
+MODULE_ALIAS("platform:bfin-spi");
 static struct platform_driver bfin5xx_spi_driver = {
        .driver = {
                .name   = DRV_NAME,
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 1b0647124933..d4ba640366b6 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -1722,10 +1722,12 @@ static int spi_imx_resume(struct platform_device *pdev)
 #define spi_imx_resume NULL
 #endif /* CONFIG_PM */
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:spi_imx");
 static struct platform_driver driver = {
        .driver = {
                .name = "spi_imx",
-                .bus = &platform_bus_type,
                .owner = THIS_MODULE,
        },
        .remove = __exit_p(spi_imx_remove),
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c
index 04f7cd9fc261..be15a6213205 100644
--- a/drivers/spi/spi_mpc83xx.c
+++ b/drivers/spi/spi_mpc83xx.c
@@ -523,11 +523,12 @@ static int __exit mpc83xx_spi_remove(struct platform_device *dev)
        return 0;
 }
-MODULE_ALIAS("mpc83xx_spi");                    /* for platform bus hotplug */
+MODULE_ALIAS("platform:mpc83xx_spi");
 static struct platform_driver mpc83xx_spi_driver = {
        .remove = __exit_p(mpc83xx_spi_remove),
        .driver = {
-                   .name = "mpc83xx_spi",
+                .name = "mpc83xx_spi",
+                .owner = THIS_MODULE,
        },
 };
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 6e834b8b9d27..e75103aac790 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -415,7 +415,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev)
 #define s3c24xx_spi_resume  NULL
 #endif
-MODULE_ALIAS("s3c2410_spi");                    /* for platform bus hotplug */
+MODULE_ALIAS("platform:s3c2410-spi");
 static struct platform_driver s3c24xx_spidrv = {
        .remove         = __exit_p(s3c24xx_spi_remove),
        .suspend        = s3c24xx_spi_suspend,
diff --git a/drivers/spi/spi_s3c24xx_gpio.c b/drivers/spi/spi_s3c24xx_gpio.c
index 82ae7d7eca38..e33f6145c560 100644
--- a/drivers/spi/spi_s3c24xx_gpio.c
+++ b/drivers/spi/spi_s3c24xx_gpio.c
@@ -168,6 +168,8 @@ static int s3c2410_spigpio_remove(struct platform_device *dev)
 #define s3c2410_spigpio_suspend NULL
 #define s3c2410_spigpio_resume NULL
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:spi_s3c24xx_gpio");
 static struct platform_driver s3c2410_spigpio_drv = {
        .probe          = s3c2410_spigpio_probe,
diff --git a/drivers/spi/spi_sh_sci.c b/drivers/spi/spi_sh_sci.c
index 3dbe71b16d60..7d36720eb982 100644
--- a/drivers/spi/spi_sh_sci.c
+++ b/drivers/spi/spi_sh_sci.c
@@ -203,3 +203,4 @@ module_exit(sh_sci_spi_exit);
 MODULE_DESCRIPTION("SH SCI SPI Driver");
 MODULE_AUTHOR("Magnus Damm <damm@opensource.se>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:spi_sh_sci");
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c
index 363ac8e68821..2296f37ea3c6 100644
--- a/drivers/spi/spi_txx9.c
+++ b/drivers/spi/spi_txx9.c
@@ -450,6 +450,9 @@ static int __exit txx9spi_remove(struct platform_device *dev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:spi_txx9");
 static struct platform_driver txx9spi_driver = {
        .remove = __exit_p(txx9spi_remove),
        .driver = {
diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 5d04f520c123..cf6aef34fe25 100644
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -408,6 +408,9 @@ static int __devexit xilinx_spi_remove(struct platform_device *dev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:" XILINX_SPI_NAME);
 static struct platform_driver xilinx_spi_driver = {
        .probe  = xilinx_spi_probe,
        .remove = __devexit_p(xilinx_spi_remove),
diff --git a/drivers/ssb/driver_mipscore.c b/drivers/ssb/driver_mipscore.c
index 3d3dd32bf3ab..a9e7eb45b2e7 100644
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -109,12 +109,13 @@ static void set_irq(struct ssb_device *dev, unsigned int irq)
                clear_irq(bus, oldirq);
        /* assign the new one */
-        if (irq == 0)
+        if (irq == 0) {
-                ssb_write32(mdev, SSB_INTVEC, ((1 << irqflag) & ssb_read32(mdev, SSB_INTVEC)));
+                ssb_write32(mdev, SSB_INTVEC, ((1 << irqflag) | ssb_read32(mdev, SSB_INTVEC)));
+        } else {
-        irqflag <<= ipsflag_irq_shift[irq];
+                irqflag <<= ipsflag_irq_shift[irq];
-        irqflag |= (ssb_read32(mdev, SSB_IPSFLAG) & ~ipsflag_irq_mask[irq]);
+                irqflag |= (ssb_read32(mdev, SSB_IPSFLAG) & ~ipsflag_irq_mask[irq]);
-        ssb_write32(mdev, SSB_IPSFLAG, irqflag);
+                ssb_write32(mdev, SSB_IPSFLAG, irqflag);
+        }
 }
 static void ssb_mips_serial_init(struct ssb_mipscore *mcore)
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c
index 74b9a8aea52b..5d777f211699 100644
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -551,7 +551,7 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
                } else {
                        tmp = ssb_read32(dev, SSB_TPSFLAG);
                        tmp &= SSB_TPSFLAG_BPFLAG;
-                        intvec |= tmp;
+                        intvec |= (1 << tmp);
                }
                ssb_write32(pdev, SSB_INTVEC, intvec);
        }
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c
index bedb2b4ee9d2..72017bf2e577 100644
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1044,6 +1044,12 @@ int ssb_bus_may_powerdown(struct ssb_bus *bus)
                goto out;
        cc = &bus->chipco;
+        if (!cc->dev)
+                goto out;
+        if (cc->dev->id.revision < 5)
+                goto out;
        ssb_chipco_set_clockmode(cc, SSB_CLKMODE_SLOW);
        err = ssb_pci_xtal(bus, SSB_GPIO_XTAL | SSB_GPIO_PLL, 0);
        if (err)
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index a83e8b798ec9..fd15ced899d8 100644
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1884,3 +1884,4 @@ module_exit(udc_exit_module);
 MODULE_DESCRIPTION("AT91 udc driver");
 MODULE_AUTHOR("Thomas Rathbone, David Brownell");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:at91_udc");
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c
index af8b2a3a2d4a..b0db4c31d018 100644
--- a/drivers/usb/gadget/atmel_usba_udc.c
+++ b/drivers/usb/gadget/atmel_usba_udc.c
@@ -2054,6 +2054,7 @@ static struct platform_driver udc_driver = {
        .remove         = __exit_p(usba_udc_remove),
        .driver         = {
                .name           = "atmel_usba_udc",
+                .owner          = THIS_MODULE,
        },
 };
@@ -2072,3 +2073,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION("Atmel USBA UDC driver");
 MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:atmel_usba_udc");
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c
index 63e8fa3a69e1..254012ad2b91 100644
--- a/drivers/usb/gadget/fsl_usb2_udc.c
+++ b/drivers/usb/gadget/fsl_usb2_udc.c
@@ -2475,3 +2475,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:fsl-usb2-udc");
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index 37243ef7104e..078f72467671 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -2146,3 +2146,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Mikko Lahteenmaki, Bo Henriksen");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:lh7a40x_udc");
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c
index 835948f0715a..ee6b35fa870f 100644
--- a/drivers/usb/gadget/m66592-udc.c
+++ b/drivers/usb/gadget/m66592-udc.c
@@ -35,6 +35,7 @@
 MODULE_DESCRIPTION("M66592 USB gadget driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Yoshihiro Shimoda");
+MODULE_ALIAS("platform:m66592_udc");
 #define DRIVER_VERSION  "18 Oct 2007"
@@ -1671,6 +1672,7 @@ static struct platform_driver m66592_driver = {
        .remove =       __exit_p(m66592_remove),
        .driver         = {
                .name = (char *) udc_name,
+                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index e6d68bda428a..ee1e9a314cd1 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -3109,4 +3109,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:omap_udc");
diff --git a/drivers/usb/gadget/pxa2xx_udc.c b/drivers/usb/gadget/pxa2xx_udc.c
index 096c41cc40d1..c00cd8b9d3d1 100644
--- a/drivers/usb/gadget/pxa2xx_udc.c
+++ b/drivers/usb/gadget/pxa2xx_udc.c
@@ -2380,4 +2380,4 @@ module_exit(udc_exit);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_AUTHOR("Frank Becker, Robert Schwebel, David Brownell");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-udc");
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index aadc4204d6f9..6b1ef488043b 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -2047,3 +2047,5 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_VERSION(DRIVER_VERSION);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:s3c2410-usbgadget");
+MODULE_ALIAS("platform:s3c2440-usbgadget");
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/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index d7071c855758..203a3359a648 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1684,14 +1684,18 @@ static int isp116x_resume(struct platform_device *dev)
 #endif
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:isp116x-hcd");
 static struct platform_driver isp116x_driver = {
        .probe = isp116x_probe,
        .remove = isp116x_remove,
        .suspend = isp116x_suspend,
        .resume = isp116x_resume,
        .driver = {
-                   .name = (char *)hcd_name,
+                .name = (char *)hcd_name,
-                   },
+                .owner  = THIS_MODULE,
+        },
 };
 /*-----------------------------------------------------------------*/
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 126fcbdd6408..d72dc07dda01 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -355,7 +355,7 @@ static int ohci_hcd_at91_drv_resume(struct platform_device *pdev)
 #define ohci_hcd_at91_drv_resume  NULL
 #endif
-MODULE_ALIAS("at91_ohci");
+MODULE_ALIAS("platform:at91_ohci");
 static struct platform_driver ohci_hcd_at91_driver = {
        .probe          = ohci_hcd_at91_drv_probe,
@@ -368,4 +368,3 @@ static struct platform_driver ohci_hcd_at91_driver = {
                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c
index 663a0600b6e7..f90fe0c7373f 100644
--- a/drivers/usb/host/ohci-au1xxx.c
+++ b/drivers/usb/host/ohci-au1xxx.c
@@ -345,3 +345,4 @@ static struct platform_driver ohci_hcd_au1xxx_driver = {
        },
 };
+MODULE_ALIAS("platform:au1xxx-ohci");
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index a68ce9d3c525..156e93a9d0df 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -211,6 +211,8 @@ static struct platform_driver ohci_hcd_ep93xx_driver = {
 #endif
        .driver         = {
                .name   = "ep93xx-ohci",
+                .owner  = THIS_MODULE,
        },
 };
+MODULE_ALIAS("platform:ep93xx-ohci");
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-lh7a404.c b/drivers/usb/host/ohci-lh7a404.c
index 4a043abd85ea..13c12ed22252 100644
--- a/drivers/usb/host/ohci-lh7a404.c
+++ b/drivers/usb/host/ohci-lh7a404.c
@@ -251,3 +251,4 @@ static struct platform_driver ohci_hcd_lh7a404_driver = {
        },
 };
+MODULE_ALIAS("platform:lh7a404-ohci");
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 74e1f4be10bb..7bfca1ed1b58 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -544,3 +544,4 @@ static struct platform_driver ohci_hcd_omap_driver = {
        },
 };
+MODULE_ALIAS("platform:ohci");
diff --git a/drivers/usb/host/ohci-pnx4008.c b/drivers/usb/host/ohci-pnx4008.c
index 6c52c66b659f..28b458f20cc3 100644
--- a/drivers/usb/host/ohci-pnx4008.c
+++ b/drivers/usb/host/ohci-pnx4008.c
@@ -456,9 +456,13 @@ static int usb_hcd_pnx4008_remove(struct platform_device *pdev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:usb-ohci");
 static struct platform_driver usb_hcd_pnx4008_driver = {
        .driver = {
                .name = "usb-ohci",
+                .owner  = THIS_MODULE,
        },
        .probe = usb_hcd_pnx4008_probe,
        .remove = usb_hcd_pnx4008_remove,
diff --git a/drivers/usb/host/ohci-pnx8550.c b/drivers/usb/host/ohci-pnx8550.c
index 85fdfd2a7ad0..605d59cba28e 100644
--- a/drivers/usb/host/ohci-pnx8550.c
+++ b/drivers/usb/host/ohci-pnx8550.c
@@ -230,11 +230,12 @@ static int ohci_hcd_pnx8550_drv_remove(struct platform_device *pdev)
        return 0;
 }
-MODULE_ALIAS("pnx8550-ohci");
+MODULE_ALIAS("platform:pnx8550-ohci");
 static struct platform_driver ohci_hcd_pnx8550_driver = {
        .driver = {
-                .name           = "pnx8550-ohci",
+                .name   = "pnx8550-ohci",
+                .owner  = THIS_MODULE,
        },
        .probe          = ohci_hcd_pnx8550_drv_probe,
        .remove         = ohci_hcd_pnx8550_drv_remove,
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index f95be1896b0d..523c30125577 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -213,3 +213,4 @@ static struct platform_driver ohci_hcd_ppc_soc_driver = {
        },
 };
+MODULE_ALIAS("platform:ppc-soc-ohci");
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index ff9a79843471..8ad9b3b604b5 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -364,6 +364,8 @@ static int ohci_hcd_pxa27x_drv_resume(struct platform_device *pdev)
 }
 #endif
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:pxa27x-ohci");
 static struct platform_driver ohci_hcd_pxa27x_driver = {
        .probe          = ohci_hcd_pxa27x_drv_probe,
@@ -375,6 +377,7 @@ static struct platform_driver ohci_hcd_pxa27x_driver = {
 #endif
        .driver         = {
                .name   = "pxa27x-ohci",
+                .owner  = THIS_MODULE,
        },
 };
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/host/ohci-s3c2410.c b/drivers/usb/host/ohci-s3c2410.c
index 44b79e8a6e25..ead4772f0f27 100644
--- a/drivers/usb/host/ohci-s3c2410.c
+++ b/drivers/usb/host/ohci-s3c2410.c
@@ -501,3 +501,4 @@ static struct platform_driver ohci_hcd_s3c2410_driver = {
        },
 };
+MODULE_ALIAS("platform:s3c2410-ohci");
diff --git a/drivers/usb/host/ohci-sh.c b/drivers/usb/host/ohci-sh.c
index 5309ac039e15..e7ee607278fe 100644
--- a/drivers/usb/host/ohci-sh.c
+++ b/drivers/usb/host/ohci-sh.c
@@ -141,3 +141,4 @@ static struct platform_driver ohci_hcd_sh_driver = {
        },
 };
+MODULE_ALIAS("platform:sh_ohci");
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index a97070142869..4ea92762fb28 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -262,3 +262,4 @@ static struct platform_driver ohci_hcd_sm501_driver = {
                .name   = "sm501-usb",
        },
 };
+MODULE_ALIAS("platform:sm501-usb");
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c
index 0ce2fc5e396b..9f80e5285575 100644
--- a/drivers/usb/host/r8a66597-hcd.c
+++ b/drivers/usb/host/r8a66597-hcd.c
@@ -44,6 +44,7 @@
 MODULE_DESCRIPTION("R8A66597 USB Host Controller Driver");
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Yoshihiro Shimoda");
+MODULE_ALIAS("platform:r8a66597_hcd");
 #define DRIVER_VERSION  "29 May 2007"
@@ -2219,6 +2220,7 @@ static struct platform_driver r8a66597_driver = {
        .resume =       r8a66597_resume,
        .driver         = {
                .name = (char *) hcd_name,
+                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 59be276ccd9d..629bca0ebe8f 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -58,6 +58,7 @@
 MODULE_DESCRIPTION("SL811HS USB Host Controller Driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:sl811-hcd");
 #define DRIVER_VERSION  "19 May 2005"
diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c
index 3033d6945202..8e117a795e93 100644
--- a/drivers/usb/host/u132-hcd.c
+++ b/drivers/usb/host/u132-hcd.c
@@ -3316,3 +3316,4 @@ static void __exit u132_hcd_exit(void)
 module_exit(u132_hcd_exit);
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:u132_hcd");
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/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_interrupt_in       = NUM_DONT_CARE,
-        .num_bulk_in            = 1,
+        .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/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)
+static  u16 ppi0_req_8[] = {P_PPI0_CLK, P_PPI0_FS1, P_PPI0_FS2,
-{
-        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);
+        fbinfo->pseudo_palette = &info->pseudo_pal;
-        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);
        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,
+        ret = request_irq(info->irq, bfin_t350mcqb_irq_error, IRQF_DISABLED,
-                        "PPI ERROR", info) < 0) {
+                        "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/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/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index aa714028641e..c2fa5c630813 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -214,10 +214,7 @@ static void vring_disable_cb(struct virtqueue *_vq)
 {
        struct vring_virtqueue *vq = to_vvq(_vq);
-        START_USE(vq);
-        BUG_ON(vq->vring.avail->flags & VRING_AVAIL_F_NO_INTERRUPT);
        vq->vring.avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
-        END_USE(vq);
 }
 static bool vring_enable_cb(struct virtqueue *_vq)
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c
index fb5ed6478f78..ae0fca5e8749 100644
--- a/drivers/watchdog/at32ap700x_wdt.c
+++ b/drivers/watchdog/at32ap700x_wdt.c
@@ -418,6 +418,9 @@ static int at32_wdt_resume(struct platform_device *pdev)
 #define at32_wdt_resume NULL
 #endif
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:at32_wdt");
 static struct platform_driver at32_wdt_driver = {
        .remove         = __exit_p(at32_wdt_remove),
        .suspend        = at32_wdt_suspend,
diff --git a/drivers/watchdog/at91rm9200_wdt.c b/drivers/watchdog/at91rm9200_wdt.c
index a684b1e87372..9ff9a9565320 100644
--- a/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@ -286,3 +286,4 @@ MODULE_AUTHOR("Andrew Victor");
 MODULE_DESCRIPTION("Watchdog driver for Atmel AT91RM9200");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:at91_wdt");
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
index a61cbd48dc07..1782c79eff06 100644
--- a/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@ -248,6 +248,7 @@ static int davinci_wdt_remove(struct platform_device *pdev)
 static struct platform_driver platform_wdt_driver = {
        .driver = {
                .name = "watchdog",
+                .owner  = THIS_MODULE,
        },
        .probe = davinci_wdt_probe,
        .remove = davinci_wdt_remove,
@@ -277,3 +278,4 @@ MODULE_PARM_DESC(heartbeat,
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:watchdog");
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
index 1efcad3b6fca..445b7e812112 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);
+                superio_outb(units >> 8, WDT_TIMEOUT + 1);
-        else
+        superio_outb(units, WDT_TIMEOUT);
-                superio_outb(units, WDT_TIMEOUT);
 }
 static int
@@ -210,6 +200,8 @@ it8712f_wdt_disable(void)
        superio_outb(0, WDT_CONFIG);
        superio_outb(0, WDT_CONTROL);
+        if (revision >= 0x08)
+                superio_outb(0, WDT_TIMEOUT + 1);
        superio_outb(0, WDT_TIMEOUT);
        superio_exit();
diff --git a/drivers/watchdog/ks8695_wdt.c b/drivers/watchdog/ks8695_wdt.c
index e3a29c302309..df5a6b811ccd 100644
--- a/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@ -306,3 +306,4 @@ MODULE_AUTHOR("Andrew Victor");
 MODULE_DESCRIPTION("Watchdog driver for KS8695");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:ks8695_wdt");
diff --git a/drivers/watchdog/mpc83xx_wdt.c b/drivers/watchdog/mpc83xx_wdt.c
index 6369f569517f..b16c5cd972eb 100644
--- a/drivers/watchdog/mpc83xx_wdt.c
+++ b/drivers/watchdog/mpc83xx_wdt.c
@@ -206,6 +206,7 @@ static struct platform_driver mpc83xx_wdt_driver = {
        .remove         = __devexit_p(mpc83xx_wdt_remove),
        .driver         = {
                .name   = "mpc83xx_wdt",
+                .owner  = THIS_MODULE,
        },
 };
@@ -226,3 +227,4 @@ MODULE_AUTHOR("Dave Updegraff, Kumar Gala");
 MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx uProcessor");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:mpc83xx_wdt");
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 0d2b27735419..009573b81496 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -392,6 +392,9 @@ static int __devexit mpcore_wdt_remove(struct platform_device *dev)
        return 0;
 }
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:mpcore_wdt");
 static struct platform_driver mpcore_wdt_driver = {
        .probe          = mpcore_wdt_probe,
        .remove         = __devexit_p(mpcore_wdt_remove),
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c
index 10b89f2703bd..a8e67383784e 100644
--- a/drivers/watchdog/mtx-1_wdt.c
+++ b/drivers/watchdog/mtx-1_wdt.c
@@ -243,6 +243,7 @@ static struct platform_driver mtx1_wdt = {
        .probe = mtx1_wdt_probe,
        .remove = mtx1_wdt_remove,
        .driver.name = "mtx1-wdt",
+        .driver.owner = THIS_MODULE,
 };
 static int __init mtx1_wdt_init(void)
@@ -262,3 +263,4 @@ MODULE_AUTHOR("Michael Stickel, Florian Fainelli");
 MODULE_DESCRIPTION("Driver for the MTX-1 watchdog");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:mtx1-wdt");
diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index 0365c317f7e1..b59ca3273967 100644
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -324,3 +324,4 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
 MODULE_DESCRIPTION("MV64x60 watchdog driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:" MV64x60_WDT_NAME);
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 635ca454f56b..74bc39aa1ce8 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -387,3 +387,4 @@ module_exit(omap_wdt_exit);
 MODULE_AUTHOR("George G. Davis");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:omap_wdt");
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
index b04aa096a10a..6b8483d3c783 100644
--- a/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@ -321,6 +321,7 @@ static int pnx4008_wdt_remove(struct platform_device *pdev)
 static struct platform_driver platform_wdt_driver = {
        .driver = {
                .name = "watchdog",
+                .owner  = THIS_MODULE,
        },
        .probe = pnx4008_wdt_probe,
        .remove = pnx4008_wdt_remove,
@@ -354,3 +355,4 @@ MODULE_PARM_DESC(nowayout,
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:watchdog");
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 7645e8812156..98532c0e0689 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -561,3 +561,4 @@ MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>, "
 MODULE_DESCRIPTION("S3C2410 Watchdog Device Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:s3c2410-wdt");
diff --git a/drivers/watchdog/txx9wdt.c b/drivers/watchdog/txx9wdt.c
index 328b3c7211ef..57cefef27ce3 100644
--- a/drivers/watchdog/txx9wdt.c
+++ b/drivers/watchdog/txx9wdt.c
@@ -274,3 +274,4 @@ module_exit(watchdog_exit);
 MODULE_DESCRIPTION("TXx9 Watchdog Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
+MODULE_ALIAS("platform:txx9wdt");
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index ea94dbabf9a9..d85dc6d41c2a 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -381,11 +381,15 @@ EXPORT_SYMBOL_GPL(gnttab_cancel_free_callback);
 static int grow_gnttab_list(unsigned int more_frames)
 {
        unsigned int new_nr_grant_frames, extra_entries, i;
+        unsigned int nr_glist_frames, new_nr_glist_frames;
        new_nr_grant_frames = nr_grant_frames + more_frames;
        extra_entries       = more_frames * GREFS_PER_GRANT_FRAME;
-        for (i = nr_grant_frames; i < new_nr_grant_frames; i++) {
+        nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
+        new_nr_glist_frames =
+                (new_nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
+        for (i = nr_glist_frames; i < new_nr_glist_frames; i++) {
                gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_ATOMIC);
                if (!gnttab_list[i])
                        goto grow_nomem;
@@ -407,7 +411,7 @@ static int grow_gnttab_list(unsigned int more_frames)
        return 0;
 grow_nomem:
-        for ( ; i >= nr_grant_frames; i--)
+        for ( ; i >= nr_glist_frames; i--)
                free_page((unsigned long) gnttab_list[i]);
        return -ENOMEM;
 }
@@ -530,7 +534,7 @@ static int gnttab_expand(unsigned int req_entries)
 static int __devinit gnttab_init(void)
 {
        int i;
-        unsigned int max_nr_glist_frames;
+        unsigned int max_nr_glist_frames, nr_glist_frames;
        unsigned int nr_init_grefs;
        if (!is_running_on_xen())
@@ -543,15 +547,15 @@ static int __devinit gnttab_init(void)
         * grant reference free list on the current hypervisor.
         */
        max_nr_glist_frames = (boot_max_nr_grant_frames *
-                               GREFS_PER_GRANT_FRAME /
+                               GREFS_PER_GRANT_FRAME / RPP);
-                               (PAGE_SIZE / sizeof(grant_ref_t)));
        gnttab_list = kmalloc(max_nr_glist_frames * sizeof(grant_ref_t *),
                              GFP_KERNEL);
        if (gnttab_list == NULL)
                return -ENOMEM;
-        for (i = 0; i < nr_grant_frames; i++) {
+        nr_glist_frames = (nr_grant_frames * GREFS_PER_GRANT_FRAME + RPP - 1) / RPP;
+        for (i = 0; i < nr_glist_frames; i++) {
                gnttab_list[i] = (grant_ref_t *)__get_free_page(GFP_KERNEL);
                if (gnttab_list[i] == NULL)
                        goto ini_nomem;