Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

author: Steve French <sfrench@us.ibm.com> 2007-10-20 00:26:44 -0400
committer: Steve French <sfrench@us.ibm.com> 2007-10-20 00:26:44 -0400
commit: 748c5151deb56e4b7b5a9b07a884243764933831 (patch)
tree: e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers
parent: 4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff)
parent: e8b8c977734193adedf2b0f607d6252c78e86394 (diff)
307 files changed, 1976 insertions, 1511 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b83389145f2..5d0e26a5c34 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -52,7 +52,7 @@ config ACPI_PROCFS
        depends on PROC_FS
        ---help---
          For backwards compatibility, this option allows
-          depricated /proc/acpi/ files to exist, even when
+          deprecated /proc/acpi/ files to exist, even when
          they have been replaced by functions in /sys.
          The deprecated files (and their replacements) include:
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index a7351084f2f..235a51e328c 100644
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -422,12 +422,6 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
        return 0;
 }
-#ifdef CONFIG_IA64
-#define arch_cpu_to_apicid      ia64_cpu_to_sapicid
-#else
-#define arch_cpu_to_apicid      x86_cpu_to_apicid
-#endif
 static int map_madt_entry(u32 acpi_id)
 {
        unsigned long madt_end, entry;
@@ -501,7 +495,7 @@ static int get_cpu_id(acpi_handle handle, u32 acpi_id)
                return apic_id;
        for (i = 0; i < NR_CPUS; ++i) {
-                if (arch_cpu_to_apicid[i] == apic_id)
+                if (cpu_physical_id(i) == apic_id)
                        return i;
        }
        return -1;
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 10bc3f64c45..47c80604052 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1479,7 +1479,7 @@ static void ahci_port_intr(struct ata_port *ap)
                return;
        }
-        /* hmmm... a spurious interupt */
+        /* hmmm... a spurious interrupt */
        /* if !NCQ, ignore.  No modern ATA device has broken HSM
         * implementation for non-NCQ commands.
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index bbaa545ea99..629eadbd0ec 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1392,7 +1392,7 @@ static void ata_qc_complete_internal(struct ata_queued_cmd *qc)
 *      @tf: Taskfile registers for the command and the result
 *      @cdb: CDB for packet command
 *      @dma_dir: Data tranfer direction of the command
- *      @sg: sg list for the data buffer of the command
+ *      @sgl: sg list for the data buffer of the command
 *      @n_elem: Number of sg entries
 *      @timeout: Timeout in msecs (0 for default)
 *
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index f9e4cd52794..8227c45109e 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -856,7 +856,7 @@ err_out:
 *      @pdev: PCI device
 *
 *      Some PCI ATA devices report simplex mode but in fact can be told to
- *      enter non simplex mode. This implements the neccessary logic to
+ *      enter non simplex mode. This implements the necessary logic to
 *      perform the task on such devices. Calling it on other devices will
 *      have -undefined- behaviour.
 */
diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 9e412c26b2a..7acbbd9ee46 100644
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -215,7 +215,7 @@ static void cmd64x_set_dmamode(struct ata_port *ap, struct ata_device *adev)
        regU &= ~(0x05 << adev->devno);
        if (adev->dma_mode >= XFER_UDMA_0) {
-                /* Merge thge timing value */
+                /* Merge the timing value */
                regU |= udma_data[adev->dma_mode - XFER_UDMA_0] << shift;
                /* Merge the control bits */
                regU |= 1 << adev->devno; /* UDMA on */
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
index 57e827e4109..e1818fdd915 100644
--- a/drivers/ata/pata_cs5530.c
+++ b/drivers/ata/pata_cs5530.c
@@ -138,7 +138,7 @@ static void cs5530_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 *
 *      Called when the libata layer is about to issue a command. We wrap
 *      this interface so that we can load the correct ATA timings if
- *      neccessary.  Specifically we have a problem that there is only
+ *      necessary.  Specifically we have a problem that there is only
 *      one MWDMA/UDMA bit.
 */
diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
index 3578593a882..01324530d05 100644
--- a/drivers/ata/pata_cs5535.c
+++ b/drivers/ata/pata_cs5535.c
@@ -25,7 +25,7 @@
 * Documentation:
 *      Available from AMD web site.
 * TODO
- *      Review errata to see if serializing is neccessary
+ *      Review errata to see if serializing is necessary
 */
 #include <linux/kernel.h>
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
index 53070f6b1fc..d753e568588 100644
--- a/drivers/ata/pata_cs5536.c
+++ b/drivers/ata/pata_cs5536.c
@@ -40,7 +40,7 @@
 #include <asm/msr.h>
 #define DRV_NAME        "pata_cs5536"
-#define DRV_VERSION     "0.0.5"
+#define DRV_VERSION     "0.0.6"
 enum {
        CFG                     = 0,
@@ -214,7 +214,7 @@ static void cs5536_set_dmamode(struct ata_port *ap, struct ata_device *adev)
                cs5536_read(pdev, DTC, &dtc);
                dtc &= ~(IDE_DRV_MASK << dshift);
-                dtc |= mwdma_timings[mode] << dshift;
+                dtc |= mwdma_timings[mode - XFER_MW_DMA_0] << dshift;
                cs5536_write(pdev, DTC, dtc);
        }
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 988ef736b93..ca9aae09dae 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -105,7 +105,7 @@ struct it821x_dev
 /*
 *      We allow users to force the card into non raid mode without
- *      flashing the alternative BIOS. This is also neccessary right now
+ *      flashing the alternative BIOS. This is also necessary right now
 *      for embedded platforms that cannot run a PC BIOS but are using this
 *      device.
 */
@@ -383,7 +383,7 @@ static void it821x_passthru_bmdma_stop(struct ata_queued_cmd *qc)
 *      @ap: ATA port
 *      @device: Device number (not pointer)
 *
- *      Device selection hook. If neccessary perform clock switching
+ *      Device selection hook. If necessary perform clock switching
 */
 static void it821x_passthru_dev_select(struct ata_port *ap,
diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
index d5483087a3f..c0d9e0cf208 100644
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
@@ -129,7 +129,7 @@ static void mpiix_set_piomode(struct ata_port *ap, struct ata_device *adev)
 *
 *      Called when the libata layer is about to issue a command. We wrap
 *      this interface so that we can load the correct ATA timings if
- *      neccessary. Our logic also clears TIME0/TIME1 for the other device so
+ *      necessary. Our logic also clears TIME0/TIME1 for the other device so
 *      that, even if we get this wrong, cycles to the other device will
 *      be made PIO0.
 */
diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
index 6e8e55745b7..9fe66fd7501 100644
--- a/drivers/ata/pata_ns87410.c
+++ b/drivers/ata/pata_ns87410.c
@@ -124,7 +124,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev)
 *
 *      Called when the libata layer is about to issue a command. We wrap
 *      this interface so that we can load the correct ATA timings if
- *      neccessary.
+ *      necessary.
 */
 static unsigned int ns87410_qc_issue_prot(struct ata_queued_cmd *qc)
diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
index 3cd5eb2b6c9..44da09ace52 100644
--- a/drivers/ata/pata_oldpiix.c
+++ b/drivers/ata/pata_oldpiix.c
@@ -200,7 +200,7 @@ static void oldpiix_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 *
 *      Called when the libata layer is about to issue a command. We wrap
 *      this interface so that we can load the correct ATA timings if
- *      neccessary. Our logic also clears TIME0/TIME1 for the other device so
+ *      necessary. Our logic also clears TIME0/TIME1 for the other device so
 *      that, even if we get this wrong, cycles to the other device will
 *      be made PIO0.
 */
diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
index d5b76497f4a..8109b08fc02 100644
--- a/drivers/ata/pata_radisys.c
+++ b/drivers/ata/pata_radisys.c
@@ -161,7 +161,7 @@ static void radisys_set_dmamode (struct ata_port *ap, struct ata_device *adev)
 *
 *      Called when the libata layer is about to issue a command. We wrap
 *      this interface so that we can load the correct ATA timings if
- *      neccessary. Our logic also clears TIME0/TIME1 for the other device so
+ *      necessary. Our logic also clears TIME0/TIME1 for the other device so
 *      that, even if we get this wrong, cycles to the other device will
 *      be made PIO0.
 */
diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 21ebc485ca4..725a8586cd6 100644
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -156,7 +156,7 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 *
 *      Called when the libata layer is about to issue a command. We wrap
 *      this interface so that we can load the correct ATA timings if
- *      neccessary.  Specifically we have a problem that there is only
+ *      necessary.  Specifically we have a problem that there is only
 *      one MWDMA/UDMA bit.
 */
diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
index 4dc2e73298f..5c1e9cb59ec 100644
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
@@ -16,7 +16,7 @@
 *
 *      If you have strange problems with nVidia chipset systems please
 *      see the SI support documentation and update your system BIOS
- *      if neccessary
+ *      if necessary
 *
 * TODO
 *      If we know all our devices are LBA28 (or LBA28 sized)  we could use
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 5d41b6612d7..ea7a9a652e6 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -420,7 +420,7 @@ static struct ata_port_operations via_port_ops_noirq = {
 *      @pdev: PCI device
 *      @flags: configuration flags
 *
- *      Set the FIFO properties for this device if neccessary. Used both on
+ *      Set the FIFO properties for this device if necessary. Used both on
 *      set up and on and the resume path
 */
diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index 8d98a9fb0a4..f147dc7bf46 100644
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -92,7 +92,7 @@ static struct scsi_host_template sis_sht = {
        .queuecommand           = ata_scsi_queuecmd,
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
-        .sg_tablesize           = ATA_MAX_PRD,
+        .sg_tablesize           = LIBATA_MAX_PRD,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
@@ -166,11 +166,11 @@ static unsigned int get_scr_cfg_addr(struct ata_port *ap, unsigned int sc_reg)
        return addr;
 }
-static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
+static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg, u32 *val)
 {
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
        unsigned int cfg_addr = get_scr_cfg_addr(ap, sc_reg);
-        u32 val, val2 = 0;
+        u32 val2 = 0;
        u8 pmr;
        if (sc_reg == SCR_ERROR) /* doesn't exist in PCI cfg space */
@@ -178,13 +178,16 @@ static u32 sis_scr_cfg_read (struct ata_port *ap, unsigned int sc_reg)
        pci_read_config_byte(pdev, SIS_PMR, &pmr);
-        pci_read_config_dword(pdev, cfg_addr, &val);
+        pci_read_config_dword(pdev, cfg_addr, val);
        if ((pdev->device == 0x0182) || (pdev->device == 0x0183) ||
            (pdev->device == 0x1182) || (pmr & SIS_PMR_COMBINED))
                pci_read_config_dword(pdev, cfg_addr+0x10, &val2);
-        return (val|val2) &  0xfffffffb; /* avoid problems with powerdowned ports */
+        *val |= val2;
+        *val &= 0xfffffffb;     /* avoid problems with powerdowned ports */
+        return 0;
 }
 static void sis_scr_cfg_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
@@ -214,7 +217,7 @@ static int sis_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
                return -EINVAL;
        if (ap->flags & SIS_FLAG_CFGSCR)
-                return sis_scr_cfg_read(ap, sc_reg);
+                return sis_scr_cfg_read(ap, sc_reg, val);
        pci_read_config_byte(pdev, SIS_PMR, &pmr);
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 94ebc9dc40f..f8f7139c07c 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1596,7 +1596,7 @@ static irqreturn_t fs_irq (int irq, void *dev_id)
        /* print the bits in the ISR register. */
        if (fs_debug & FS_DEBUG_IRQ) {
-                /* The FS_DEBUG things are unneccesary here. But this way it is
+                /* The FS_DEBUG things are unnecessary here. But this way it is
                   clear for grep that these are debug prints. */
                fs_dprintk (FS_DEBUG_IRQ,  "IRQ status:");
                for (i=0;i<27;i++) 
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index ca4d7f0d09b..ce4b1e484e6 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -204,23 +204,6 @@ config BLK_DEV_COW_COMMON
        bool
        default BLK_DEV_UBD
-config MMAPPER
-        tristate "Example IO memory driver (BROKEN)"
-        depends on UML && BROKEN
-        ---help---
-          The User-Mode Linux port can provide support for IO Memory
-          emulation with this option.  This allows a host file to be
-          specified as an I/O region on the kernel command line. That file
-          will be mapped into UML's kernel address space where a driver can
-          locate it and do whatever it wants with the memory, including
-          providing an interface to it for UML processes to use.
-          For more information, see
-          <http://user-mode-linux.sourceforge.net/iomem.html>.
-          If you'd like to be able to provide a simulated IO port space for
-          User-Mode Linux processes, say Y.  If unsure, say N.
 config BLK_DEV_LOOP
        tristate "Loopback device support"
        ---help---
@@ -351,7 +334,7 @@ config BLK_DEV_RAM_COUNT
        default "16"
        depends on BLK_DEV_RAM
        help
-          The default value is 16 RAM disks. Change this if you know what
+          The default value is 16 RAM disks. Change this if you know what you
          are doing. If you boot from a filesystem that needs to be extracted
          in memory, you will need at least one RAM disk (e.g. root on cramfs).
@@ -361,7 +344,7 @@ config BLK_DEV_RAM_SIZE
        default "4096"
        help
          The default value is 4096 kilobytes. Only change this if you know
-          what are you doing.
+          what you are doing.
 config BLK_DEV_RAM_BLOCKSIZE
        int "Default RAM disk block size (bytes)"
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 589cbbd9cd4..56e23042728 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -29,7 +29,7 @@
 *
 * Maximum number of loop devices when compiled-in now selectable by passing
 * max_loop=<1-255> to the kernel on boot.
- * Erik I. Bols�, <eriki@himolde.no>, Oct 31, 1999
+ * Erik I. Bolsø, <eriki@himolde.no>, Oct 31, 1999
 *
 * Completely rewrite request handling to be make_request_fn style and
 * non blocking, pushing work to a helper thread. Lots of fixes from
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index ac4a0cb217a..6332acad078 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -508,7 +508,6 @@ error_out:
                nbd_end_request(req);
                spin_lock(q->queue_lock);
        }
-        return;
 }
 static int nbd_ioctl(struct inode *inode, struct file *file,
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 08176d23a46..47f8ac6cce5 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -365,7 +365,7 @@ static int rd_open(struct inode *inode, struct file *filp)
                /*
                 * Deep badness.  rd_blkdev_pagecache_IO() needs to allocate
                 * pagecache pages within a request_fn.  We cannot recur back
-                 * into the filesytem which is mounted atop the ramdisk, because
+                 * into the filesystem which is mounted atop the ramdisk, because
                 * that would deadlock on fs locks.  And we really don't want
                 * to reenter rd_blkdev_pagecache_IO when we're already within
                 * that function.
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index d15234c5965..d1bd0f08a33 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -359,7 +359,7 @@
 *
 * Revision 1.36.3.8  1996/06/07 16:29:00  bentson
 * starting minor number at zero; added missing verify_area
- * as noted by Heiko Eissfeldt <heiko@colossus.escape.de>
+ * as noted by Heiko Eißfeldt <heiko@colossus.escape.de>
 *
 * Revision 1.36.3.7  1996/04/19 21:06:18  bentson
 * remove unneeded boot message & fix CLOCAL hardware flow
@@ -727,8 +727,6 @@ static struct tty_driver *cy_serial_driver;
   driver to probe addresses at a different address, add it to
   this table.  If the driver is probing some other board and
   causing problems, remove the offending address from this table.
-   The cy_setup function extracts additional addresses from the
-   boot options line.  The form is "cyclades=address,address..."
 */
 static unsigned int cy_isa_addresses[] = {
diff --git a/drivers/char/drm/drm_hashtab.c b/drivers/char/drm/drm_hashtab.c
index 3ad31907070..4b8e7db5a23 100644
--- a/drivers/char/drm/drm_hashtab.c
+++ b/drivers/char/drm/drm_hashtab.c
@@ -29,7 +29,7 @@
 * Simple open hash tab implementation.
 *
 * Authors:
- * Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
 #include "drmP.h"
diff --git a/drivers/char/drm/drm_hashtab.h b/drivers/char/drm/drm_hashtab.h
index 0f137677416..573e333ac45 100644
--- a/drivers/char/drm/drm_hashtab.h
+++ b/drivers/char/drm/drm_hashtab.h
@@ -29,7 +29,7 @@
 * Simple open hash tab implementation.
 *
 * Authors:
- * Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
 #ifndef DRM_HASHTAB_H
diff --git a/drivers/char/drm/drm_mm.c b/drivers/char/drm/drm_mm.c
index 3e6bc14f744..86f4eb61a6a 100644
--- a/drivers/char/drm/drm_mm.c
+++ b/drivers/char/drm/drm_mm.c
@@ -38,7 +38,7 @@
 * Aligned allocations can also see improvement.
 *
 * Authors:
- * Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
 #include "drmP.h"
diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c
index e292bb0eaca..b55d5bc6ea6 100644
--- a/drivers/char/drm/drm_pci.c
+++ b/drivers/char/drm/drm_pci.c
@@ -8,12 +8,12 @@
 * \todo Implement the remaining ioctl's for the PCI pools.
 * \todo The wrappers here are so thin that they would be better off inlined..
 *
- * \author Jose Fonseca <jrfonseca@tungstengraphics.com>
+ * \author José Fonseca <jrfonseca@tungstengraphics.com>
 * \author Leif Delgass <ldelgass@retinalburn.net>
 */
 /*
- * Copyright 2003 Jos�Fonseca.
+ * Copyright 2003 José Fonseca.
 * Copyright 2003 Leif Delgass.
 * All Rights Reserved.
 *
diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h
index f5466966081..e040f47f369 100644
--- a/drivers/char/drm/drm_sarea.h
+++ b/drivers/char/drm/drm_sarea.h
@@ -2,7 +2,7 @@
 * \file drm_sarea.h
 * \brief SAREA definitions
 *
- * \author Michel D�nzer <michel@daenzer.net>
+ * \author Michel Dänzer <michel@daenzer.net>
 */
 /*
diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c
index 8421a93946d..926f146390c 100644
--- a/drivers/char/drm/drm_sman.c
+++ b/drivers/char/drm/drm_sman.c
@@ -33,7 +33,7 @@
 * struct or a context identifier.
 *
 * Authors:
- * Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
 #include "drm_sman.h"
diff --git a/drivers/char/drm/drm_sman.h b/drivers/char/drm/drm_sman.h
index 39a39fefeef..08ecf83ad5d 100644
--- a/drivers/char/drm/drm_sman.h
+++ b/drivers/char/drm/drm_sman.h
@@ -33,7 +33,7 @@
 * struct or a context identifier.
 *
 * Authors:
- * Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
 #ifndef DRM_SMAN_H
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index 250d2aa4658..5041bd8dbed 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -29,7 +29,7 @@
 *    Rickard E. (Rik) Faith <faith@valinux.com>
 *    Kevin E. Martin <martin@valinux.com>
 *    Gareth Hughes <gareth@valinux.com>
- *    Michel D�zer <daenzerm@student.ethz.ch>
+ *    Michel Dänzer <daenzerm@student.ethz.ch>
 */
 #ifndef __R128_DRV_H__
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index 2b2407ee490..84f5bc36252 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -27,7 +27,7 @@
 *
 * Authors:
 *    Keith Whitwell <keith@tungstengraphics.com>
- *    Michel D�zer <michel@daenzer.net>
+ *    Michel Dänzer <michel@daenzer.net>
 */
 #include "drmP.h"
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 69c9f2febf4..f824f2f5fdc 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -3005,7 +3005,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
                /*
                 * This ioctl() doesn't work on 64-bit platforms because hw_lock is a
                 * pointer which can't fit into an int-sized variable.  According to
-                 * Michel D�nzer, the ioctl() is only used on embedded platforms, so
+                 * Michel Dänzer, the ioctl() is only used on embedded platforms, so
                 * not supporting it shouldn't be a problem.  If the same functionality
                 * is needed on 64-bit platforms, a new ioctl() would have to be added,
                 * so backwards-compatibility for the embedded platforms can be
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 8c66838ff51..6be1c575758 100644
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/char/drm/sis_mm.c
@@ -28,7 +28,7 @@
 /*
 * Authors:
- *    Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ *    Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
 #include "drmP.h"
diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c
index 9afc1684348..3ffbf864983 100644
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/char/drm/via_mm.c
@@ -22,7 +22,7 @@
 * DEALINGS IN THE SOFTWARE.
 */
 /*
- * Authors: Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
 #include "drmP.h"
diff --git a/drivers/char/drm/via_verifier.h b/drivers/char/drm/via_verifier.h
index 28b50296a7b..d6f8214b69f 100644
--- a/drivers/char/drm/via_verifier.h
+++ b/drivers/char/drm/via_verifier.h
@@ -20,7 +20,7 @@
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 *
- * Author: Thomas Hellstr�m 2004.
+ * Author: Thomas Hellström 2004.
 */
 #ifndef _VIA_VERIFIER_H_
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 0f8fb135da5..28607763ae6 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -19,7 +19,7 @@
 *
 *  rs_set_termios fixed to look also for changes of the input
 *      flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK.
- *                                            Bernd Anh�pl 05/17/96.
+ *                                            Bernd Anhäupl 05/17/96.
 *
 * --- End of notices from serial.c ---
 *
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index e13dd1892bf..3f35a1c562b 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -10,7 +10,7 @@
 * Mostly based on original driver:
 *
 * Copyright (C) 2005 Nokia Corporation
- * Author: Juha Yrj��<juha.yrjola@nokia.com>
+ * Author: Juha Yrjölä <juha.yrjola@nokia.com>
 *
 * This file is licensed under  the terms of the GNU General Public
 * License version 2. This program is licensed "as is" without any
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index cd406416eff..30e56451642 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -371,14 +371,14 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
        int fn_key, cpu_temp, ac_power;
        int left_fan, right_fan, left_speed, right_speed;
-        cpu_temp        = i8k_get_temp(0);                      /* 11100 �s */
+        cpu_temp        = i8k_get_temp(0);                      /* 11100 ��s */
-        left_fan        = i8k_get_fan_status(I8K_FAN_LEFT);     /*   580 �s */
+        left_fan        = i8k_get_fan_status(I8K_FAN_LEFT);     /*   580 ��s */
-        right_fan       = i8k_get_fan_status(I8K_FAN_RIGHT);    /*   580 �s */
+        right_fan       = i8k_get_fan_status(I8K_FAN_RIGHT);    /*   580 ��s */
-        left_speed      = i8k_get_fan_speed(I8K_FAN_LEFT);      /*   580 �s */
+        left_speed      = i8k_get_fan_speed(I8K_FAN_LEFT);      /*   580 ��s */
-        right_speed     = i8k_get_fan_speed(I8K_FAN_RIGHT);     /*   580 �s */
+        right_speed     = i8k_get_fan_speed(I8K_FAN_RIGHT);     /*   580 ��s */
-        fn_key          = i8k_get_fn_status();                  /*   750 �s */
+        fn_key          = i8k_get_fn_status();                  /*   750 ��s */
        if (power_status)
-                ac_power = i8k_get_power_status();              /* 14700 �s */
+                ac_power = i8k_get_power_status();              /* 14700 ��s */
        else
                ac_power = -1;
diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
index 03805691193..596c7173997 100644
--- a/drivers/char/n_tty.c
+++ b/drivers/char/n_tty.c
@@ -437,7 +437,7 @@ static inline void finish_erasing(struct tty_struct *tty)
 *      @c: character input
 *      @tty: terminal device
 *
- *      Perform erase and neccessary output when an erase character is
+ *      Perform erase and necessary output when an erase character is
 *      present in the stream from the driver layer. Handles the complexities
 *      of UTF-8 multibyte symbols.
 */
@@ -657,7 +657,7 @@ static inline void n_tty_receive_overrun(struct tty_struct *tty)
 *      @c: character
 *
 *      Process a parity error and queue the right data to indicate
- *      the error case if neccessary. Locking as per n_tty_receive_buf.
+ *      the error case if necessary. Locking as per n_tty_receive_buf.
 */
 static inline void n_tty_receive_parity_error(struct tty_struct *tty,
                                              unsigned char c)
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 7e6a3a413bb..d83419c3857 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -563,7 +563,7 @@ static void rp_do_poll(unsigned long dummy)
                /*  Get a ptr to the board's control struct */
                ctlp = sCtlNumToCtlPtr(ctrl);
-                /*  Get the interupt status from the board */
+                /*  Get the interrupt status from the board */
 #ifdef CONFIG_PCI
                if (ctlp->BusType == isPCI)
                        CtlMask = sPCIGetControllerIntStatus(ctlp);
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 9782cb4d30d..877e53dcb99 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -7,7 +7,7 @@
 *
 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
 *
- * Copyright (C) 2001-2002 Alc�ve <www.alcove.com>
+ * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
 *
 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
 *
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 13a53575a01..f36fecd3fd2 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -943,7 +943,7 @@ EXPORT_SYMBOL_GPL(tty_ldisc_deref);
 *      @tty: terminal to activate ldisc on
 *
 *      Set the TTY_LDISC flag when the line discipline can be called
- *      again. Do neccessary wakeups for existing sleepers.
+ *      again. Do necessary wakeups for existing sleepers.
 *
 *      Note: nobody should set this bit except via this function. Clearing
 *      directly is allowed.
@@ -1504,7 +1504,7 @@ EXPORT_SYMBOL(tty_hangup);
 *
 *      The user has asked via system call for the terminal to be hung up.
 *      We do this synchronously so that when the syscall returns the process
- *      is complete. That guarantee is neccessary for security reasons.
+ *      is complete. That guarantee is necessary for security reasons.
 */
 void tty_vhangup(struct tty_struct * tty)
@@ -1691,7 +1691,7 @@ EXPORT_SYMBOL(stop_tty);
 *      @tty: tty to start
 *
 *      Start a tty that has been stopped if at all possible. Perform
- *      any neccessary wakeups and propagate the TIOCPKT status. If this
+ *      any necessary wakeups and propagate the TIOCPKT status. If this
 *      is the tty was previous stopped and is being started then the
 *      driver start method is invoked and the line discipline woken.
 *
@@ -2877,7 +2877,7 @@ static int tty_fasync(int fd, struct file * filp, int on)
 *      @tty: tty to fake input into
 *      @p: pointer to character
 *
- *      Fake input to a tty device. Does the neccessary locking and
+ *      Fake input to a tty device. Does the necessary locking and
 *      input management.
 *
 *      FIXME: does not honour flow control ??
diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 0def089cc1f..7a003504c26 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -444,7 +444,7 @@ static void change_termios(struct tty_struct * tty, struct ktermios * new_termio
 *      @arg: user data
 *      @opt: option information
 *
- *      Helper function to prepare termios data and run neccessary other
+ *      Helper function to prepare termios data and run necessary other
 *      functions before using change_termios to do the actual changes.
 *
 *      Locking:
diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c
index 9959b799dbe..c00d4a9b39e 100644
--- a/drivers/firewire/fw-transaction.c
+++ b/drivers/firewire/fw-transaction.c
@@ -228,7 +228,7 @@ fw_fill_request(struct fw_packet *packet, int tcode, int tlabel,
 *
 * @param card the card from which to send the request
 * @param tcode the tcode for this transaction.  Do not use
- *   TCODE_LOCK_REQUEST directly, insted use TCODE_LOCK_MASK_SWAP
+ *   TCODE_LOCK_REQUEST directly, instead use TCODE_LOCK_MASK_SWAP
 *   etc. to specify tcode and ext_tcode.
 * @param node_id the destination node ID (bus ID and PHY ID concatenated)
 * @param generation the generation for which node_id is valid
diff --git a/drivers/hid/usbhid/hid-ff.c b/drivers/hid/usbhid/hid-ff.c
index 22329feb3b5..4c210e16b1b 100644
--- a/drivers/hid/usbhid/hid-ff.c
+++ b/drivers/hid/usbhid/hid-ff.c
@@ -1,6 +1,4 @@
 /*
- * $Id: hid-ff.c,v 1.2 2002/04/18 22:02:47 jdeneux Exp $
- *
 *  Force feedback support for hid devices.
 *  Not all hid devices use the same protocol. For example, some use PID,
 *  other use their own proprietary procotol.
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 6f66551d9e5..5c82ec7f8bb 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -150,7 +150,7 @@ static struct coretemp_data *coretemp_update_device(struct device *dev)
 static int __devinit coretemp_probe(struct platform_device *pdev)
 {
        struct coretemp_data *data;
-        struct cpuinfo_x86 *c = &(cpu_data)[pdev->id];
+        struct cpuinfo_x86 *c = &cpu_data(pdev->id);
        int err;
        u32 eax, edx;
@@ -359,7 +359,7 @@ static int __init coretemp_init(void)
        struct pdev_entry *p, *n;
        /* quick check if we run Intel */
-        if (cpu_data[0].x86_vendor != X86_VENDOR_INTEL)
+        if (cpu_data(0).x86_vendor != X86_VENDOR_INTEL)
                goto exit;
        err = platform_driver_register(&coretemp_driver);
@@ -367,7 +367,7 @@ static int __init coretemp_init(void)
                goto exit;
        for_each_online_cpu(i) {
-                struct cpuinfo_x86 *c = &(cpu_data)[i];
+                struct cpuinfo_x86 *c = &cpu_data(i);
                /* check if family 6, models e, f, 16 */
                if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index a3b56c816e1..2d39d8fc238 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -2,7 +2,7 @@
    gl520sm.c - Part of lm_sensors, Linux kernel modules for hardware
                monitoring
    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>,
-                              Ky�sti M�lkki <kmalkki@cc.hut.fi>
+                              Kyösti Mälkki <kmalkki@cc.hut.fi>
    Copyright (c) 2005        Maarten Deprez <maartendeprez@users.sourceforge.net>
    This program is free software; you can redistribute it and/or modify
@@ -805,7 +805,7 @@ static void __exit sensors_gl520sm_exit(void)
 MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
-        "Ky�sti M�lkki <kmalkki@cc.hut.fi>, "
+        "Kyösti Mälkki <kmalkki@cc.hut.fi>, "
        "Maarten Deprez <maartendeprez@users.sourceforge.net>");
 MODULE_DESCRIPTION("GL520SM driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index f17e771e42f..3330667280b 100644
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -200,7 +200,7 @@ static u8 find_vrm(u8 eff_family, u8 eff_model, u8 eff_stepping, u8 vendor)
 u8 vid_which_vrm(void)
 {
-        struct cpuinfo_x86 *c = cpu_data;
+        struct cpuinfo_x86 *c = &cpu_data(0);
        u32 eax;
        u8 eff_family, eff_model, eff_stepping, vrm_ret;
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 860b71ccbb8..7e2d9787bab 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -3,7 +3,7 @@
                for hardware monitoring
    Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>,
-                        Ky�sti M�lkki <kmalkki@cc.hut.fi>, and
+                        Kyösti Mälkki <kmalkki@cc.hut.fi>, and
                        Mark D. Studebaker <mdsxyz123@yahoo.com>
    Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
    the help of Jean Delvare <khali@linux-fr.org>
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 8f63dada601..2635bba1e3f 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -3,7 +3,7 @@
                for hardware monitoring
    Copyright (c) 1998 - 2002  Frodo Looijaard <frodol@dds.nl>,
-                        Ky�sti M�lkki <kmalkki@cc.hut.fi>,
+                        Kyösti Mälkki <kmalkki@cc.hut.fi>,
                        Mark Studebaker <mdsxyz123@yahoo.com>,
                        and Bob Dougherty <bobd@stanford.edu>
    (Some conversion-factor data were contributed by Jonathan Teh Soon Yew
@@ -866,7 +866,7 @@ static void __exit sm_via686a_exit(void)
        }
 }
-MODULE_AUTHOR("Ky�sti M�lkki <kmalkki@cc.hut.fi>, "
+MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>, "
              "Mark Studebaker <mdsxyz123@yahoo.com> "
              "and Bob Dougherty <bobd@stanford.edu>");
 MODULE_DESCRIPTION("VIA 686A Sensor device");
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 7f0a0a62cf6..a37cb6b8593 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-/* With some changes from Frodo Looijaard <frodol@dds.nl>, Ky�sti M�lkki
+/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki
   <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */
 #include <linux/kernel.h>
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 36fdf971f08..2a16211f12e 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -350,7 +350,7 @@ static int pca_init(struct i2c_algo_pca_data *adap)
        pca_outw(adap, I2C_PCA_ADR, own << 1);
        pca_set_con(adap, I2C_PCA_CON_ENSIO | clock);
-        udelay(500); /* 500 �s for oscilator to stabilise */
+        udelay(500); /* 500 ��s for oscilator to stabilise */
        return 0;
 }
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index ecb2c2d7d54..ab2e6f3498b 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-/* With some changes from Ky�sti M�lkki <kmalkki@cc.hut.fi> and 
+/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
   Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey
   <mbailey@littlefeet-inc.com> */
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index de95c75efb4..c466c6cfc2e 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -278,7 +278,7 @@ config I2C_IXP2000
        depends on ARCH_IXP2000
        select I2C_ALGOBIT
        help
-          Say Y here if you have an Intel IXP2000(2400, 2800, 2850) based 
+          Say Y here if you have an Intel IXP2000 (2400, 2800, 2850) based 
          system and are using GPIO lines for an I2C bus.
          This support is also available as a module. If so, the module
@@ -293,8 +293,8 @@ config I2C_POWERMAC
        default y
        help
          This exposes the various PowerMac i2c interfaces to the linux i2c
-          layer and to userland. It is used by various drivers on the powemac
+          layer and to userland. It is used by various drivers on the PowerMac
-          platform, thus should generally be enabled.
+          platform, and should generally be enabled.
          This support is also available as a module.  If so, the module
          will be called i2c-powermac.
@@ -438,12 +438,12 @@ config I2C_SIMTEC
        tristate "Simtec Generic I2C interface"
        select I2C_ALGOBIT
        help
-          If you say yes to this option, support will be inclyded for
+          If you say yes to this option, support will be included for
          the Simtec Generic I2C interface. This driver is for the
          simple I2C bus used on newer Simtec products for general
          I2C, such as DDC on the Simtec BBD2016A.
-          This driver can also be build as a module. If so, the module
+          This driver can also be built as a module. If so, the module
          will be called i2c-simtec.
 config SCx200_I2C
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 804f0a551c0..b7a9977b025 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-/* With some changes from Ky�sti M�lkki <kmalkki@cc.hut.fi> and even
+/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
   Frodo Looijaard <frodol@dds.nl> */
 /* Partialy rewriten by Oleg I. Vdovikin for mmapped support of
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index 9832f773651..f9972f9651e 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -7,7 +7,7 @@
    Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org>
    Based on i2c Support for Via Technologies 82C586B South Bridge
-    Copyright (c) 1998, 1999 Ky�sti M�lkki <kmalkki@cc.hut.fi>
+    Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index e08bacadd6b..9b43ff7270d 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -18,7 +18,7 @@
 *      Copyright 1995-97 Simon G. Vogl
 *                1998-99 Hans Berglund
 *
- *      With some changes from Ky�sti M�lkki <kmalkki@cc.hut.fi> 
+ *      With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>
 *      and even Frodo Looijaard <frodol@dds.nl>
 *
 * This program is free software; you can redistribute  it and/or modify it
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index e471e3bfdc1..89a30028ddb 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -8,7 +8,7 @@
 * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com>
 * Copyright (C) 2005 Nokia Corporation
 *
- * Cleaned up by Juha Yrj�l� <juha.yrjola@nokia.com>
+ * Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index 49a95e2887b..c6faf9bdad1 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -7,7 +7,7 @@
   Copyright (C) 1995-2000 Simon G. Vogl
   With some changes from:
   Frodo Looijaard <frodol@dds.nl>
-   Ky�sti M�lkki <kmalkki@cc.hut.fi>
+   Kyösti Mälkki <kmalkki@cc.hut.fi>
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 039a07fde90..59ba2086d2f 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -7,7 +7,7 @@
   Copyright (C) 1995-2000 Simon G. Vogl
   With some changes from:
   Frodo Looijaard <frodol@dds.nl>
-   Ky�sti M�lkki <kmalkki@cc.hut.fi>
+   Kyösti Mälkki <kmalkki@cc.hut.fi>
   
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 81520868797..61716f6b14d 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -4,7 +4,7 @@
    i2c Support for Via Technologies 82C586B South Bridge
-    Copyright (c) 1998, 1999 Ky�sti M�lkki <kmalkki@cc.hut.fi>
+    Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi>
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@ static void __exit i2c_vt586b_exit(void)
 }
-MODULE_AUTHOR("Ky�sti M�lkki <kmalkki@cc.hut.fi>");
+MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>");
 MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge");
 MODULE_LICENSE("GPL");
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index edc275002f8..c9ce77f13c0 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -2,7 +2,7 @@
    i2c-viapro.c - Part of lm_sensors, Linux kernel modules for hardware
              monitoring
    Copyright (c) 1998 - 2002  Frodo Looijaard <frodol@dds.nl>,
-    Philip Edelbrock <phil@netroedge.com>, Ky�sti M�lkki <kmalkki@cc.hut.fi>,
+    Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>,
    Mark D. Studebaker <mdsxyz123@yahoo.com>
    Copyright (C) 2005 - 2007  Jean Delvare <khali@linux-fr.org>
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index e73d58c43f3..1a4e8dc03b3 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -17,7 +17,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
 /* ------------------------------------------------------------------------- */
-/* With some changes from Ky�sti M�lkki <kmalkki@cc.hut.fi>.
+/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
   All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
   SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and
   Jean Delvare <khali@linux-fr.org> */
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index 6d9fd92763f..6eaece96524 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1056,6 +1056,9 @@ endif
 config BLK_DEV_IDEDMA
        def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
+config IDE_ARCH_OBSOLETE_INIT
+        def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC
 endif
 config BLK_DEV_HD_ONLY
diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index f7449d04114..48db6167bb9 100644
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -45,7 +45,7 @@ bastide_register(unsigned int base, unsigned int aux, int irq,
        hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);
        hw.irq = irq;
-        ide_register_hw(&hw, 0, hwif);
+        ide_register_hw(&hw, NULL, 0, hwif);
        return 0;
 }
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 3af33fbf1f8..410a0d13e35 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -316,27 +316,29 @@ static int icside_dma_end(ide_drive_t *drive)
        drive->waiting_for_dma = 0;
-        disable_dma(hwif->hw.dma);
+        disable_dma(state->dev->dma);
        /* Teardown mappings after DMA has completed. */
        dma_unmap_sg(state->dev, hwif->sg_table, hwif->sg_nents,
                     hwif->sg_dma_direction);
-        return get_dma_residue(hwif->hw.dma) != 0;
+        return get_dma_residue(state->dev->dma) != 0;
 }
 static void icside_dma_start(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = HWIF(drive);
+        struct icside_state *state = hwif->hwif_data;
        /* We can not enable DMA on both channels simultaneously. */
-        BUG_ON(dma_channel_active(hwif->hw.dma));
+        BUG_ON(dma_channel_active(state->dev->dma));
-        enable_dma(hwif->hw.dma);
+        enable_dma(state->dev->dma);
 }
 static int icside_dma_setup(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = HWIF(drive);
+        struct icside_state *state = hwif->hwif_data;
        struct request *rq = hwif->hwgroup->rq;
        unsigned int dma_mode;
@@ -348,7 +350,7 @@ static int icside_dma_setup(ide_drive_t *drive)
        /*
         * We can not enable DMA on both channels.
         */
-        BUG_ON(dma_channel_active(hwif->hw.dma));
+        BUG_ON(dma_channel_active(state->dev->dma));
        icside_build_sglist(drive, rq);
@@ -365,14 +367,14 @@ static int icside_dma_setup(ide_drive_t *drive)
        /*
         * Select the correct timing for this drive.
         */
-        set_dma_speed(hwif->hw.dma, drive->drive_data);
+        set_dma_speed(state->dev->dma, drive->drive_data);
        /*
         * Tell the DMA engine about the SG table and
         * data direction.
         */
-        set_dma_sg(hwif->hw.dma, hwif->sg_table, hwif->sg_nents);
+        set_dma_sg(state->dev->dma, hwif->sg_table, hwif->sg_nents);
-        set_dma_mode(hwif->hw.dma, dma_mode);
+        set_dma_mode(state->dev->dma, dma_mode);
        drive->waiting_for_dma = 1;
@@ -438,40 +440,16 @@ static void icside_dma_init(ide_hwif_t *hwif)
 #define icside_dma_init(hwif)   (0)
 #endif
-static ide_hwif_t *icside_find_hwif(unsigned long dataport)
-{
-        ide_hwif_t *hwif;
-        int index;
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = &ide_hwifs[index];
-                if (hwif->io_ports[IDE_DATA_OFFSET] == dataport)
-                        goto found;
-        }
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = &ide_hwifs[index];
-                if (!hwif->io_ports[IDE_DATA_OFFSET])
-                        goto found;
-        }
-        hwif = NULL;
-found:
-        return hwif;
-}
 static ide_hwif_t *
 icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *ec)
 {
        unsigned long port = (unsigned long)base + info->dataoffset;
        ide_hwif_t *hwif;
-        hwif = icside_find_hwif(port);
+        hwif = ide_find_port(port);
        if (hwif) {
                int i;
-                memset(&hwif->hw, 0, sizeof(hw_regs_t));
                /*
                 * Ensure we're using MMIO
                 */
@@ -479,13 +457,10 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e
                hwif->mmio = 1;
                for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                        hwif->hw.io_ports[i] = port;
                        hwif->io_ports[i] = port;
                        port += 1 << info->stepping;
                }
-                hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)base + info->ctrloffset;
                hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)base + info->ctrloffset;
-                hwif->hw.irq  = ec->irq;
                hwif->irq     = ec->irq;
                hwif->noprobe = 0;
                hwif->chipset = ide_acorn;
@@ -500,6 +475,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
        ide_hwif_t *hwif;
        void __iomem *base;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
        if (!base)
@@ -523,9 +499,9 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
        state->hwif[0] = hwif;
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
        return 0;
 }
@@ -537,6 +513,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
        void __iomem *ioc_base, *easi_base;
        unsigned int sel = 0;
        int ret;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
        if (!ioc_base) {
@@ -592,7 +569,6 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
        hwif->serialized  = 1;
        hwif->config_data = (unsigned long)ioc_base;
        hwif->select_data = sel;
-        hwif->hw.dma      = ec->dma;
        mate->maskproc    = icside_maskproc;
        mate->channel     = 1;
@@ -601,18 +577,16 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
        mate->serialized  = 1;
        mate->config_data = (unsigned long)ioc_base;
        mate->select_data = sel | 1;
-        mate->hw.dma      = ec->dma;
        if (ec->dma != NO_DMA && !request_dma(ec->dma, hwif->name)) {
                icside_dma_init(hwif);
                icside_dma_init(mate);
        }
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
-        probe_hwif_init(mate);
+        idx[1] = mate->index;
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
-        ide_proc_register_port(mate);
        return 0;
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index bce2bec8141..8957cbadf5c 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -31,5 +31,5 @@ void __init ide_arm_init(void)
        memset(&hw, 0, sizeof(hw));
        ide_std_init_ports(&hw, IDE_ARM_IO, IDE_ARM_IO + 0x206);
        hw.irq = IDE_ARM_IRQ;
-        ide_register_hw(&hw, 1, NULL);
+        ide_register_hw(&hw, NULL, 1, NULL);
 }
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 83811af1161..0775a3afef4 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -13,42 +13,25 @@
 #include <asm/ecard.h>
-/*
- * Something like this really should be in generic code, but isn't.
- */
 static ide_hwif_t *
 rapide_locate_hwif(void __iomem *base, void __iomem *ctrl, unsigned int sz, int irq)
 {
        unsigned long port = (unsigned long)base;
-        ide_hwif_t *hwif;
+        ide_hwif_t *hwif = ide_find_port(port);
-        int index, i;
+        int i;
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = ide_hwifs + index;
-                if (hwif->io_ports[IDE_DATA_OFFSET] == port)
-                        goto found;
-        }
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = ide_hwifs + index;
-                if (hwif->io_ports[IDE_DATA_OFFSET] == 0)
-                        goto found;
-        }
-        return NULL;
+        if (hwif == NULL)
+                goto out;
- found:
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-                hwif->hw.io_ports[i] = port;
                hwif->io_ports[i] = port;
                port += sz;
        }
-        hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
        hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
-        hwif->hw.irq = hwif->irq = irq;
+        hwif->irq = irq;
        hwif->mmio = 1;
        default_hwif_mmiops(hwif);
+out:
        return hwif;
 }
@@ -58,6 +41,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
        ide_hwif_t *hwif;
        void __iomem *base;
        int ret;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        ret = ecard_request_resources(ec);
        if (ret)
@@ -74,8 +58,11 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
                hwif->hwif_data = base;
                hwif->gendev.parent = &ec->dev;
                hwif->noprobe = 0;
-                probe_hwif_init(hwif);
-                ide_proc_register_port(hwif);
+                idx[0] = hwif->index;
+                ide_device_add(idx);
                ecard_set_drvdata(ec, hwif);
                goto out;
        }
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 9a96a10ba9d..ff20377b4c8 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -782,7 +782,7 @@ init_e100_ide (void)
                                ide_offsets,
                                0, 0, cris_ide_ack_intr,
                                ide_default_irq(0));
-                ide_register_hw(&hw, 1, &hwif);
+                ide_register_hw(&hw, NULL, 1, &hwif);
                hwif->mmio = 1;
                hwif->chipset = ide_etrax100;
                hwif->set_pio_mode = &cris_set_pio_mode;
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 6d26ad7360d..4a49b5c59ac 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -68,7 +68,6 @@ static inline void hw_setup(hw_regs_t *hw)
                hw->io_ports[i] = CONFIG_H8300_IDE_BASE + H8300_IDE_GAP*i;
        hw->io_ports[IDE_CONTROL_OFFSET] = CONFIG_H8300_IDE_ALT;
        hw->irq = EXT_IRQ0 + CONFIG_H8300_IDE_IRQ;
-        hw->dma = NO_DMA;
        hw->chipset = ide_generic;
 }
@@ -101,7 +100,7 @@ void __init h8300_ide_init(void)
        hw_setup(&hw);
        /* register if */
-        idx = ide_register_hw(&hw, 1, &hwif);
+        idx = ide_register_hw(&hw, NULL, 1, &hwif);
        if (idx == -1) {
                printk(KERN_ERR "ide-h8300: IDE I/F register failed\n");
                return;
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c
index 1d5f6823101..89df48fdc69 100644
--- a/drivers/ide/ide-acpi.c
+++ b/drivers/ide/ide-acpi.c
@@ -350,7 +350,7 @@ static int taskfile_load_raw(ide_drive_t *drive,
        memset(&args, 0, sizeof(ide_task_t));
        args.command_type = IDE_DRIVE_TASK_NO_DATA;
-        args.data_phase   = TASKFILE_IN;
+        args.data_phase   = TASKFILE_NO_DATA;
        args.handler      = &task_no_data_intr;
        /* convert gtf to IDE Taskfile */
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index ca843522f91..57a5f63d6ae 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -120,7 +120,7 @@
 *                       Reformat to match kernel tabbing style.
 *                       Add CDROM_GET_UPC ioctl.
 * 3.10  Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI.
- * 3.11  Apr 29, 1996 -- Patch from Heiko Eissfeldt <heiko@colossus.escape.de>
+ * 3.11  Apr 29, 1996 -- Patch from Heiko Eißfeldt <heiko@colossus.escape.de>
 *                       to remove redundant verify_area calls.
 * 3.12  May  7, 1996 -- Rudimentary changer support.  Based on patches
 *                        from Gerhard Zuber <zuber@berlin.snafu.de>.
@@ -256,7 +256,7 @@
 *                      - Minimize the TOC reading - only do it when we
 *                        know a media change has occurred.
 *                      - Moved all the CDROMREADx ioctls to the Uniform layer.
- *                      - Heiko Eissfeldt <heiko@colossus.escape.de> supplied
+ *                      - Heiko Eißfeldt <heiko@colossus.escape.de> supplied
 *                        some fixes for CDI.
 *                      - CD-ROM leaving door locked fix from Andries
 *                        Brouwer <Andries.Brouwer@cwi.nl>
@@ -2341,7 +2341,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
                   If we get an error for the regular case, we assume
                   a CDI without additional audio tracks. In this case
                   the readable TOC is empty (CDI tracks are not included)
-                   and only holds the Leadout entry. Heiko Ei�feldt */
+                   and only holds the Leadout entry. Heiko Eißfeldt */
                ntracks = 0;
                stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0,
                                           (char *)&toc->hdr,
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 2722d9165b6..00123d99527 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -593,28 +593,12 @@ static int smart_enable(ide_drive_t *drive)
        return ide_raw_taskfile(drive, &args, NULL);
 }
-static int get_smart_values(ide_drive_t *drive, u8 *buf)
+static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)
 {
        ide_task_t args;
        memset(&args, 0, sizeof(ide_task_t));
-        args.tfRegister[IDE_FEATURE_OFFSET]     = SMART_READ_VALUES;
+        args.tfRegister[IDE_FEATURE_OFFSET]     = sub_cmd;
-        args.tfRegister[IDE_NSECTOR_OFFSET]     = 0x01;
-        args.tfRegister[IDE_LCYL_OFFSET]        = SMART_LCYL_PASS;
-        args.tfRegister[IDE_HCYL_OFFSET]        = SMART_HCYL_PASS;
-        args.tfRegister[IDE_COMMAND_OFFSET]     = WIN_SMART;
-        args.command_type                       = IDE_DRIVE_TASK_IN;
-        args.data_phase                         = TASKFILE_IN;
-        args.handler                            = &task_in_intr;
-        (void) smart_enable(drive);
-        return ide_raw_taskfile(drive, &args, buf);
-}
-static int get_smart_thresholds(ide_drive_t *drive, u8 *buf)
-{
-        ide_task_t args;
-        memset(&args, 0, sizeof(ide_task_t));
-        args.tfRegister[IDE_FEATURE_OFFSET]     = SMART_READ_THRESHOLDS;
        args.tfRegister[IDE_NSECTOR_OFFSET]     = 0x01;
        args.tfRegister[IDE_LCYL_OFFSET]        = SMART_LCYL_PASS;
        args.tfRegister[IDE_HCYL_OFFSET]        = SMART_HCYL_PASS;
@@ -656,7 +640,7 @@ static int proc_idedisk_read_smart_thresholds
        ide_drive_t     *drive = (ide_drive_t *)data;
        int             len = 0, i = 0;
-        if (!get_smart_thresholds(drive, page)) {
+        if (get_smart_data(drive, page, SMART_READ_THRESHOLDS) == 0) {
                unsigned short *val = (unsigned short *) page;
                char *out = ((char *)val) + (SECTOR_WORDS * 4);
                page = out;
@@ -675,7 +659,7 @@ static int proc_idedisk_read_smart_values
        ide_drive_t     *drive = (ide_drive_t *)data;
        int             len = 0, i = 0;
-        if (!get_smart_values(drive, page)) {
+        if (get_smart_data(drive, page, SMART_READ_VALUES) == 0) {
                unsigned short *val = (unsigned short *) page;
                char *out = ((char *)val) + (SECTOR_WORDS * 4);
                page = out;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 80b4f17f394..428f7a8a00b 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -901,10 +901,7 @@ void ide_dma_timeout (ide_drive_t *drive)
 EXPORT_SYMBOL(ide_dma_timeout);
-/*
+static void ide_release_dma_engine(ide_hwif_t *hwif)
- * Needed for allowing full modular support of ide-driver
- */
-static int ide_release_dma_engine(ide_hwif_t *hwif)
 {
        if (hwif->dmatable_cpu) {
                pci_free_consistent(hwif->pci_dev,
@@ -913,7 +910,6 @@ static int ide_release_dma_engine(ide_hwif_t *hwif)
                                    hwif->dmatable_dma);
                hwif->dmatable_cpu = NULL;
        }
-        return 1;
 }
 static int ide_release_iomio_dma(ide_hwif_t *hwif)
@@ -956,12 +952,6 @@ static int ide_mapped_mmio_dma(ide_hwif_t *hwif, unsigned long base, unsigned in
 {
        printk(KERN_INFO "    %s: MMIO-DMA ", hwif->name);
-        hwif->dma_base = base;
-        if(hwif->mate)
-                hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base : base;
-        else
-                hwif->dma_master = base;
        return 0;
 }
@@ -975,8 +965,6 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int port
                return 1;
        }
-        hwif->dma_base = base;
        if (hwif->cds->extra) {
                hwif->extra_base = base + (hwif->channel ? 8 : 16);
@@ -991,10 +979,6 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int port
                }
        }
-        if(hwif->mate)
-                hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base:base;
-        else
-                hwif->dma_master = base;
        return 0;
 }
@@ -1006,12 +990,9 @@ static int ide_dma_iobase(ide_hwif_t *hwif, unsigned long base, unsigned int por
        return ide_iomio_dma(hwif, base, ports);
 }
-/*
+void ide_setup_dma(ide_hwif_t *hwif, unsigned long base, unsigned num_ports)
- * This can be called for a dynamically installed interface. Don't __init it
- */
-void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_ports)
 {
-        if (ide_dma_iobase(hwif, dma_base, num_ports))
+        if (ide_dma_iobase(hwif, base, num_ports))
                return;
        if (ide_allocate_dma_engine(hwif)) {
@@ -1019,6 +1000,13 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
                return;
        }
+        hwif->dma_base = base;
+        if (hwif->mate)
+                hwif->dma_master = hwif->channel ? hwif->mate->dma_base : base;
+        else
+                hwif->dma_master = base;
        if (!(hwif->dma_command))
                hwif->dma_command       = hwif->dma_base;
        if (!(hwif->dma_vendor1))
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 32eaa3f8051..c89f0d3058e 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -55,7 +55,7 @@
 #include <asm/io.h>
 static int __ide_end_request(ide_drive_t *drive, struct request *rq,
-                             int uptodate, unsigned int nr_bytes)
+                             int uptodate, unsigned int nr_bytes, int dequeue)
 {
        int ret = 1;
@@ -80,9 +80,11 @@ static int __ide_end_request(ide_drive_t *drive, struct request *rq,
        if (!end_that_request_chunk(rq, uptodate, nr_bytes)) {
                add_disk_randomness(rq->rq_disk);
-                if (!list_empty(&rq->queuelist))
+                if (dequeue) {
-                        blkdev_dequeue_request(rq);
+                        if (!list_empty(&rq->queuelist))
-                HWGROUP(drive)->rq = NULL;
+                                blkdev_dequeue_request(rq);
+                        HWGROUP(drive)->rq = NULL;
+                }
                end_that_request_last(rq, uptodate);
                ret = 0;
        }
@@ -122,7 +124,7 @@ int ide_end_request (ide_drive_t *drive, int uptodate, int nr_sectors)
                        nr_bytes = rq->hard_cur_sectors << 9;
        }
-        ret = __ide_end_request(drive, rq, uptodate, nr_bytes);
+        ret = __ide_end_request(drive, rq, uptodate, nr_bytes, 1);
        spin_unlock_irqrestore(&ide_lock, flags);
        return ret;
@@ -255,39 +257,13 @@ int ide_end_dequeued_request(ide_drive_t *drive, struct request *rq,
                             int uptodate, int nr_sectors)
 {
        unsigned long flags;
-        int ret = 1;
+        int ret;
        spin_lock_irqsave(&ide_lock, flags);
        BUG_ON(!blk_rq_started(rq));
+        ret = __ide_end_request(drive, rq, uptodate, nr_sectors << 9, 0);
-        /*
-         * if failfast is set on a request, override number of sectors and
-         * complete the whole request right now
-         */
-        if (blk_noretry_request(rq) && end_io_error(uptodate))
-                nr_sectors = rq->hard_nr_sectors;
-        if (!blk_fs_request(rq) && end_io_error(uptodate) && !rq->errors)
-                rq->errors = -EIO;
-        /*
-         * decide whether to reenable DMA -- 3 is a random magic for now,
-         * if we DMA timeout more than 3 times, just stay in PIO
-         */
-        if (drive->state == DMA_PIO_RETRY && drive->retry_pio <= 3) {
-                drive->state = 0;
-                HWGROUP(drive)->hwif->ide_dma_on(drive);
-        }
-        if (!end_that_request_first(rq, uptodate, nr_sectors)) {
-                add_disk_randomness(rq->rq_disk);
-                if (blk_rq_tagged(rq))
-                        blk_queue_end_tag(drive->queue, rq);
-                end_that_request_last(rq, uptodate);
-                ret = 0;
-        }
        spin_unlock_irqrestore(&ide_lock, flags);
        return ret;
 }
 EXPORT_SYMBOL_GPL(ide_end_dequeued_request);
@@ -800,7 +776,20 @@ static ide_startstop_t do_special (ide_drive_t *drive)
                s->b.set_tune = 0;
                if (set_pio_mode_abuse(drive->hwif, req_pio)) {
-                        if (hwif->set_pio_mode)
+                        if (hwif->set_pio_mode == NULL)
+                                return ide_stopped;
+                        /*
+                         * take ide_lock for drive->[no_]unmask/[no_]io_32bit
+                         */
+                        if (req_pio == 8 || req_pio == 9) {
+                                unsigned long flags;
+                                spin_lock_irqsave(&ide_lock, flags);
+                                hwif->set_pio_mode(drive, req_pio);
+                                spin_unlock_irqrestore(&ide_lock, flags);
+                        } else
                                hwif->set_pio_mode(drive, req_pio);
                } else {
                        int keep_dma = drive->using_dma;
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index d4d790f91f9..95168833d06 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -693,35 +693,16 @@ static u8 ide_auto_reduce_xfer (ide_drive_t *drive)
 }
 #endif /* CONFIG_BLK_DEV_IDEDMA */
-/*
+int ide_driveid_update(ide_drive_t *drive)
- * Update the 
- */
-int ide_driveid_update (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
+        ide_hwif_t *hwif = drive->hwif;
        struct hd_driveid *id;
-#if 0
+        unsigned long timeout, flags;
-        id = kmalloc(SECTOR_WORDS*4, GFP_ATOMIC);
-        if (!id)
-                return 0;
-        taskfile_lib_get_identify(drive, (char *)&id);
-        ide_fix_driveid(id);
-        if (id) {
-                drive->id->dma_ultra = id->dma_ultra;
-                drive->id->dma_mword = id->dma_mword;
-                drive->id->dma_1word = id->dma_1word;
-                /* anything more ? */
-                kfree(id);
-        }
-        return 1;
-#else
        /*
         * Re-read drive->id for possible DMA mode
         * change (copied from ide-probe.c)
         */
-        unsigned long timeout, flags;
        SELECT_MASK(drive, 1);
        if (IDE_CONTROL_REG)
@@ -763,7 +744,6 @@ int ide_driveid_update (ide_drive_t *drive)
        }
        return 1;
-#endif
 }
 int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 2b8009c50e9..e245521af7b 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -40,9 +40,8 @@ static int idepnp_probe(struct pnp_dev * dev, const struct pnp_device_id *dev_id
        ide_std_init_ports(&hw, pnp_port_start(dev, 0),
                                pnp_port_start(dev, 1));
        hw.irq = pnp_irq(dev, 0);
-        hw.dma = NO_DMA;
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
        if (index != -1) {
                printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index e294c7415c2..d5146c57e5b 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -717,7 +717,7 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave);
 * This routine only knows how to look for drive units 0 and 1
 * on an interface, so any setting of MAX_DRIVES > 2 won't work here.
 */
-static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
+static void probe_hwif(ide_hwif_t *hwif)
 {
        unsigned long flags;
        unsigned int irqd;
@@ -819,8 +819,8 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
                return;
        }
-        if (fixup)
+        if (hwif->fixup)
-                fixup(hwif);
+                hwif->fixup(hwif);
        for (unit = 0; unit < MAX_DRIVES; ++unit) {
                ide_drive_t *drive = &hwif->drives[unit];
@@ -859,10 +859,11 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
 }
 static int hwif_init(ide_hwif_t *hwif);
+static void hwif_register_devices(ide_hwif_t *hwif);
-int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
+static int probe_hwif_init(ide_hwif_t *hwif)
 {
-        probe_hwif(hwif, fixup);
+        probe_hwif(hwif);
        if (!hwif_init(hwif)) {
                printk(KERN_INFO "%s: failed to initialize IDE interface\n",
@@ -870,34 +871,12 @@ int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif)
                return -1;
        }
-        if (hwif->present) {
+        if (hwif->present)
-                u16 unit = 0;
+                hwif_register_devices(hwif);
-                int ret;
-                for (unit = 0; unit < MAX_DRIVES; ++unit) {
-                        ide_drive_t *drive = &hwif->drives[unit];
-                        /* For now don't attach absent drives, we may
-                           want them on default or a new "empty" class
-                           for hotplug reprobing ? */
-                        if (drive->present) {
-                                ret = device_register(&drive->gendev);
-                                if (ret < 0)
-                                        printk(KERN_WARNING "IDE: %s: "
-                                                "device_register error: %d\n",
-                                                __FUNCTION__, ret);
-                        }
-                }
-        }
        return 0;
 }
-int probe_hwif_init(ide_hwif_t *hwif)
-{
-        return probe_hwif_init_with_fixup(hwif, NULL);
-}
-EXPORT_SYMBOL(probe_hwif_init);
 #if MAX_HWIFS > 1
 /*
 * save_match() is used to simplify logic in init_irq() below.
@@ -1379,6 +1358,24 @@ out:
        return 0;
 }
+static void hwif_register_devices(ide_hwif_t *hwif)
+{
+        unsigned int i;
+        for (i = 0; i < MAX_DRIVES; i++) {
+                ide_drive_t *drive = &hwif->drives[i];
+                if (drive->present) {
+                        int ret = device_register(&drive->gendev);
+                        if (ret < 0)
+                                printk(KERN_WARNING "IDE: %s: "
+                                        "device_register error: %d\n",
+                                        __FUNCTION__, ret);
+                }
+        }
+}
 int ideprobe_init (void)
 {
        unsigned int index;
@@ -1390,27 +1387,18 @@ int ideprobe_init (void)
        for (index = 0; index < MAX_HWIFS; ++index)
                if (probe[index])
-                        probe_hwif(&ide_hwifs[index], NULL);
+                        probe_hwif(&ide_hwifs[index]);
        for (index = 0; index < MAX_HWIFS; ++index)
                if (probe[index])
                        hwif_init(&ide_hwifs[index]);
        for (index = 0; index < MAX_HWIFS; ++index) {
                if (probe[index]) {
                        ide_hwif_t *hwif = &ide_hwifs[index];
-                        int unit;
                        if (!hwif->present)
                                continue;
                        if (hwif->chipset == ide_unknown || hwif->chipset == ide_forced)
                                hwif->chipset = ide_generic;
-                        for (unit = 0; unit < MAX_DRIVES; ++unit)
+                        hwif_register_devices(hwif);
-                                if (hwif->drives[unit].present) {
-                                        int ret = device_register(
-                                                &hwif->drives[unit].gendev);
-                                        if (ret < 0)
-                                                printk(KERN_WARNING "IDE: %s: "
-                                                        "device_register error: %d\n",
-                                                        __FUNCTION__, ret);
-                                }
                }
        }
        for (index = 0; index < MAX_HWIFS; ++index)
@@ -1420,3 +1408,22 @@ int ideprobe_init (void)
 }
 EXPORT_SYMBOL_GPL(ideprobe_init);
+int ide_device_add(u8 idx[4])
+{
+        int i, rc = 0;
+        for (i = 0; i < 4; i++) {
+                if (idx[i] != 0xff)
+                        rc |= probe_hwif_init(&ide_hwifs[idx[i]]);
+        }
+        for (i = 0; i < 4; i++) {
+                if (idx[i] != 0xff)
+                        ide_proc_register_port(&ide_hwifs[idx[i]]);
+        }
+        return rc;
+}
+EXPORT_SYMBOL_GPL(ide_device_add);
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index fc1d8ae6a80..a4007d30da5 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -804,8 +804,6 @@ void ide_proc_register_port(ide_hwif_t *hwif)
        create_proc_ide_drives(hwif);
 }
-EXPORT_SYMBOL_GPL(ide_proc_register_port);
 #ifdef CONFIG_BLK_DEV_IDEPCI
 void ide_pci_create_host_proc(const char *name, get_info_t *get_info)
 {
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 1fa57947bca..7b9181b5469 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -565,7 +565,7 @@ typedef struct os_dat_s {
 *      The following parameter is used to select the point in the internal
 *      tape fifo in which we will start to refill the buffer. Decreasing
 *      the following parameter will improve the system's latency and
- *      interactive response, while using a high value might improve sytem
+ *      interactive response, while using a high value might improve system
 *      throughput.
 */
 #define IDETAPE_FIFO_THRESHOLD          2
@@ -621,7 +621,6 @@ typedef struct os_dat_s {
 */
 #define USE_IOTRACE     0
 #if USE_IOTRACE
-#include <linux/io_trace.h>
 #define IO_IDETAPE_FIFO 500
 #endif
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 2a3c8d49834..73ef6bf5fbc 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -8,23 +8,6 @@
 *  Copyright (C) 2003-2004     Bartlomiej Zolnierkiewicz
 *
 *  The big the bad and the ugly.
- *
- *  Problems to be fixed because of BH interface or the lack therefore.
- *
- *  Fill me in stupid !!!
- *
- *  HOST:
- *      General refers to the Controller and Driver "pair".
- *  DATA HANDLER:
- *      Under the context of Linux it generally refers to an interrupt handler.
- *      However, it correctly describes the 'HOST'
- *  DATA BLOCK:
- *      The amount of data needed to be transfered as predefined in the
- *      setup of the device.
- *  STORAGE ATOMIC:
- *      The 'DATA BLOCK' associated to the 'DATA HANDLER', and can be as
- *      small as a single sector or as large as the entire command block
- *      request.
 */
 #include <linux/module.h>
@@ -695,9 +678,6 @@ int ide_wait_cmd (ide_drive_t *drive, u8 cmd, u8 nsect, u8 feature, u8 sectors,
        return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
-/*
- * FIXME : this needs to map into at taskfile. <andre@linux-ide.org>
- */
 int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 {
        int err = 0;
@@ -761,9 +741,6 @@ static int ide_wait_cmd_task(ide_drive_t *drive, u8 *buf)
        return ide_do_drive_cmd(drive, &rq, ide_wait);
 }
-/*
- * FIXME : this needs to map into at taskfile. <andre@linux-ide.org>
- */
 int ide_task_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
 {
        void __user *p = (void __user *)arg;
@@ -860,9 +837,14 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
                case TASKFILE_OUT_DMA:
                case TASKFILE_IN_DMAQ:
                case TASKFILE_IN_DMA:
-                        hwif->dma_setup(drive);
+                        if (!drive->using_dma)
-                        hwif->dma_exec_cmd(drive, taskfile->command);
+                                break;
-                        hwif->dma_start(drive);
+                        if (!hwif->dma_setup(drive)) {
+                                hwif->dma_exec_cmd(drive, taskfile->command);
+                                hwif->dma_start(drive);
+                                return ide_started;
+                        }
                        break;
                default:
@@ -876,7 +858,8 @@ ide_startstop_t flagged_taskfile (ide_drive_t *drive, ide_task_t *task)
                                return task->prehandler(drive, task->rq);
                        }
                        ide_execute_command(drive, taskfile->command, task->handler, WAIT_WORSTCASE, NULL);
+                        return ide_started;
        }
-        return ide_started;
+        return ide_stopped;
 }
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 961e6c89728..674a65c1a13 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -168,7 +168,6 @@ static void init_hwif_default(ide_hwif_t *hwif, unsigned int index)
        ide_init_hwif_ports(&hw, ide_default_io_base(index), 0, &hwif->irq);
-        memcpy(&hwif->hw, &hw, sizeof(hw));
        memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports));
        hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
@@ -214,7 +213,7 @@ static void __init init_ide_data (void)
                init_hwif_data(hwif, index);
                init_hwif_default(hwif, index);
 #if !defined(CONFIG_PPC32) || !defined(CONFIG_PCI)
-                hwif->irq = hwif->hw.irq =
+                hwif->irq =
                        ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
 #endif
        }
@@ -265,6 +264,30 @@ static int ide_system_bus_speed(void)
        return system_bus_speed;
 }
+ide_hwif_t * ide_find_port(unsigned long base)
+{
+        ide_hwif_t *hwif;
+        int i;
+        for (i = 0; i < MAX_HWIFS; i++) {
+                hwif = &ide_hwifs[i];
+                if (hwif->io_ports[IDE_DATA_OFFSET] == base)
+                        goto found;
+        }
+        for (i = 0; i < MAX_HWIFS; i++) {
+                hwif = &ide_hwifs[i];
+                if (hwif->io_ports[IDE_DATA_OFFSET] == 0)
+                        goto found;
+        }
+        hwif = NULL;
+found:
+        return hwif;
+}
+EXPORT_SYMBOL_GPL(ide_find_port);
 static struct resource* hwif_request_region(ide_hwif_t *hwif,
                                            unsigned long addr, int num)
 {
@@ -391,6 +414,8 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
        hwif->cds                       = tmp_hwif->cds;
 #endif
+        hwif->fixup                     = tmp_hwif->fixup;
        hwif->set_pio_mode              = tmp_hwif->set_pio_mode;
        hwif->set_dma_mode              = tmp_hwif->set_dma_mode;
        hwif->mdma_filter               = tmp_hwif->mdma_filter;
@@ -652,7 +677,6 @@ void ide_setup_ports (	hw_regs_t *hw,
                }
        }
        hw->irq = irq;
-        hw->dma = NO_DMA;
        hw->ack_intr = ack_intr;
 /*
 *      hw->iops = iops;
@@ -660,11 +684,11 @@ void ide_setup_ports (	hw_regs_t *hw,
 }
 /**
- *      ide_register_hw_with_fixup      -       register IDE interface
+ *      ide_register_hw         -       register IDE interface
 *      @hw: hardware registers
+ *      @fixup: fixup function
 *      @initializing: set while initializing built-in drivers
 *      @hwifp: pointer to returned hwif
- *      @fixup: fixup function
 *
 *      Register an IDE interface, specifying exactly the registers etc.
 *      Set init=1 iff calling before probes have taken place.
@@ -672,9 +696,8 @@ void ide_setup_ports (	hw_regs_t *hw,
 *      Returns -1 on error.
 */
-int ide_register_hw_with_fixup(hw_regs_t *hw, int initializing,
+int ide_register_hw(hw_regs_t *hw, void (*fixup)(ide_hwif_t *),
-                               ide_hwif_t **hwifp,
+                    int initializing, ide_hwif_t **hwifp)
-                               void(*fixup)(ide_hwif_t *hwif))
 {
        int index, retry = 1;
        ide_hwif_t *hwif;
@@ -682,7 +705,7 @@ int ide_register_hw_with_fixup(hw_regs_t *hw, int initializing,
        do {
                for (index = 0; index < MAX_HWIFS; ++index) {
                        hwif = &ide_hwifs[index];
-                        if (hwif->hw.io_ports[IDE_DATA_OFFSET] == hw->io_ports[IDE_DATA_OFFSET])
+                        if (hwif->io_ports[IDE_DATA_OFFSET] == hw->io_ports[IDE_DATA_OFFSET])
                                goto found;
                }
                for (index = 0; index < MAX_HWIFS; ++index) {
@@ -690,7 +713,7 @@ int ide_register_hw_with_fixup(hw_regs_t *hw, int initializing,
                        if (hwif->hold)
                                continue;
                        if ((!hwif->present && !hwif->mate && !initializing) ||
-                            (!hwif->hw.io_ports[IDE_DATA_OFFSET] && initializing))
+                            (!hwif->io_ports[IDE_DATA_OFFSET] && initializing))
                                goto found;
                }
                for (index = 0; index < MAX_HWIFS; index++)
@@ -706,16 +729,18 @@ found:
        }
        if (hwif->present)
                return -1;
-        memcpy(&hwif->hw, hw, sizeof(*hw));
+        memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports));
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
        hwif->irq = hw->irq;
        hwif->noprobe = 0;
+        hwif->fixup = fixup;
        hwif->chipset = hw->chipset;
        hwif->gendev.parent = hw->dev;
+        hwif->ack_intr = hw->ack_intr;
+        if (initializing == 0) {
+                u8 idx[4] = { index, 0xff, 0xff, 0xff };
-        if (!initializing) {
+                ide_device_add(idx);
-                probe_hwif_init_with_fixup(hwif, fixup);
-                ide_proc_register_port(hwif);
        }
        if (hwifp)
@@ -724,13 +749,6 @@ found:
        return (initializing || hwif->present) ? index : -1;
 }
-EXPORT_SYMBOL(ide_register_hw_with_fixup);
-int ide_register_hw(hw_regs_t *hw, int initializing, ide_hwif_t **hwifp)
-{
-        return ide_register_hw_with_fixup(hw, initializing, hwifp, NULL);
-}
 EXPORT_SYMBOL(ide_register_hw);
 /*
@@ -1046,7 +1064,7 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
                        ide_init_hwif_ports(&hw, (unsigned long) args[0],
                                            (unsigned long) args[1], NULL);
                        hw.irq = args[2];
-                        if (ide_register_hw(&hw, 0, NULL) == -1)
+                        if (ide_register_hw(&hw, NULL, 0, NULL) == -1)
                                return -EIO;
                        return 0;
                }
@@ -1397,6 +1415,9 @@ static int __init ide_setup(char *s)
                        "reset", "minus6", "ata66", "minus8", "minus9",
                        "minus10", "four", "qd65xx", "ht6560b", "cmd640_vlb",
                        "dtc2278", "umc8672", "ali14xx", NULL };
+                hw_regs_t hwregs;
                hw = s[3] - '0';
                hwif = &ide_hwifs[hw];
                i = match_parm(&s[4], ide_words, vals, 3);
@@ -1506,9 +1527,9 @@ static int __init ide_setup(char *s)
                        case 2: /* base,ctl */
                                vals[2] = 0;    /* default irq = probe for it */
                        case 3: /* base,ctl,irq */
-                                hwif->hw.irq = vals[2];
+                                memset(&hwregs, 0, sizeof(hwregs));
-                                ide_init_hwif_ports(&hwif->hw, (unsigned long) vals[0], (unsigned long) vals[1], &hwif->irq);
+                                ide_init_hwif_ports(&hwregs, vals[0], vals[1], &hwif->irq);
-                                memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
+                                memcpy(hwif->io_ports, hwregs.io_ports, sizeof(hwif->io_ports));
                                hwif->irq      = vals[2];
                                hwif->noprobe  = 0;
                                hwif->chipset  = ide_forced;
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 2f0ef9b4403..10311ecc674 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -102,6 +102,8 @@ static void outReg (u8 data, u8 reg)
        outb_p(data, dataPort);
 }
+static DEFINE_SPINLOCK(ali14xx_lock);
 /*
 * Set PIO mode for the specified drive.
 * This function computes timing parameters
@@ -129,14 +131,14 @@ static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
        /* stuff timing parameters into controller registers */
        driveNum = (HWIF(drive)->index << 1) + drive->select.b.unit;
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&ali14xx_lock, flags);
        outb_p(regOn, basePort);
        outReg(param1, regTab[driveNum].reg1);
        outReg(param2, regTab[driveNum].reg2);
        outReg(param3, regTab[driveNum].reg3);
        outReg(param4, regTab[driveNum].reg4);
        outb_p(regOff, basePort);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&ali14xx_lock, flags);
 }
 /*
@@ -193,6 +195,7 @@ static int __init initRegisters (void) {
 static int __init ali14xx_probe(void)
 {
        ide_hwif_t *hwif, *mate;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
        printk(KERN_DEBUG "ali14xx: base=0x%03x, regOn=0x%02x.\n",
                          basePort, regOn);
@@ -217,11 +220,7 @@ static int __init ali14xx_probe(void)
        mate->mate = hwif;
        mate->channel = 1;
-        probe_hwif_init(hwif);
+        ide_device_add(idx);
-        probe_hwif_init(mate);
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
        return 0;
 }
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 101aee1711c..4a0be251a05 100644
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -212,8 +212,8 @@ fail_base2:
 //                                              xsurf_iops,
                                                IRQ_AMIGA_PORTS);
                        }       
-                        
-                        index = ide_register_hw(&hw, 1, &hwif);
+                        index = ide_register_hw(&hw, NULL, 1, &hwif);
                        if (index != -1) {
                                hwif->mmio = 1;
                                printk("ide%d: ", index);
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index f1652125486..24a845d45bd 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -67,20 +67,24 @@ static void sub22 (char b, char c)
        }
 }
+static DEFINE_SPINLOCK(dtc2278_lock);
 static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
        unsigned long flags;
        if (pio >= 3) {
-                spin_lock_irqsave(&ide_lock, flags);
+                spin_lock_irqsave(&dtc2278_lock, flags);
                /*
                 * This enables PIO mode4 (3?) on the first interface
                 */
                sub22(1,0xc3);
                sub22(0,0xa0);
-                spin_unlock_irqrestore(&ide_lock, flags);
+                spin_unlock_irqrestore(&dtc2278_lock, flags);
        } else {
                /* we don't know how to set it back again.. */
+                /* Actually we do - there is a data sheet available for the
+                   Winbond but does anyone actually care */
        }
        /*
@@ -94,6 +98,7 @@ static int __init dtc2278_probe(void)
 {
        unsigned long flags;
        ide_hwif_t *hwif, *mate;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
        hwif = &ide_hwifs[0];
        mate = &ide_hwifs[1];
@@ -129,16 +134,13 @@ static int __init dtc2278_probe(void)
        mate->serialized = 1;
        mate->chipset = ide_dtc2278;
+        mate->pio_mask = ATA_PIO4;
        mate->drives[0].no_unmask = 1;
        mate->drives[1].no_unmask = 1;
        mate->mate = hwif;
        mate->channel = 1;
-        probe_hwif_init(hwif);
+        ide_device_add(idx);
-        probe_hwif_init(mate);
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
        return 0;
 }
diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index f0829b83e97..7d7936f1b90 100644
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -72,7 +72,7 @@ void __init falconide_init(void)
                        0, 0, NULL,
 //                      falconide_iops,
                        IRQ_MFP_IDE);
-        index = ide_register_hw(&hw, 1, NULL);
+        index = ide_register_hw(&hw, NULL, 1, NULL);
        if (index != -1)
            printk("ide%d: Falcon IDE interface\n", index);
diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index 0830a021bbb..53331ee1e95 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -165,7 +165,7 @@ found:
 //                      &gayle_iops,
                        IRQ_AMIGA_PORTS);
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
        if (index != -1) {
            hwif->mmio = 1;
            switch (i) {
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 2e5a9cc5c0f..a4245d13f11 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -247,6 +247,8 @@ static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio)
        }
 }
+static DEFINE_SPINLOCK(ht6560b_lock);
 /*
 *  Enable/Disable so called prefetch mode
 */
@@ -254,9 +256,9 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state)
 {
        unsigned long flags;
        int t = HT_PREFETCH_MODE << 8;
-        
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&ht6560b_lock, flags);
-        
        /*
         *  Prefetch mode and unmask irq seems to conflict
         */
@@ -268,9 +270,9 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state)
                drive->drive_data &= ~t;  /* disable prefetch mode */
                drive->no_unmask = 0;
        }
-        
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&ht6560b_lock, flags);
-        
 #ifdef DEBUG
        printk("ht6560b: drive %s prefetch mode %sabled\n", drive->name, (state ? "en" : "dis"));
 #endif
@@ -287,16 +289,14 @@ static void ht6560b_set_pio_mode(ide_drive_t *drive, const u8 pio)
                ht_set_prefetch(drive, pio & 1);
                return;
        }
-        
        timing = ht_pio2timings(drive, pio);
-        
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&ht6560b_lock, flags);
-        
        drive->drive_data &= 0xff00;
        drive->drive_data |= timing;
-        
+        spin_unlock_irqrestore(&ht6560b_lock, flags);
-        spin_unlock_irqrestore(&ide_lock, flags);
-        
 #ifdef DEBUG
        printk("ht6560b: drive %s tuned to pio mode %#x timing=%#x\n", drive->name, pio, timing);
 #endif
@@ -311,6 +311,7 @@ MODULE_PARM_DESC(probe, "probe for HT6560B chipset");
 int __init ht6560b_init(void)
 {
        ide_hwif_t *hwif, *mate;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
        int t;
        if (probe_ht6560b == 0)
@@ -359,11 +360,7 @@ int __init ht6560b_init(void)
        mate->drives[0].drive_data = t;
        mate->drives[1].drive_data = t;
-        probe_hwif_init(hwif);
+        ide_device_add(idx);
-        probe_hwif_init(mate);
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
        return 0;
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
index e8e360c2619..03715c05866 100644
--- a/drivers/ide/legacy/ide-cs.c
+++ b/drivers/ide/legacy/ide-cs.c
@@ -153,7 +153,7 @@ static int idecs_register(unsigned long io, unsigned long ctl, unsigned long irq
    hw.irq = irq;
    hw.chipset = ide_pci;
    hw.dev = &handle->dev;
-    return ide_register_hw_with_fixup(&hw, 0, NULL, ide_undecoded_slave);
+    return ide_register_hw(&hw, &ide_undecoded_slave, 0, NULL);
 }
 /*======================================================================
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c
index b992b2b91fe..7bb79f53dac 100644
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
@@ -33,39 +33,24 @@ static ide_hwif_t *__devinit plat_ide_locate_hwif(void __iomem *base,
            int mmio)
 {
        unsigned long port = (unsigned long)base;
-        ide_hwif_t *hwif;
+        ide_hwif_t *hwif = ide_find_port(port);
-        int index, i;
+        int i;
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = ide_hwifs + index;
-                if (hwif->io_ports[IDE_DATA_OFFSET] == port)
-                        goto found;
-        }
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                hwif = ide_hwifs + index;
-                if (hwif->io_ports[IDE_DATA_OFFSET] == 0)
-                        goto found;
-        }
-        return NULL;
+        if (hwif == NULL)
+                goto out;
-found:
-        hwif->hw.io_ports[IDE_DATA_OFFSET] = port;
+        hwif->io_ports[IDE_DATA_OFFSET] = port;
        port += (1 << pdata->ioport_shift);
        for (i = IDE_ERROR_OFFSET; i <= IDE_STATUS_OFFSET;
             i++, port += (1 << pdata->ioport_shift))
-                hwif->hw.io_ports[i] = port;
+                hwif->io_ports[i] = port;
-        hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
+        hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
+        hwif->irq = irq;
-        hwif->hw.irq = hwif->irq = irq;
-        hwif->hw.dma = NO_DMA;
+        hwif->chipset = ide_generic;
-        hwif->chipset = hwif->hw.chipset = ide_generic;
        if (mmio) {
                hwif->mmio = 1;
@@ -73,8 +58,8 @@ found:
        }
        hwif_prop.hwif = hwif;
-        hwif_prop.index = index;
+        hwif_prop.index = hwif->index;
+out:
        return hwif;
 }
@@ -83,6 +68,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
        struct resource *res_base, *res_alt, *res_irq;
        ide_hwif_t *hwif;
        struct pata_platform_info *pdata;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        int ret = 0;
        int mmio = 0;
@@ -130,10 +116,11 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
        hwif->gendev.parent = &pdev->dev;
        hwif->noprobe = 0;
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
+        ide_device_add(idx);
        platform_set_drvdata(pdev, hwif);
-        ide_proc_register_port(hwif);
        return 0;
diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index b557c45a5a9..e87cd2f1643 100644
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -93,21 +93,21 @@ void macide_init(void)
                                0, 0, macide_ack_intr,
 //                              quadra_ide_iops,
                                IRQ_NUBUS_F);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                break;
        case MAC_IDE_PB:
                ide_setup_ports(&hw, IDE_BASE, macide_offsets,
                                0, 0, macide_ack_intr,
 //                              macide_pb_iops,
                                IRQ_NUBUS_C);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                break;
        case MAC_IDE_BABOON:
                ide_setup_ports(&hw, BABOON_BASE, macide_offsets,
                                0, 0, NULL,
 //                              macide_baboon_iops,
                                IRQ_BABOON_1);
-                index = ide_register_hw(&hw, 1, &hwif);
+                index = ide_register_hw(&hw, NULL, 1, &hwif);
                if (index == -1) break;
                if (macintosh_config->ident == MAC_MODEL_PB190) {
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index e628a983ce3..a73db1bd482 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -89,9 +89,8 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
                else
                        hw->io_ports[i] = Q40_ISA_IO_B(base + offsets[i]);
        }
-        
        hw->irq = irq;
-        hw->dma = NO_DMA;
        hw->ack_intr = ack_intr;
 /*
 *      hw->iops = iops;
@@ -102,7 +101,7 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
 /* 
 * the static array is needed to have the name reported in /proc/ioports,
- * hwif->name unfortunately isn�t available yet
+ * hwif->name unfortunately isn't available yet
 */
 static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={
        "ide0", "ide1"
@@ -142,7 +141,7 @@ void q40ide_init(void)
                        0, NULL,
 //                      m68kide_iops,
                        q40ide_default_irq(pcide_bases[i]));
-        index = ide_register_hw(&hw, 1, &hwif);
+        index = ide_register_hw(&hw, NULL, 1, &hwif);
        // **FIXME**
        if (index != -1)
                hwif->mmio = 1;
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 0c81d2d0b94..912e73853fa 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -89,26 +89,6 @@
 static int timings[4]={-1,-1,-1,-1}; /* stores current timing for each timer */
-static void qd_write_reg (u8 content, unsigned long reg)
-{
-        unsigned long flags;
-        spin_lock_irqsave(&ide_lock, flags);
-        outb(content,reg);
-        spin_unlock_irqrestore(&ide_lock, flags);
-}
-static u8 __init qd_read_reg (unsigned long reg)
-{
-        unsigned long flags;
-        u8 read;
-        spin_lock_irqsave(&ide_lock, flags);
-        read = inb(reg);
-        spin_unlock_irqrestore(&ide_lock, flags);
-        return read;
-}
 /*
 * qd_select:
 *
@@ -121,7 +101,7 @@ static void qd_select (ide_drive_t *drive)
                        (QD_TIMREG(drive) & 0x02);
        if (timings[index] != QD_TIMING(drive))
-                qd_write_reg(timings[index] = QD_TIMING(drive), QD_TIMREG(drive));
+                outb(timings[index] = QD_TIMING(drive), QD_TIMREG(drive));
 }
 /*
@@ -284,7 +264,7 @@ static void qd6580_set_pio_mode(ide_drive_t *drive, const u8 pio)
        }
        if (!HWIF(drive)->channel && drive->media != ide_disk) {
-                qd_write_reg(0x5f, QD_CONTROL_PORT);
+                outb(0x5f, QD_CONTROL_PORT);
                printk(KERN_WARNING "%s: ATAPI: disabled read-ahead FIFO "
                        "and post-write buffer on %s.\n",
                        drive->name, HWIF(drive)->name);
@@ -301,16 +281,15 @@ static void qd6580_set_pio_mode(ide_drive_t *drive, const u8 pio)
 static int __init qd_testreg(int port)
 {
-        u8 savereg;
-        u8 readreg;
        unsigned long flags;
+        u8 savereg, readreg;
-        spin_lock_irqsave(&ide_lock, flags);
+        local_irq_save(flags);
        savereg = inb_p(port);
        outb_p(QD_TESTVAL, port);       /* safe value */
        readreg = inb_p(port);
        outb(savereg, port);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        local_irq_restore(flags);
        if (savereg == QD_TESTVAL) {
                printk(KERN_ERR "Outch ! the probe for qd65xx isn't reliable !\n");
@@ -364,13 +343,13 @@ static void __exit qd_unsetup(ide_hwif_t *hwif)
        if (set_pio_mode == (void *)qd6500_set_pio_mode) {
                // will do it for both
-                qd_write_reg(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
+                outb(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
        } else if (set_pio_mode == (void *)qd6580_set_pio_mode) {
                if (QD_CONTROL(hwif) & QD_CONTR_SEC_DISABLED) {
-                        qd_write_reg(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
+                        outb(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
-                        qd_write_reg(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1]));
+                        outb(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1]));
                } else {
-                        qd_write_reg(hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
+                        outb(hwif->channel ? QD6580_DEF_DATA2 : QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
                }
        } else {
                printk(KERN_WARNING "Unknown qd65xx tuning fonction !\n");
@@ -389,10 +368,11 @@ static void __exit qd_unsetup(ide_hwif_t *hwif)
 static int __init qd_probe(int base)
 {
        ide_hwif_t *hwif;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        u8 config;
        u8 unit;
-        config = qd_read_reg(QD_CONFIG_PORT);
+        config = inb(QD_CONFIG_PORT);
        if (! ((config & QD_CONFIG_BASEPORT) >> 1 == (base == 0xb0)) )
                return 1;
@@ -419,9 +399,9 @@ static int __init qd_probe(int base)
                hwif->set_pio_mode = &qd6500_set_pio_mode;
-                probe_hwif_init(hwif);
+                idx[0] = unit;
-                ide_proc_register_port(hwif);
+                ide_device_add(idx);
                return 1;
        }
@@ -436,7 +416,7 @@ static int __init qd_probe(int base)
                /* qd6580 found */
-                control = qd_read_reg(QD_CONTROL_PORT);
+                control = inb(QD_CONTROL_PORT);
                printk(KERN_NOTICE "qd6580 at %#x\n", base);
                printk(KERN_DEBUG "qd6580: config=%#x, control=%#x, ID3=%u\n",
@@ -453,11 +433,11 @@ static int __init qd_probe(int base)
                        hwif->set_pio_mode = &qd6580_set_pio_mode;
-                        probe_hwif_init(hwif);
+                        idx[0] = unit;
-                        qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
+                        ide_device_add(idx);
-                        ide_proc_register_port(hwif);
+                        outb(QD_DEF_CONTR, QD_CONTROL_PORT);
                        return 1;
                } else {
@@ -474,19 +454,17 @@ static int __init qd_probe(int base)
                        hwif->set_pio_mode = &qd6580_set_pio_mode;
-                        probe_hwif_init(hwif);
                        qd_setup(mate, base, config | (control << 8),
                                 QD6580_DEF_DATA2, QD6580_DEF_DATA2);
                        mate->set_pio_mode = &qd6580_set_pio_mode;
-                        probe_hwif_init(mate);
+                        idx[0] = 0;
+                        idx[1] = 1;
-                        qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
+                        ide_device_add(idx);
-                        ide_proc_register_port(hwif);
+                        outb(QD_DEF_CONTR, QD_CONTROL_PORT);
-                        ide_proc_register_port(mate);
                        return 0; /* no other qd65xx possible */
                }
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index 1151c92dd53..79577b91687 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -124,8 +124,9 @@ static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio)
 static int __init umc8672_probe(void)
 {
-        unsigned long flags;
        ide_hwif_t *hwif, *mate;
+        unsigned long flags;
+        static u8 idx[4] = { 0, 1, 0xff, 0xff };
        if (!request_region(0x108, 2, "umc8672")) {
                printk(KERN_ERR "umc8672: ports 0x108-0x109 already in use.\n");
@@ -158,11 +159,7 @@ static int __init umc8672_probe(void)
        mate->mate = hwif;
        mate->channel = 1;
-        probe_hwif_init(hwif);
+        ide_device_add(idx);
-        probe_hwif_init(mate);
-        ide_proc_register_port(hwif);
-        ide_proc_register_port(mate);
        return 0;
 }
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 2f322d7e881..1de58566e5b 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -601,8 +601,9 @@ static int au_ide_probe(struct device *dev)
        _auide_hwif *ahwif = &auide_hwif;
        ide_hwif_t *hwif;
        struct resource *res;
-        hw_regs_t *hw;
        int ret = 0;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+        hw_regs_t hw;
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
        char *mode = "MWDMA2";
@@ -644,12 +645,12 @@ static int au_ide_probe(struct device *dev)
        /* FIXME:  This might possibly break PCMCIA IDE devices */
        hwif                            = &ide_hwifs[pdev->id];
-        hw                              = &hwif->hw;
+        hwif->irq                       = ahwif->irq;
-        hwif->irq = hw->irq             = ahwif->irq;
        hwif->chipset                   = ide_au1xxx;
-        auide_setup_ports(hw, ahwif);
+        memset(&hw, 0, sizeof(hw));
-        memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports));
+        auide_setup_ports(&hw, ahwif);
+        memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
        hwif->ultra_mask                = 0x0;  /* Disable Ultra DMA */
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
@@ -706,8 +707,10 @@ static int au_ide_probe(struct device *dev)
        hwif->config_data               = 0;    /* no chipset-specific code */
        hwif->drives[0].autotune        = 1;    /* 1=autotune, 2=noautotune, 0=default */
+        hwif->drives[1].autotune        = 1;
 #endif
-        hwif->drives[0].no_io_32bit     = 1;   
+        hwif->drives[0].no_io_32bit     = 1;
+        hwif->drives[1].no_io_32bit     = 1;
        auide_hwif.hwif                 = hwif;
        hwif->hwif_data                 = &auide_hwif;
@@ -717,9 +720,9 @@ static int au_ide_probe(struct device *dev)
        dbdma_init_done = 1;
 #endif
-        probe_hwif_init(hwif);
+        idx[0] = hwif->index;
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
        dev_set_drvdata(dev, hwif);
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index c2e29571b00..521edd41b57 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -71,6 +71,7 @@ static int __devinit swarm_ide_probe(struct device *dev)
        u8 __iomem *base;
        phys_t offset, size;
        int i;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        if (!SIBYTE_HAVE_IDE)
                return -ENODEV;
@@ -119,18 +120,15 @@ static int __devinit swarm_ide_probe(struct device *dev)
        hwif->noprobe = 0;
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)
-                hwif->hw.io_ports[i] =
+                hwif->io_ports[i] =
                                (unsigned long)(base + ((0x1f0 + i) << 5));
-        hwif->hw.io_ports[IDE_CONTROL_OFFSET] =
+        hwif->io_ports[IDE_CONTROL_OFFSET] =
                                (unsigned long)(base + (0x3f6 << 5));
-        hwif->hw.irq = K_INT_GB_IDE;
+        hwif->irq = K_INT_GB_IDE;
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
+        idx[0] = hwif->index;
-        hwif->irq = hwif->hw.irq;
-        probe_hwif_init(hwif);
+        ide_device_add(idx);
-        ide_proc_register_port(hwif);
        dev_set_drvdata(dev, hwif);
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index b3dc12a70d5..19ec421f7b9 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/aec62xx.c              Version 0.26    Sep 1, 2007
+ * linux/drivers/ide/pci/aec62xx.c              Version 0.27    Sep 16, 2007
 *
 * Copyright (C) 1999-2002      Andre Hedrick <andre@linux-ide.org>
 * Copyright (C) 2007           MontaVista Software, Inc. <source@mvista.com>
@@ -141,19 +141,6 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
        drive->hwif->set_dma_mode(drive, pio + XFER_PIO_0);
 }
-static void aec62xx_dma_lost_irq (ide_drive_t *drive)
-{
-        switch (HWIF(drive)->pci_dev->device) {
-                case PCI_DEVICE_ID_ARTOP_ATP860:
-                case PCI_DEVICE_ID_ARTOP_ATP860R:
-                case PCI_DEVICE_ID_ARTOP_ATP865:
-                case PCI_DEVICE_ID_ARTOP_ATP865R:
-                        printk(" AEC62XX time out ");
-                default:
-                        break;
-        }
-}
 static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name)
 {
        int bus_speed = system_bus_clock();
@@ -195,8 +182,6 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
        if (hwif->dma_base == 0)
                return;
-        hwif->dma_lost_irq      = &aec62xx_dma_lost_irq;
        if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF)
                return;
@@ -209,7 +194,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
        }
 }
-static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
+static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
        {       /* 0 */
                .name           = "AEC6210",
                .init_chipset   = init_chipset_aec62xx,
@@ -268,12 +253,12 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = {
 *      finds a device matching our IDE device tables.
 *
 *      NOTE: since we're going to modify the 'name' field for AEC-6[26]80[R]
- *      chips, pass a local copy of 'struct pci_device_id' down the call chain.
+ *      chips, pass a local copy of 'struct ide_port_info' down the call chain.
 */
- 
 static int __devinit aec62xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t d;
+        struct ide_port_info d;
        u8 idx = id->driver_data;
        d = aec62xx_chipsets[idx];
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 8ee2b48d105..a607dd31a64 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/alim15x3.c             Version 0.27    Aug 27 2007
+ * linux/drivers/ide/pci/alim15x3.c             Version 0.29    Sep 16 2007
 *
 *  Copyright (C) 1998-2000 Michel Aubry, Maintainer
 *  Copyright (C) 1998-2000 Andrzej Krzysztofowicz, Maintainer
@@ -492,6 +492,13 @@ static unsigned int __devinit init_chipset_ali15x3 (struct pci_dev *dev, const c
                 * clear bit 7
                 */
                pci_write_config_byte(dev, 0x4b, tmpbyte & 0x7F);
+                /*
+                 * check m1533, 0x5e, bit 1~4 == 1001 => & 00011110 = 00010010
+                 */
+                if (m5229_revision >= 0x20 && isa_dev) {
+                        pci_read_config_byte(isa_dev, 0x5e, &tmpbyte);
+                        chip_is_1543c_e = ((tmpbyte & 0x1e) == 0x12) ? 1: 0;
+                }
                goto out;
        }
@@ -537,7 +544,30 @@ static unsigned int __devinit init_chipset_ali15x3 (struct pci_dev *dev, const c
                        pci_write_config_byte(isa_dev, 0x79, tmpbyte | 0x02);
                }
        }
 out:
+        /*
+         * CD_ROM DMA on (m5229, 0x53, bit0)
+         *      Enable this bit even if we want to use PIO.
+         * PIO FIFO off (m5229, 0x53, bit1)
+         *      The hardware will use 0x54h and 0x55h to control PIO FIFO.
+         *      (Not on later devices it seems)
+         *
+         *      0x53 changes meaning on later revs - we must no touch
+         *      bit 1 on them.  Need to check if 0x20 is the right break.
+         */
+        if (m5229_revision >= 0x20) {
+                pci_read_config_byte(dev, 0x53, &tmpbyte);
+                if (m5229_revision <= 0x20)
+                        tmpbyte = (tmpbyte & (~0x02)) | 0x01;
+                else if (m5229_revision == 0xc7 || m5229_revision == 0xc8)
+                        tmpbyte |= 0x03;
+                else
+                        tmpbyte |= 0x01;
+                pci_write_config_byte(dev, 0x53, tmpbyte);
+        }
        pci_dev_put(north);
        pci_dev_put(isa_dev);
        local_irq_restore(flags);
@@ -616,36 +646,8 @@ static u8 __devinit ata66_ali15x3(ide_hwif_t *hwif)
                        if ((tmpbyte & (1 << hwif->channel)) == 0)
                                cbl = ATA_CBL_PATA80;
                }
-        } else {
-                /*
-                 * check m1533, 0x5e, bit 1~4 == 1001 => & 00011110 = 00010010
-                 */
-                pci_read_config_byte(isa_dev, 0x5e, &tmpbyte);
-                chip_is_1543c_e = ((tmpbyte & 0x1e) == 0x12) ? 1: 0;
        }
-        /*
-         * CD_ROM DMA on (m5229, 0x53, bit0)
-         *      Enable this bit even if we want to use PIO
-         * PIO FIFO off (m5229, 0x53, bit1)
-         *      The hardware will use 0x54h and 0x55h to control PIO FIFO
-         *      (Not on later devices it seems)
-         *
-         *      0x53 changes meaning on later revs - we must no touch
-         *      bit 1 on them. Need to check if 0x20 is the right break
-         */
-         
-        pci_read_config_byte(dev, 0x53, &tmpbyte);
-        
-        if(m5229_revision <= 0x20)
-                tmpbyte = (tmpbyte & (~0x02)) | 0x01;
-        else if (m5229_revision == 0xc7 || m5229_revision == 0xc8)
-                tmpbyte |= 0x03;
-        else
-                tmpbyte |= 0x01;
-        pci_write_config_byte(dev, 0x53, tmpbyte);
        local_irq_restore(flags);
        return cbl;
@@ -664,31 +666,9 @@ static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
        hwif->set_dma_mode = &ali_set_dma_mode;
        hwif->udma_filter = &ali_udma_filter;
-        /* don't use LBA48 DMA on ALi devices before rev 0xC5 */
-        if (m5229_revision <= 0xC4)
-                hwif->host_flags |= IDE_HFLAG_NO_LBA48_DMA;
        if (hwif->dma_base == 0)
                return;
-        /*
-         * check in ->init_dma guarantees m5229_revision >= 0x20 here
-         */
-        if (m5229_revision == 0x20)
-                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
-        if (m5229_revision <= 0x20)
-                hwif->ultra_mask = 0x00; /* no udma */
-        else if (m5229_revision < 0xC2)
-                hwif->ultra_mask = ATA_UDMA2;
-        else if (m5229_revision == 0xC2 || m5229_revision == 0xC3)
-                hwif->ultra_mask = ATA_UDMA4;
-        else if (m5229_revision == 0xC4)
-                hwif->ultra_mask = ATA_UDMA5;
-        else
-                hwif->ultra_mask = ATA_UDMA6;
        hwif->dma_setup = &ali15x3_dma_setup;
        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
@@ -766,7 +746,7 @@ static void __devinit init_dma_ali15x3 (ide_hwif_t *hwif, unsigned long dmabase)
        ide_setup_dma(hwif, dmabase, 8);
 }
-static ide_pci_device_t ali15x3_chipset __devinitdata = {
+static const struct ide_port_info ali15x3_chipset __devinitdata = {
        .name           = "ALI15X3",
        .init_chipset   = init_chipset_ali15x3,
        .init_hwif      = init_hwif_ali15x3,
@@ -792,15 +772,34 @@ static int __devinit alim15x3_init_one(struct pci_dev *dev, const struct pci_dev
                { },
        };
-        ide_pci_device_t *d = &ali15x3_chipset;
+        struct ide_port_info d = ali15x3_chipset;
+        u8 rev = dev->revision;
        if (pci_dev_present(ati_rs100))
                printk(KERN_WARNING "alim15x3: ATI Radeon IGP Northbridge is not yet fully tested.\n");
+        /* don't use LBA48 DMA on ALi devices before rev 0xC5 */
+        if (rev <= 0xC4)
+                d.host_flags |= IDE_HFLAG_NO_LBA48_DMA;
+        if (rev >= 0x20) {
+                if (rev == 0x20)
+                        d.host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
+                if (rev < 0xC2)
+                        d.udma_mask = ATA_UDMA2;
+                else if (rev == 0xC2 || rev == 0xC3)
+                        d.udma_mask = ATA_UDMA4;
+                else if (rev == 0xC4)
+                        d.udma_mask = ATA_UDMA5;
+                else
+                        d.udma_mask = ATA_UDMA6;
+        }
 #if defined(CONFIG_SPARC64)
-        d->init_hwif = init_hwif_common_ali15x3;
+        d.init_hwif = init_hwif_common_ali15x3;
 #endif /* CONFIG_SPARC64 */
-        return ide_setup_pci_device(dev, d);
+        return ide_setup_pci_device(dev, &d);
 }
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 7cafefbf6c1..8d4125ec252 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -77,7 +77,7 @@ static struct amd_ide_chip {
 };
 static struct amd_ide_chip *amd_config;
-static ide_pci_device_t *amd_chipset;
+static const struct ide_port_info *amd_chipset;
 static unsigned int amd_80w;
 static unsigned int amd_clock;
@@ -242,19 +242,12 @@ static unsigned int __devinit init_chipset_amd74xx(struct pci_dev *dev, const ch
 static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
 {
-        int i;
        if (hwif->irq == 0) /* 0 is bogus but will do for now */
                hwif->irq = pci_get_legacy_ide_irq(hwif->pci_dev, hwif->channel);
        hwif->set_pio_mode = &amd_set_pio_mode;
        hwif->set_dma_mode = &amd_set_drive;
-        for (i = 0; i < 2; i++) {
-                hwif->drives[i].io_32bit = 1;
-                hwif->drives[i].unmask = 1;
-        }
        if (!hwif->dma_base)
                return;
@@ -270,16 +263,21 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
        }
 }
+#define IDE_HFLAGS_AMD \
+        (IDE_HFLAG_PIO_NO_BLACKLIST | \
+         IDE_HFLAG_PIO_NO_DOWNGRADE | \
+         IDE_HFLAG_POST_SET_MODE | \
+         IDE_HFLAG_IO_32BIT | \
+         IDE_HFLAG_UNMASK_IRQS | \
+         IDE_HFLAG_BOOTABLE)
 #define DECLARE_AMD_DEV(name_str)                                       \
        {                                                               \
                .name           = name_str,                             \
                .init_chipset   = init_chipset_amd74xx,                 \
                .init_hwif      = init_hwif_amd74xx,                    \
                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}}, \
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |          \
+                .host_flags     = IDE_HFLAGS_AMD,                       \
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |          \
-                                  IDE_HFLAG_POST_SET_MODE |             \
-                                  IDE_HFLAG_BOOTABLE,                   \
                .pio_mask       = ATA_PIO5,                             \
                .swdma_mask     = ATA_SWDMA2,                           \
                .mwdma_mask     = ATA_MWDMA2,                           \
@@ -291,16 +289,13 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                .init_chipset   = init_chipset_amd74xx,                 \
                .init_hwif      = init_hwif_amd74xx,                    \
                .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}}, \
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |          \
+                .host_flags     = IDE_HFLAGS_AMD,                       \
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |          \
-                                  IDE_HFLAG_POST_SET_MODE |             \
-                                  IDE_HFLAG_BOOTABLE,                   \
                .pio_mask       = ATA_PIO5,                             \
                .swdma_mask     = ATA_SWDMA2,                           \
                .mwdma_mask     = ATA_MWDMA2,                           \
        }
-static ide_pci_device_t amd74xx_chipsets[] __devinitdata = {
+static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
        /*  0 */ DECLARE_AMD_DEV("AMD7401"),
        /*  1 */ DECLARE_AMD_DEV("AMD7409"),
        /*  2 */ DECLARE_AMD_DEV("AMD7411"),
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 30784305307..ef8e0164ef7 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -189,8 +189,7 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
        hwif->dma_host_off = &atiixp_dma_host_off;
 }
+static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
-static ide_pci_device_t atiixp_pci_info[] __devinitdata = {
        {       /* 0 */
                .name           = "ATIIXP",
                .init_hwif      = init_hwif_atiixp,
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index f369645e4d1..4aa48104e0c 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -185,6 +185,8 @@ static u8 recovery_counts[4] = {16, 16, 16, 16}; /* Recovery count (encoded) */
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
+static DEFINE_SPINLOCK(cmd640_lock);
 /*
 * These are initialized to point at the devices we control
 */
@@ -258,12 +260,12 @@ static u8 get_cmd640_reg_vlb (u16 reg)
 static u8 get_cmd640_reg(u16 reg)
 {
-        u8 b;
        unsigned long flags;
+        u8 b;
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
        b = __get_cmd640_reg(reg);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
        return b;
 }
@@ -271,9 +273,9 @@ static void put_cmd640_reg(u16 reg, u8 val)
 {
        unsigned long flags;
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
        __put_cmd640_reg(reg,val);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
 }
 static int __init match_pci_cmd640_device (void)
@@ -351,7 +353,7 @@ static int __init secondary_port_responding (void)
 {
        unsigned long flags;
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
        outb_p(0x0a, 0x170 + IDE_SELECT_OFFSET);        /* select drive0 */
        udelay(100);
@@ -359,11 +361,11 @@ static int __init secondary_port_responding (void)
                outb_p(0x1a, 0x170 + IDE_SELECT_OFFSET); /* select drive1 */
                udelay(100);
                if ((inb_p(0x170 + IDE_SELECT_OFFSET) & 0x1f) != 0x1a) {
-                        spin_unlock_irqrestore(&ide_lock, flags);
+                        spin_unlock_irqrestore(&cmd640_lock, flags);
                        return 0; /* nothing responded */
                }
        }
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
        return 1; /* success */
 }
@@ -440,11 +442,11 @@ static void __init setup_device_ptrs (void)
 static void set_prefetch_mode (unsigned int index, int mode)
 {
        ide_drive_t *drive = cmd_drives[index];
+        unsigned long flags;
        int reg = prefetch_regs[index];
        u8 b;
-        unsigned long flags;
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
        b = __get_cmd640_reg(reg);
        if (mode) {     /* want prefetch on? */
 #if CMD640_PREFETCH_MASKS
@@ -460,7 +462,7 @@ static void set_prefetch_mode (unsigned int index, int mode)
                b |= prefetch_masks[index];     /* disable prefetch */
        }
        __put_cmd640_reg(reg, b);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
 }
 /*
@@ -561,7 +563,7 @@ static void program_drive_counts (unsigned int index)
        /*
         * Now that everything is ready, program the new timings
         */
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
        /*
         * Program the address_setup clocks into ARTTIM reg,
         * and then the active/recovery counts into the DRWTIM reg
@@ -570,7 +572,7 @@ static void program_drive_counts (unsigned int index)
        setup_count |= __get_cmd640_reg(arttim_regs[index]) & 0x3f;
        __put_cmd640_reg(arttim_regs[index], setup_count);
        __put_cmd640_reg(drwtim_regs[index], pack_nibbles(active_count, recovery_count));
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
 }
 /*
@@ -670,20 +672,20 @@ static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio)
 static int pci_conf1(void)
 {
-        u32 tmp;
        unsigned long flags;
+        u32 tmp;
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
        outb(0x01, 0xCFB);
        tmp = inl(0xCF8);
        outl(0x80000000, 0xCF8);
        if (inl(0xCF8) == 0x80000000) {
                outl(tmp, 0xCF8);
-                spin_unlock_irqrestore(&ide_lock, flags);
+                spin_unlock_irqrestore(&cmd640_lock, flags);
                return 1;
        }
        outl(tmp, 0xCF8);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
        return 0;
 }
@@ -691,15 +693,15 @@ static int pci_conf2(void)
 {
        unsigned long flags;
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&cmd640_lock, flags);
        outb(0x00, 0xCFB);
        outb(0x00, 0xCF8);
        outb(0x00, 0xCFA);
        if (inb(0xCF8) == 0x00 && inb(0xCF8) == 0x00) {
-                spin_unlock_irqrestore(&ide_lock, flags);
+                spin_unlock_irqrestore(&cmd640_lock, flags);
                return 1;
        }
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&cmd640_lock, flags);
        return 0;
 }
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index adee2ef6fd7..ea0143ef5fe 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -535,7 +535,6 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
                hwif->ide_dma_test_irq  = &cmd648_ide_dma_test_irq;
                break;
        case PCI_DEVICE_ID_CMD_646:
-                hwif->chipset = ide_cmd646;
                if (dev->revision == 0x01) {
                        hwif->ide_dma_end = &cmd646_1_ide_dma_end;
                        break;
@@ -549,7 +548,7 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
        }
 }
-static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
+static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
        {       /* 0 */
                .name           = "CMD643",
                .init_chipset   = init_chipset_cmd64x,
@@ -573,6 +572,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                .init_chipset   = init_chipset_cmd64x,
                .init_hwif      = init_hwif_cmd64x,
                .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
+                .chipset        = ide_cmd646,
                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,
                .pio_mask       = ATA_PIO5,
                .mwdma_mask     = ATA_MWDMA2,
@@ -591,7 +591,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
 static int __devinit cmd64x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t d;
+        struct ide_port_info d;
        u8 idx = id->driver_data;
        d = cmd64x_chipsets[idx];
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index aa98e817d38..0466462fd21 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -141,7 +141,7 @@ static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
                .pio_mask       = ATA_PIO4,                     \
        }
-static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
+static const struct ide_port_info cyrix_chipsets[] __devinitdata = {
        /* 0 */ DECLARE_CS_DEV("Cyrix 5510"),
        /* 1 */ DECLARE_CS_DEV("Cyrix 5520")
 };
@@ -154,9 +154,8 @@ static ide_pci_device_t cyrix_chipsets[] __devinitdata = {
 
 static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_hwif_t *hwif = NULL, *mate = NULL;
+        const struct ide_port_info *d = &cyrix_chipsets[id->driver_data];
-        ata_index_t index;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        ide_pci_device_t *d = &cyrix_chipsets[id->driver_data];
        ide_setup_pci_noise(dev, d);
@@ -172,29 +171,14 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic
                return -ENODEV;
        }
-        index.all = 0xf0f0;
        /*
         *      Now the chipset is configured we can let the core
         *      do all the device setup for us
         */
-        ide_pci_setup_ports(dev, d, 14, &index);
+        ide_pci_setup_ports(dev, d, 14, &idx[0]);
-        if ((index.b.low & 0xf0) != 0xf0)
-                hwif = &ide_hwifs[index.b.low];
-        if ((index.b.high & 0xf0) != 0xf0)
-                mate = &ide_hwifs[index.b.high];
-        if (hwif)
-                probe_hwif_init(hwif);
-        if (mate)
-                probe_hwif_init(mate);
-        if (hwif)
+        ide_device_add(idx);
-                ide_proc_register_port(hwif);
-        if (mate)
-                ide_proc_register_port(mate);
        return 0;
 }
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index ba0c6eba024..599408952bd 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/cs5530.c               Version 0.76    Aug 3 2007
+ * linux/drivers/ide/pci/cs5530.c               Version 0.77    Sep 24 2007
 *
 * Copyright (C) 2000                   Andre Hedrick <andre@linux-ide.org>
 * Copyright (C) 2000                   Mark Lord <mlord@pobox.com>
@@ -146,7 +146,6 @@ static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode)
 static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const char *name)
 {
        struct pci_dev *master_0 = NULL, *cs5530_0 = NULL;
-        unsigned long flags;
        if (pci_resource_start(dev, 4) == 0)
                return -EFAULT;
@@ -171,9 +170,6 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
                goto out;
        }
-        spin_lock_irqsave(&ide_lock, flags);
-                /* all CPUs (there should only be one CPU with this chipset) */
        /*
         * Enable BusMaster and MemoryWriteAndInvalidate for the cs5530:
         * -->  OR 0x14 into 16-bit PCI COMMAND reg of function 0 of the cs5530
@@ -224,8 +220,6 @@ static unsigned int __devinit init_chipset_cs5530 (struct pci_dev *dev, const ch
        pci_write_config_byte(master_0, 0x42, 0x00);
        pci_write_config_byte(master_0, 0x43, 0xc1);
-        spin_unlock_irqrestore(&ide_lock, flags);
 out:
        pci_dev_put(master_0);
        pci_dev_put(cs5530_0);
@@ -261,7 +255,7 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
        hwif->udma_filter = cs5530_udma_filter;
 }
-static ide_pci_device_t cs5530_chipset __devinitdata = {
+static const struct ide_port_info cs5530_chipset __devinitdata = {
        .name           = "CS5530",
        .init_chipset   = init_chipset_cs5530,
        .init_hwif      = init_hwif_cs5530,
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 5ac82ffa5c0..9094916e378 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -186,7 +186,7 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
        hwif->cbl = cs5535_cable_detect(hwif->pci_dev);
 }
-static ide_pci_device_t cs5535_chipset __devinitdata = {
+static const struct ide_port_info cs5535_chipset __devinitdata = {
        .name           = "CS5535",
        .init_hwif      = init_hwif_cs5535,
        .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE |
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index efc20bd97fd..3ef4fc10fe2 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -428,7 +428,6 @@ static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const c
 */
 static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif)
 {
-        hwif->chipset = ide_cy82c693;
        hwif->set_pio_mode = &cy82c693_set_pio_mode;
        if (hwif->dma_base == 0)
@@ -449,11 +448,12 @@ static void __devinit init_iops_cy82c693(ide_hwif_t *hwif)
        }
 }
-static ide_pci_device_t cy82c693_chipset __devinitdata = {
+static const struct ide_port_info cy82c693_chipset __devinitdata = {
        .name           = "CY82C693",
        .init_chipset   = init_chipset_cy82c693,
        .init_iops      = init_iops_cy82c693,
        .init_hwif      = init_hwif_cy82c693,
+        .chipset        = ide_cy82c693,
        .host_flags     = IDE_HFLAG_SINGLE | IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                          IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO4,
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index 46f4a888c03..83829081640 100644
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -80,7 +80,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
        hw.irq = dev->irq;
        hw.chipset = ide_pci;           /* this enables IRQ sharing */
-        rc = ide_register_hw_with_fixup(&hw, 0, &hwif, ide_undecoded_slave);
+        rc = ide_register_hw(&hw, &ide_undecoded_slave, 0, &hwif);
        if (rc < 0) {
                printk(KERN_ERR "delkin_cb: ide_register_hw failed (%d)\n", rc);
                pci_disable_device(dev);
diff --git a/drivers/ide/pci/generic.c b/drivers/ide/pci/generic.c
index 51165832e7f..f44d70852c3 100644
--- a/drivers/ide/pci/generic.c
+++ b/drivers/ide/pci/generic.c
@@ -54,37 +54,24 @@ __setup("all-generic-ide", ide_generic_all_on);
 module_param_named(all_generic_ide, ide_generic_all, bool, 0444);
 MODULE_PARM_DESC(all_generic_ide, "IDE generic will claim all unknown PCI IDE storage controllers.");
-static void __devinit init_hwif_generic (ide_hwif_t *hwif)
+#define IDE_HFLAGS_UMC (IDE_HFLAG_NO_DMA | IDE_HFLAG_FORCE_LEGACY_IRQS)
-{
-        switch(hwif->pci_dev->device) {
-                case PCI_DEVICE_ID_UMC_UM8673F:
-                case PCI_DEVICE_ID_UMC_UM8886A:
-                case PCI_DEVICE_ID_UMC_UM8886BF:
-                        hwif->irq = hwif->channel ? 15 : 14;
-                        break;
-                default:
-                        break;
-        }
-}
-#define DECLARE_GENERIC_PCI_DEV(name_str, dma_setting) \
+#define DECLARE_GENERIC_PCI_DEV(name_str, extra_flags) \
        { \
                .name           = name_str, \
-                .init_hwif      = init_hwif_generic, \
                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA | \
-                                  dma_setting | \
+                                  extra_flags | \
                                  IDE_HFLAG_BOOTABLE, \
                .swdma_mask     = ATA_SWDMA2, \
                .mwdma_mask     = ATA_MWDMA2, \
                .udma_mask      = ATA_UDMA6, \
        }
-static ide_pci_device_t generic_chipsets[] __devinitdata = {
+static const struct ide_port_info generic_chipsets[] __devinitdata = {
        /*  0 */ DECLARE_GENERIC_PCI_DEV("Unknown",     0),
        {       /* 1 */
                .name           = "NS87410",
-                .init_hwif      = init_hwif_generic,
                .enablebits     = {{0x43,0x08,0x08}, {0x47,0x08,0x08}},
                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                  IDE_HFLAG_BOOTABLE,
@@ -95,16 +82,15 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
        /*  2 */ DECLARE_GENERIC_PCI_DEV("SAMURAI",     0),
        /*  3 */ DECLARE_GENERIC_PCI_DEV("HT6565",      0),
-        /*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F",     IDE_HFLAG_NO_DMA),
+        /*  4 */ DECLARE_GENERIC_PCI_DEV("UM8673F",     IDE_HFLAGS_UMC),
-        /*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A",     IDE_HFLAG_NO_DMA),
+        /*  5 */ DECLARE_GENERIC_PCI_DEV("UM8886A",     IDE_HFLAGS_UMC),
-        /*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF",    IDE_HFLAG_NO_DMA),
+        /*  6 */ DECLARE_GENERIC_PCI_DEV("UM8886BF",    IDE_HFLAGS_UMC),
        /*  7 */ DECLARE_GENERIC_PCI_DEV("HINT_IDE",    0),
        /*  8 */ DECLARE_GENERIC_PCI_DEV("VIA_IDE",     IDE_HFLAG_NO_AUTODMA),
        /*  9 */ DECLARE_GENERIC_PCI_DEV("OPTI621V",    IDE_HFLAG_NO_AUTODMA),
        {       /* 10 */
                .name           = "VIA8237SATA",
-                .init_hwif      = init_hwif_generic,
                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                  IDE_HFLAG_OFF_BOARD,
                .swdma_mask     = ATA_SWDMA2,
@@ -118,7 +104,6 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
        {       /* 14 */
                .name           = "Revolution",
-                .init_hwif      = init_hwif_generic,
                .host_flags     = IDE_HFLAG_TRUST_BIOS_FOR_DMA |
                                  IDE_HFLAG_OFF_BOARD,
                .swdma_mask     = ATA_SWDMA2,
@@ -138,7 +123,7 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = {
 
 static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &generic_chipsets[id->driver_data];
+        const struct ide_port_info *d = &generic_chipsets[id->driver_data];
        int ret = -ENODEV;
        /* Don't use the generic entry unless instructed to do so */
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 67af1a7dde3..ae6307fae4f 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -129,7 +129,7 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif)
        hwif->set_dma_mode = &hpt34x_set_mode;
 }
-static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
+static const struct ide_port_info hpt34x_chipsets[] __devinitdata = {
        { /* 0 */
                .name           = "HPT343",
                .init_chipset   = init_chipset_hpt34x,
@@ -158,7 +158,7 @@ static ide_pci_device_t hpt34x_chipsets[] __devinitdata = {
 static int __devinit hpt34x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d;
+        const struct ide_port_info *d;
        u16 pcicmd = 0;
        pci_read_config_word(dev, PCI_COMMAND, &pcicmd);
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 18f5b7ddaee..612b795241b 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -1425,7 +1425,7 @@ static int __devinit hpt36x_init(struct pci_dev *dev, struct pci_dev *dev2)
        return 0;
 }
-static ide_pci_device_t hpt366_chipsets[] __devinitdata = {
+static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
        {       /* 0 */
                .name           = "HPT36x",
                .init_chipset   = init_chipset_hpt366,
@@ -1510,7 +1510,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
 {
        struct hpt_info *info = NULL;
        struct pci_dev *dev2 = NULL;
-        ide_pci_device_t d;
+        struct ide_port_info d;
        u8 idx = id->driver_data;
        u8 rev = dev->revision;
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index dfbe605120c..90b52ed37bf 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -193,7 +193,7 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
                .udma_mask      = ATA_UDMA6,            \
        }
-static ide_pci_device_t it8213_chipsets[] __devinitdata = {
+static const struct ide_port_info it8213_chipsets[] __devinitdata = {
        /* 0 */ DECLARE_ITE_DEV("IT8213"),
 };
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index ec45b724720..5c997543531 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -95,7 +95,7 @@ struct it821x_dev
 /*
 *      We allow users to force the card into non raid mode without
- *      flashing the alternative BIOS. This is also neccessary right now
+ *      flashing the alternative BIOS. This is also necessary right now
 *      for embedded platforms that cannot run a PC BIOS but are using this
 *      device.
 */
@@ -564,7 +564,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
        /*
         *      Not in the docs but according to the reference driver
-         *      this is neccessary.
+         *      this is necessary.
         */
        pci_read_config_byte(hwif->pci_dev, 0x08, &conf);
@@ -638,7 +638,7 @@ static unsigned int __devinit init_chipset_it821x(struct pci_dev *dev, const cha
                .pio_mask       = ATA_PIO4,             \
        }
-static ide_pci_device_t it821x_chipsets[] __devinitdata = {
+static const struct ide_port_info it821x_chipsets[] __devinitdata = {
        /* 0 */ DECLARE_ITE_DEV("IT8212"),
 };
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 2eeff670d9a..bdf64d99770 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -118,7 +118,7 @@ static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
                hwif->cbl = ata66_jmicron(hwif);
 }
-static ide_pci_device_t jmicron_chipset __devinitdata = {
+static const struct ide_port_info jmicron_chipset __devinitdata = {
        .name           = "JMB",
        .init_hwif      = init_hwif_jmicron,
        .host_flags     = IDE_HFLAG_BOOTABLE,
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index d21b5892382..d4df4642dbb 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -260,7 +260,7 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
        hwif->ide_dma_end = &ns87415_ide_dma_end;
 }
-static ide_pci_device_t ns87415_chipset __devinitdata = {
+static const struct ide_port_info ns87415_chipset __devinitdata = {
        .name           = "NS87415",
 #ifdef CONFIG_SUPERIO
        .init_iops      = init_iops_ns87415,
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 3573ffeaaa3..8953d9c3926 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/opti621.c             Version 0.8     Aug 27, 2007
+ *  linux/drivers/ide/pci/opti621.c             Version 0.9     Sep 24, 2007
 *
 *  Copyright (C) 1996-1998  Linus Torvalds & authors (see below)
 */
@@ -133,6 +133,8 @@ static int reg_base;
 #define PIO_NOT_EXIST 254
 #define PIO_DONT_KNOW 255
+static DEFINE_SPINLOCK(opti621_lock);
 /* there are stored pio numbers from other calls of opti621_set_pio_mode */
 static void compute_pios(ide_drive_t *drive, const u8 pio)
 /* Store values into drive->drive_data
@@ -278,7 +280,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
                second.recovery_time, drdy);
 #endif
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&opti621_lock, flags);
        reg_base = hwif->io_ports[IDE_DATA_OFFSET];
@@ -317,7 +319,7 @@ static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
        /*  and read prefetch for both drives */
        write_reg(misc, MISC_REG);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&opti621_lock, flags);
 }
 /*
@@ -331,7 +333,7 @@ static void __devinit init_hwif_opti621 (ide_hwif_t *hwif)
        hwif->set_pio_mode = &opti621_set_pio_mode;
 }
-static ide_pci_device_t opti621_chipsets[] __devinitdata = {
+static const struct ide_port_info opti621_chipsets[] __devinitdata = {
        {       /* 0 */
                .name           = "OPTI621",
                .init_hwif      = init_hwif_opti621,
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index d1e7823454f..4234efeba60 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -513,7 +513,7 @@ static struct pci_dev * __devinit pdc20270_get_dev2(struct pci_dev *dev)
                .udma_mask      = udma, \
        }
-static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
+static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
        /* 0 */ DECLARE_PDCNEW_DEV("PDC20268", ATA_UDMA5),
        /* 1 */ DECLARE_PDCNEW_DEV("PDC20269", ATA_UDMA6),
        /* 2 */ DECLARE_PDCNEW_DEV("PDC20270", ATA_UDMA5),
@@ -534,7 +534,7 @@ static ide_pci_device_t pdcnew_chipsets[] __devinitdata = {
 
 static int __devinit pdc202new_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d;
+        const struct ide_port_info *d;
        struct pci_dev *bridge = dev->bus->self;
        u8 idx = id->driver_data;
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 29306121dc4..e09742e2ba5 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -302,13 +302,6 @@ static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,
 static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 {
-        struct pci_dev *dev = hwif->pci_dev;
-        /* PDC20265 has problems with large LBA48 requests */
-        if ((dev->device == PCI_DEVICE_ID_PROMISE_20267) ||
-            (dev->device == PCI_DEVICE_ID_PROMISE_20265))
-                hwif->rqsize = 256;
        hwif->set_pio_mode = &pdc202xx_set_pio_mode;
        hwif->set_dma_mode = &pdc202xx_set_mode;
@@ -382,7 +375,7 @@ static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev,
        }
 }
-#define DECLARE_PDC2026X_DEV(name_str, udma) \
+#define DECLARE_PDC2026X_DEV(name_str, udma, extra_flags) \
        { \
                .name           = name_str, \
                .init_chipset   = init_chipset_pdc202xx, \
@@ -390,13 +383,14 @@ static void __devinit pdc202ata4_fixup_irq(struct pci_dev *dev,
                .init_dma       = init_dma_pdc202xx, \
                .extra          = 48, \
                .host_flags     = IDE_HFLAG_ERROR_STOPS_FIFO | \
+                                  extra_flags | \
                                  IDE_HFLAG_OFF_BOARD, \
                .pio_mask       = ATA_PIO4, \
                .mwdma_mask     = ATA_MWDMA2, \
                .udma_mask      = udma, \
        }
-static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
+static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
        {       /* 0 */
                .name           = "PDC20246",
                .init_chipset   = init_chipset_pdc202xx,
@@ -410,10 +404,10 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
                .udma_mask      = ATA_UDMA2,
        },
-        /* 1 */ DECLARE_PDC2026X_DEV("PDC20262", ATA_UDMA4),
+        /* 1 */ DECLARE_PDC2026X_DEV("PDC20262", ATA_UDMA4, 0),
-        /* 2 */ DECLARE_PDC2026X_DEV("PDC20263", ATA_UDMA4),
+        /* 2 */ DECLARE_PDC2026X_DEV("PDC20263", ATA_UDMA4, 0),
-        /* 3 */ DECLARE_PDC2026X_DEV("PDC20265", ATA_UDMA5),
+        /* 3 */ DECLARE_PDC2026X_DEV("PDC20265", ATA_UDMA5, IDE_HFLAG_RQSIZE_256),
-        /* 4 */ DECLARE_PDC2026X_DEV("PDC20267", ATA_UDMA5),
+        /* 4 */ DECLARE_PDC2026X_DEV("PDC20267", ATA_UDMA5, IDE_HFLAG_RQSIZE_256),
 };
 /**
@@ -427,7 +421,7 @@ static ide_pci_device_t pdc202xx_chipsets[] __devinitdata = {
 
 static int __devinit pdc202xx_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d;
+        const struct ide_port_info *d;
        u8 idx = id->driver_data;
        d = &pdc202xx_chipsets[idx];
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index ec0c6e96a21..9329d4a810e 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -396,7 +396,7 @@ static void __devinit init_hwif_ich(ide_hwif_t *hwif)
                .udma_mask      = udma, \
        }
-static ide_pci_device_t piix_pci_info[] __devinitdata = {
+static const struct ide_port_info piix_pci_info[] __devinitdata = {
        /*  0 */ DECLARE_PIIX_DEV("PIIXa",      0x00),  /* no udma */
        /*  1 */ DECLARE_PIIX_DEV("PIIXb",      0x00),  /* no udma */
@@ -449,9 +449,7 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = {
 
 static int __devinit piix_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &piix_pci_info[id->driver_data];
+        return ide_setup_pci_device(dev, &piix_pci_info[id->driver_data]);
-        return ide_setup_pci_device(dev, d);
 }
 /**
diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index dd2583ef1ad..6b10ae260fa 100644
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -35,13 +35,13 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
        u16 reg;
        struct pci_dev *dev = hwif->pci_dev;
-        hwif->chipset = ide_rz1000;
        if (!pci_read_config_word (dev, 0x40, &reg) &&
            !pci_write_config_word(dev, 0x40, reg & 0xdfff)) {
                printk(KERN_INFO "%s: disabled chipset read-ahead "
                        "(buggy RZ1000/RZ1001)\n", hwif->name);
        } else {
-                hwif->serialized = 1;
+                if (hwif->mate)
+                        hwif->mate->serialized = hwif->serialized = 1;
                hwif->drives[0].no_unmask = 1;
                hwif->drives[1].no_unmask = 1;
                printk(KERN_INFO "%s: serialized, disabled unmasking "
@@ -49,9 +49,10 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
        }
 }
-static ide_pci_device_t rz1000_chipset __devinitdata = {
+static const struct ide_port_info rz1000_chipset __devinitdata = {
        .name           = "RZ100x",
        .init_hwif      = init_hwif_rz1000,
+        .chipset        = ide_rz1000,
        .host_flags     = IDE_HFLAG_NO_DMA | IDE_HFLAG_BOOTABLE,
 };
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index b2423e03bf3..d2c8b5524f2 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -372,7 +372,7 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
        hwif->ide_dma_end   = &sc1200_ide_dma_end;
 }
-static ide_pci_device_t sc1200_chipset __devinitdata = {
+static const struct ide_port_info sc1200_chipset __devinitdata = {
        .name           = "SC1200",
        .init_hwif      = init_hwif_sc1200,
        .host_flags     = IDE_HFLAG_SERIALIZE |
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index ae9b50331d2..ebb7132b9b8 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -538,12 +538,13 @@ static int setup_mmio_scc (struct pci_dev *dev, const char *name)
 /**
 *      init_setup_scc  -       set up an SCC PATA Controller
 *      @dev: PCI device
- *      @d: IDE PCI device
+ *      @d: IDE port info
 *
 *      Perform the initial set up for this device.
 */
-static int __devinit init_setup_scc(struct pci_dev *dev, ide_pci_device_t *d)
+static int __devinit init_setup_scc(struct pci_dev *dev,
+                                    const struct ide_port_info *d)
 {
        unsigned long ctl_base;
        unsigned long dma_base;
@@ -702,7 +703,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
      .pio_mask         = ATA_PIO4,                     \
  }
-static ide_pci_device_t scc_chipsets[] __devinitdata = {
+static const struct ide_port_info scc_chipsets[] __devinitdata = {
        /* 0 */ DECLARE_SCC_DEV("sccIDE"),
 };
@@ -717,9 +718,7 @@ static ide_pci_device_t scc_chipsets[] __devinitdata = {
 static int __devinit scc_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t *d = &scc_chipsets[id->driver_data];
+        return init_setup_scc(dev, &scc_chipsets[id->driver_data]);
-        return init_setup_scc(dev, d);
 }
 /**
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index a3d880e21d0..a7280311357 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -158,13 +158,6 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed)
        u8 ultra_enable  = 0, ultra_timing = 0, dma_timing = 0;
-        /* If we are about to put a disk into UDMA mode we screwed up.
-           Our code assumes we never _ever_ do this on an OSB4 */
-           
-        if(dev->device == PCI_DEVICE_ID_SERVERWORKS_OSB4 &&
-                drive->media == ide_disk && speed >= XFER_UDMA_0)
-                        BUG();
        pci_read_config_byte(dev, (0x56|hwif->channel), &ultra_timing);
        pci_read_config_byte(dev, 0x54, &ultra_enable);
@@ -373,7 +366,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
        }
 }
-static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
+static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
        {       /* 0 */
                .name           = "SvrWks OSB4",
                .init_chipset   = init_chipset_svwks,
@@ -430,7 +423,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = {
 
 static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        ide_pci_device_t d;
+        struct ide_port_info d;
        u8 idx = id->driver_data;
        d = serverworks_chipsets[idx];
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 5af74ea1d46..de820aa58cd 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -614,6 +614,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
        void __iomem *virt_base;
        ide_hwif_t *hwif;
        int h;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        /*
         * Find an empty HWIF; if none available, return -ENOMEM.
@@ -654,10 +655,12 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
        }
        if (hwif->io_ports[IDE_DATA_OFFSET] != cmd_base) {
+                hw_regs_t hw;
                /* Initialize the IO registers */
-                sgiioc4_init_hwif_ports(&hwif->hw, cmd_base, ctl, irqport);
+                memset(&hw, 0, sizeof(hw));
-                memcpy(hwif->io_ports, hwif->hw.io_ports,
+                sgiioc4_init_hwif_ports(&hw, cmd_base, ctl, irqport);
-                       sizeof (hwif->io_ports));
+                memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
                hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
        }
@@ -679,11 +682,10 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
        ide_init_sgiioc4(hwif);
-        if (probe_hwif_init(hwif))
+        idx[0] = hwif->index;
-                return -EIO;
-        /* Create /proc/ide entries */
+        if (ide_device_add(idx))
-        ide_proc_register_port(hwif);
+                return -EIO;
        return 0;
 }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 689786df1ed..6d99441c605 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -1,5 +1,5 @@
 /*
- * linux/drivers/ide/pci/siimage.c              Version 1.17    Oct 18 2007
+ * linux/drivers/ide/pci/siimage.c              Version 1.18    Oct 18 2007
 *
 * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
 * Copyright (C) 2003           Red Hat <alan@redhat.com>
@@ -26,7 +26,7 @@
 *
 *      If you have strange problems with nVidia chipset systems please
 *      see the SI support documentation and update your system BIOS
- *      if neccessary
+ *      if necessary
 *
 *  The Dell DRAC4 has some interesting features including effectively hot
 *  unplugging/replugging the virtual CD interface when the DRAC is reset.
@@ -57,8 +57,8 @@
 
 static int pdev_is_sata(struct pci_dev *pdev)
 {
-        switch(pdev->device)
+#ifdef CONFIG_BLK_DEV_IDE_SATA
-        {
+        switch(pdev->device) {
                case PCI_DEVICE_ID_SII_3112:
                case PCI_DEVICE_ID_SII_1210SA:
                        return 1;
@@ -66,9 +66,10 @@ static int pdev_is_sata(struct pci_dev *pdev)
                        return 0;
        }
        BUG();
+#endif
        return 0;
 }
- 
 /**
 *      is_sata                 -       check if hwif is SATA
 *      @hwif:  interface to check
@@ -136,7 +137,7 @@ static inline unsigned long siimage_seldev(ide_drive_t *drive, int r)
 *      SI3112 SATA controller life is a bit simpler.
 */
-static u8 sil_udma_filter(ide_drive_t *drive)
+static u8 sil_pata_udma_filter(ide_drive_t *drive)
 {
        ide_hwif_t *hwif = drive->hwif;
        unsigned long base = (unsigned long) hwif->hwif_data;
@@ -147,23 +148,23 @@ static u8 sil_udma_filter(ide_drive_t *drive)
        else
                pci_read_config_byte(hwif->pci_dev, 0x8A, &scsc);
-        if (is_sata(hwif)) {
-                mask = strstr(drive->id->model, "Maxtor") ? 0x3f : 0x7f;
-                goto out;
-        }
        if ((scsc & 0x30) == 0x10)      /* 133 */
-                mask = 0x7f;
+                mask = ATA_UDMA6;
        else if ((scsc & 0x30) == 0x20) /* 2xPCI */
-                mask = 0x7f;
+                mask = ATA_UDMA6;
        else if ((scsc & 0x30) == 0x00) /* 100 */
-                mask = 0x3f;
+                mask = ATA_UDMA5;
        else    /* Disabled ? */
                BUG();
-out:
        return mask;
 }
+static u8 sil_sata_udma_filter(ide_drive_t *drive)
+{
+        return strstr(drive->id->model, "Maxtor") ? ATA_UDMA5 : ATA_UDMA6;
+}
 /**
 *      sil_set_pio_mode        -       set host controller for PIO mode
 *      @drive: drive
@@ -340,10 +341,11 @@ static int siimage_io_ide_dma_test_irq (ide_drive_t *drive)
 static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
 {
        ide_hwif_t *hwif        = HWIF(drive);
-        unsigned long base      = (unsigned long)hwif->hwif_data;
        unsigned long addr      = siimage_selreg(hwif, 0x1);
        if (SATA_ERROR_REG) {
+                unsigned long base = (unsigned long)hwif->hwif_data;
                u32 ext_stat = readl((void __iomem *)(base + 0x10));
                u8 watchdog = 0;
                if (ext_stat & ((hwif->channel) ? 0x40 : 0x10)) {
@@ -376,7 +378,7 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
 }
 /**
- *      siimage_busproc         -       bus isolation ioctl
+ *      sil_sata_busproc        -       bus isolation IOCTL
 *      @drive: drive to isolate/restore
 *      @state: bus state to set
 *
@@ -384,8 +386,8 @@ static int siimage_mmio_ide_dma_test_irq (ide_drive_t *drive)
 *      SATA controller the work required is quite limited, we 
 *      just have to clean up the statistics
 */
- 
-static int siimage_busproc (ide_drive_t * drive, int state)
+static int sil_sata_busproc(ide_drive_t * drive, int state)
 {
        ide_hwif_t *hwif        = HWIF(drive);
        u32 stat_config         = 0;
@@ -417,14 +419,14 @@ static int siimage_busproc (ide_drive_t * drive, int state)
 }
 /**
- *      siimage_reset_poll      -       wait for sata reset
+ *      sil_sata_reset_poll     -       wait for SATA reset
 *      @drive: drive we are resetting
 *
 *      Poll the SATA phy and see whether it has come back from the dead
 *      yet.
 */
- 
-static int siimage_reset_poll (ide_drive_t *drive)
+static int sil_sata_reset_poll(ide_drive_t *drive)
 {
        if (SATA_STATUS_REG) {
                ide_hwif_t *hwif        = HWIF(drive);
@@ -436,27 +438,22 @@ static int siimage_reset_poll (ide_drive_t *drive)
                        HWGROUP(drive)->polling = 0;
                        return ide_started;
                }
-                return 0;
-        } else {
-                return 0;
        }
+        return 0;
 }
 /**
- *      siimage_pre_reset       -       reset hook
+ *      sil_sata_pre_reset      -       reset hook
 *      @drive: IDE device being reset
 *
 *      For the SATA devices we need to handle recalibration/geometry
 *      differently
 */
- 
-static void siimage_pre_reset (ide_drive_t *drive)
-{
-        if (drive->media != ide_disk)
-                return;
-        if (is_sata(HWIF(drive)))
+static void sil_sata_pre_reset(ide_drive_t *drive)
-        {
+{
+        if (drive->media == ide_disk) {
                drive->special.b.set_geometry = 0;
                drive->special.b.recalibrate = 0;
        }
@@ -502,7 +499,6 @@ static void siimage_reset (ide_drive_t *drive)
                        drive->failures++;
                }
        }
 }
 /**
@@ -758,16 +754,11 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
                hwif->sata_misc[SATA_IEN_OFFSET]        = base + 0x148;
        }
-        hw.irq                          = hwif->pci_dev->irq;
+        memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
-        memcpy(&hwif->hw, &hw, sizeof(hw));
+        hwif->irq = dev->irq;
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->hw.io_ports));
-        hwif->irq                       = hw.irq;
+        hwif->dma_base = (unsigned long)addr + (ch ? 0x08 : 0x00);
-        base = (unsigned long) addr;
-        hwif->dma_base                  = base + (ch ? 0x08 : 0x00);
        hwif->mmio = 1;
 }
@@ -864,28 +855,31 @@ static u8 __devinit ata66_siimage(ide_hwif_t *hwif)
 static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
 {
+        u8 sata = is_sata(hwif);
        hwif->resetproc = &siimage_reset;
        hwif->set_pio_mode = &sil_set_pio_mode;
        hwif->set_dma_mode = &sil_set_dma_mode;
-        hwif->reset_poll = &siimage_reset_poll;
-        hwif->pre_reset = &siimage_pre_reset;
-        hwif->udma_filter = &sil_udma_filter;
-        if(is_sata(hwif)) {
+        if (sata) {
                static int first = 1;
-                hwif->busproc   = &siimage_busproc;
+                hwif->busproc = &sil_sata_busproc;
+                hwif->reset_poll = &sil_sata_reset_poll;
+                hwif->pre_reset = &sil_sata_pre_reset;
+                hwif->udma_filter = &sil_sata_udma_filter;
                if (first) {
                        printk(KERN_INFO "siimage: For full SATA support you should use the libata sata_sil module.\n");
                        first = 0;
                }
-        }
+        } else
+                hwif->udma_filter = &sil_pata_udma_filter;
        if (hwif->dma_base == 0)
                return;
-        if (is_sata(hwif))
+        if (sata)
                hwif->host_flags |= IDE_HFLAG_NO_ATAPI_DMA;
        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
@@ -911,7 +905,7 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
                .udma_mask      = ATA_UDMA6,            \
        }
-static ide_pci_device_t siimage_chipsets[] __devinitdata = {
+static const struct ide_port_info siimage_chipsets[] __devinitdata = {
        /* 0 */ DECLARE_SII_DEV("SiI680"),
        /* 1 */ DECLARE_SII_DEV("SiI3112 Serial ATA"),
        /* 2 */ DECLARE_SII_DEV("Adaptec AAR-1210SA")
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index c1d280b0639..6b7bb53acef 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -264,7 +264,7 @@ static void sis_ata133_program_timings(ide_drive_t *drive, const u8 mode)
        if (mode >= XFER_MW_DMA_0) {
                t1 &= ~0x04;    /* disable UDMA */
                idx = mode - XFER_MW_DMA_0 + 5;
-        }
+        } else
                idx = mode - XFER_PIO_0;
        t1 |= ini_time_value[clk][idx] << 12;
        t1 |= act_time_value[clk][idx] << 16;
@@ -579,7 +579,7 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
                hwif->cbl = ata66_sis5513(hwif);
 }
-static ide_pci_device_t sis5513_chipset __devinitdata = {
+static const struct ide_port_info sis5513_chipset __devinitdata = {
        .name           = "SIS5513",
        .init_chipset   = init_chipset_sis5513,
        .init_hwif      = init_hwif_sis5513,
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 0dce459b126..147d783f752 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -361,13 +361,6 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
        hwif->selectproc        = &sl82c105_selectproc;
        hwif->resetproc         = &sl82c105_resetproc;
-        /*
-         * We support 32-bit I/O on this interface, and
-         * it doesn't have problems with interrupts.
-         */
-        hwif->drives[0].io_32bit = hwif->drives[1].io_32bit = 1;
-        hwif->drives[0].unmask   = hwif->drives[1].unmask   = 1;
        if (!hwif->dma_base)
                return;
@@ -394,12 +387,15 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
                hwif->serialized = hwif->mate->serialized = 1;
 }
-static ide_pci_device_t sl82c105_chipset __devinitdata = {
+static const struct ide_port_info sl82c105_chipset __devinitdata = {
        .name           = "W82C105",
        .init_chipset   = init_chipset_sl82c105,
        .init_hwif      = init_hwif_sl82c105,
        .enablebits     = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
-        .host_flags     = IDE_HFLAG_NO_AUTODMA | IDE_HFLAG_BOOTABLE,
+        .host_flags     = IDE_HFLAG_IO_32BIT |
+                          IDE_HFLAG_UNMASK_IRQS |
+                          IDE_HFLAG_NO_AUTODMA |
+                          IDE_HFLAG_BOOTABLE,
        .pio_mask       = ATA_PIO5,
 };
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 4f22dffdf8e..eb4445b229e 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -1,5 +1,5 @@
 /*
- *  linux/drivers/ide/pci/slc90e66.c    Version 0.18    Aug 9, 2007
+ *  linux/drivers/ide/pci/slc90e66.c    Version 0.19    Sep 24, 2007
 *
 *  Copyright (C) 2000-2002 Andre Hedrick <andre@linux-ide.org>
 *  Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
@@ -21,6 +21,8 @@
 #include <asm/io.h>
+static DEFINE_SPINLOCK(slc90e66_lock);
 static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
        ide_hwif_t *hwif        = HWIF(drive);
@@ -40,7 +42,7 @@ static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
                                        { 2, 1 },
                                        { 2, 3 }, };
-        spin_lock_irqsave(&ide_lock, flags);
+        spin_lock_irqsave(&slc90e66_lock, flags);
        pci_read_config_word(dev, master_port, &master_data);
        if (pio > 1)
@@ -71,7 +73,7 @@ static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
        pci_write_config_word(dev, master_port, master_data);
        if (is_slave)
                pci_write_config_byte(dev, slave_port, slave_data);
-        spin_unlock_irqrestore(&ide_lock, flags);
+        spin_unlock_irqrestore(&slc90e66_lock, flags);
 }
 static void slc90e66_set_dma_mode(ide_drive_t *drive, const u8 speed)
@@ -146,7 +148,7 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
                hwif->cbl = (reg47 & mask) ? ATA_CBL_PATA40 : ATA_CBL_PATA80;
 }
-static ide_pci_device_t slc90e66_chipset __devinitdata = {
+static const struct ide_port_info slc90e66_chipset __devinitdata = {
        .name           = "SLC90E66",
        .init_hwif      = init_hwif_slc90e66,
        .enablebits     = {{0x41,0x80,0x80}, {0x43,0x80,0x80}},
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 631506e9b5d..a66ebd14664 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -218,7 +218,7 @@ static unsigned int __devinit init_chipset_tc86c001(struct pci_dev *dev,
        return err;
 }
-static ide_pci_device_t tc86c001_chipset __devinitdata = {
+static const struct ide_port_info tc86c001_chipset __devinitdata = {
        .name           = "TC86C001",
        .init_chipset   = init_chipset_tc86c001,
        .init_hwif      = init_hwif_tc86c001,
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 30b52f62699..a227c41d23a 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -102,7 +102,7 @@ static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
        hwif->set_dma_mode = &triflex_set_mode;
 }
-static ide_pci_device_t triflex_device __devinitdata = {
+static const struct ide_port_info triflex_device __devinitdata = {
        .name           = "TRIFLEX",
        .init_hwif      = init_hwif_triflex,
        .enablebits     = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
diff --git a/drivers/ide/pci/trm290.c b/drivers/ide/pci/trm290.c
index 140d486f623..5011ba22e36 100644
--- a/drivers/ide/pci/trm290.c
+++ b/drivers/ide/pci/trm290.c
@@ -250,7 +250,6 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
        u8 reg = 0;
        struct pci_dev *dev = hwif->pci_dev;
-        hwif->chipset = ide_trm290;
        cfgbase = pci_resource_start(dev, 4);
        if ((dev->class & 5) && cfgbase) {
                hwif->config_data = cfgbase;
@@ -320,9 +319,10 @@ static void __devinit init_hwif_trm290(ide_hwif_t *hwif)
 #endif
 }
-static ide_pci_device_t trm290_chipset __devinitdata = {
+static const struct ide_port_info trm290_chipset __devinitdata = {
        .name           = "TRM290",
        .init_hwif      = init_hwif_trm290,
+        .chipset        = ide_trm290,
        .host_flags     = IDE_HFLAG_NO_ATAPI_DMA |
 #if 0 /* play it safe for now */
                          IDE_HFLAG_TRUST_BIOS_FOR_DMA |
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index c8022a92a0e..a0d3c16b68e 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -1,6 +1,6 @@
 /*
 *
- * Version 3.49
+ * Version 3.50
 *
 * VIA IDE driver for Linux. Supported southbridges:
 *
@@ -422,65 +422,40 @@ static u8 __devinit via82cxxx_cable_detect(ide_hwif_t *hwif)
 static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
 {
-        struct via82cxxx_dev *vdev = pci_get_drvdata(hwif->pci_dev);
-        int i;
        hwif->set_pio_mode = &via_set_pio_mode;
        hwif->set_dma_mode = &via_set_drive;
-#ifdef CONFIG_PPC_CHRP
-        if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
-                hwif->irq = hwif->channel ? 15 : 14;
-        }
-#endif
-        for (i = 0; i < 2; i++) {
-                hwif->drives[i].io_32bit = 1;
-                hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;
-        }
        if (!hwif->dma_base)
                return;
-        hwif->ultra_mask = vdev->via_config->udma_mask;
        if (hwif->cbl != ATA_CBL_PATA40_SHORT)
                hwif->cbl = via82cxxx_cable_detect(hwif);
 }
-static ide_pci_device_t via82cxxx_chipsets[] __devinitdata = {
+static const struct ide_port_info via82cxxx_chipset __devinitdata = {
-        {       /* 0 */
+        .name           = "VP_IDE",
-                .name           = "VP_IDE",
+        .init_chipset   = init_chipset_via82cxxx,
-                .init_chipset   = init_chipset_via82cxxx,
+        .init_hwif      = init_hwif_via82cxxx,
-                .init_hwif      = init_hwif_via82cxxx,
+        .enablebits     = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
-                .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}},
+        .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
+                          IDE_HFLAG_PIO_NO_DOWNGRADE |
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |
+                          IDE_HFLAG_POST_SET_MODE |
-                                  IDE_HFLAG_POST_SET_MODE |
+                          IDE_HFLAG_IO_32BIT |
-                                  IDE_HFLAG_NO_AUTODMA |
+                          IDE_HFLAG_BOOTABLE,
-                                  IDE_HFLAG_BOOTABLE,
+        .pio_mask       = ATA_PIO5,
-                .pio_mask       = ATA_PIO5,
+        .swdma_mask     = ATA_SWDMA2,
-                .swdma_mask     = ATA_SWDMA2,
+        .mwdma_mask     = ATA_MWDMA2,
-                .mwdma_mask     = ATA_MWDMA2,
-        },{     /* 1 */
-                .name           = "VP_IDE",
-                .init_chipset   = init_chipset_via82cxxx,
-                .init_hwif      = init_hwif_via82cxxx,
-                .enablebits     = {{0x00,0x00,0x00}, {0x00,0x00,0x00}},
-                .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST |
-                                  IDE_HFLAG_PIO_NO_DOWNGRADE |
-                                  IDE_HFLAG_POST_SET_MODE |
-                                  IDE_HFLAG_BOOTABLE,
-                .pio_mask       = ATA_PIO5,
-                .swdma_mask     = ATA_SWDMA2,
-                .mwdma_mask     = ATA_MWDMA2,
-        }
 };
 static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
        struct pci_dev *isa = NULL;
        struct via_isa_bridge *via_config;
+        u8 idx = id->driver_data;
+        struct ide_port_info d;
+        d = via82cxxx_chipset;
        /*
         * Find the ISA bridge and check we know what it is.
         */
@@ -490,7 +465,23 @@ static int __devinit via_init_one(struct pci_dev *dev, const struct pci_device_i
                printk(KERN_WARNING "VP_IDE: Unknown VIA SouthBridge, disabling DMA.\n");
                return -ENODEV;
        }
-        return ide_setup_pci_device(dev, &via82cxxx_chipsets[id->driver_data]);
+        if (idx == 0)
+                d.host_flags |= IDE_HFLAG_NO_AUTODMA;
+        else
+                d.enablebits[1].reg = d.enablebits[0].reg = 0;
+        if ((via_config->flags & VIA_NO_UNMASK) == 0)
+                d.host_flags |= IDE_HFLAG_UNMASK_IRQS;
+#ifdef CONFIG_PPC_CHRP
+        if (machine_is(chrp) && _chrp_type == _CHRP_Pegasos)
+                d.host_flags |= IDE_HFLAG_FORCE_LEGACY_IRQS;
+#endif
+        d.udma_mask = via_config->udma_mask;
+        return ide_setup_pci_device(dev, &d);
 }
 static const struct pci_device_id via_pci_tbl[] = {
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index df2e92034f5..5f0da35ab5a 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -316,8 +316,8 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
        ide_hwifs[data_port].pio_mask = ATA_PIO4;
        ide_hwifs[data_port].set_pio_mode = m8xx_ide_set_pio_mode;
+        ide_hwifs[data_port].ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;
-        hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;
        /* Enable Harddisk Interrupt,
         * and make it edge sensitive
         */
@@ -402,8 +402,8 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
        ide_hwifs[data_port].pio_mask = ATA_PIO4;
        ide_hwifs[data_port].set_pio_mode = m8xx_ide_set_pio_mode;
+        ide_hwifs[data_port].ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;
-        hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;
        /* Enable Harddisk Interrupt,
         * and make it edge sensitive
         */
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index c5547935676..816b5311dad 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1039,6 +1039,8 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
 {
        struct device_node *np = pmif->node;
        const int *bidp;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+        hw_regs_t hw;
        pmif->cable_80 = 0;
        pmif->broken_dma = pmif->broken_dma_warn = 0;
@@ -1124,8 +1126,9 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
        /* Tell common code _not_ to mess with resources */
        hwif->mmio = 1;
        hwif->hwif_data = pmif;
-        pmac_ide_init_hwif_ports(&hwif->hw, pmif->regbase, 0, &hwif->irq);
+        memset(&hw, 0, sizeof(hw));
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
+        pmac_ide_init_hwif_ports(&hw, pmif->regbase, 0, &hwif->irq);
+        memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
        hwif->chipset = ide_pmac;
        hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET] || pmif->mediabay;
        hwif->hold = pmif->mediabay;
@@ -1163,10 +1166,9 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
                pmac_ide_setup_dma(pmif, hwif);
 #endif /* CONFIG_BLK_DEV_IDEDMA_PMAC */
-        /* We probe the hwif now */
+        idx[0] = hwif->index;
-        probe_hwif_init(hwif);
-        ide_proc_register_port(hwif);
+        ide_device_add(idx);
        return 0;
 }
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index fff567bcedb..02d14bf85ab 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -147,15 +147,15 @@ static int ide_setup_pci_baseregs (struct pci_dev *dev, const char *name)
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 /**
 *      ide_get_or_set_dma_base         -       setup BMIBA
- *      @d: IDE pci device data
+ *      @d: IDE port info
- *      @hwif: Interface
+ *      @hwif: IDE interface
 *
 *      Fetch the DMA Bus-Master-I/O-Base-Address (BMIBA) from PCI space.
 *      Where a device has a partner that is already in DMA mode we check
 *      and enforce IDE simplex rules.
 */
-static unsigned long ide_get_or_set_dma_base(ide_pci_device_t *d, ide_hwif_t *hwif)
+static unsigned long ide_get_or_set_dma_base(const struct ide_port_info *d, ide_hwif_t *hwif)
 {
        unsigned long   dma_base = 0;
        struct pci_dev  *dev = hwif->pci_dev;
@@ -225,10 +225,11 @@ static unsigned long ide_get_or_set_dma_base(ide_pci_device_t *d, ide_hwif_t *hw
 }
 #endif /* CONFIG_BLK_DEV_IDEDMA_PCI */
-void ide_setup_pci_noise (struct pci_dev *dev, ide_pci_device_t *d)
+void ide_setup_pci_noise(struct pci_dev *dev, const struct ide_port_info *d)
 {
-        printk(KERN_INFO "%s: IDE controller at PCI slot %s\n",
+        printk(KERN_INFO "%s: IDE controller (0x%04x:0x%04x rev 0x%02x) at "
-                         d->name, pci_name(dev));
+                         " PCI slot %s\n", d->name, dev->vendor, dev->device,
+                         dev->revision, pci_name(dev));
 }
 EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
@@ -237,15 +238,15 @@ EXPORT_SYMBOL_GPL(ide_setup_pci_noise);
 /**
 *      ide_pci_enable  -       do PCI enables
 *      @dev: PCI device
- *      @d: IDE pci device data
+ *      @d: IDE port info
 *
 *      Enable the IDE PCI device. We attempt to enable the device in full
 *      but if that fails then we only need BAR4 so we will enable that.
 *      
 *      Returns zero on success or an error code
 */
- 
-static int ide_pci_enable(struct pci_dev *dev, ide_pci_device_t *d)
+static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
 {
        int ret;
@@ -260,9 +261,9 @@ static int ide_pci_enable(struct pci_dev *dev, ide_pci_device_t *d)
        }
        /*
-         * assume all devices can do 32-bit dma for now. we can add a
+         * assume all devices can do 32-bit DMA for now, we can add
-         * dma mask field to the ide_pci_device_t if we need it (or let
+         * a DMA mask field to the struct ide_port_info if we need it
-         * lower level driver set the dma mask)
+         * (or let lower level driver set the DMA mask)
         */
        ret = pci_set_dma_mask(dev, DMA_32BIT_MASK);
        if (ret < 0) {
@@ -284,13 +285,13 @@ out:
 /**
 *      ide_pci_configure       -       configure an unconfigured device
 *      @dev: PCI device
- *      @d: IDE pci device data
+ *      @d: IDE port info
 *
 *      Enable and configure the PCI device we have been passed.
 *      Returns zero on success or an error code.
 */
- 
-static int ide_pci_configure(struct pci_dev *dev, ide_pci_device_t *d)
+static int ide_pci_configure(struct pci_dev *dev, const struct ide_port_info *d)
 {
        u16 pcicmd = 0;
        /*
@@ -318,15 +319,15 @@ static int ide_pci_configure(struct pci_dev *dev, ide_pci_device_t *d)
 /**
 *      ide_pci_check_iomem     -       check a register is I/O
- *      @dev: pci device
+ *      @dev: PCI device
- *      @d: ide_pci_device
+ *      @d: IDE port info
- *      @bar: bar number
+ *      @bar: BAR number
 *
 *      Checks if a BAR is configured and points to MMIO space. If so
 *      print an error and return an error code. Otherwise return 0
 */
- 
-static int ide_pci_check_iomem(struct pci_dev *dev, ide_pci_device_t *d, int bar)
+static int ide_pci_check_iomem(struct pci_dev *dev, const struct ide_port_info *d, int bar)
 {
        ulong flags = pci_resource_flags(dev, bar);
        
@@ -348,7 +349,7 @@ static int ide_pci_check_iomem(struct pci_dev *dev, ide_pci_device_t *d, int bar
 /**
 *      ide_hwif_configure      -       configure an IDE interface
 *      @dev: PCI device holding interface
- *      @d: IDE pci data
+ *      @d: IDE port info
 *      @mate: Paired interface if any
 *
 *      Perform the initial set up for the hardware interface structure. This
@@ -357,8 +358,8 @@ static int ide_pci_check_iomem(struct pci_dev *dev, ide_pci_device_t *d, int bar
 *
 *      Returns the new hardware interface structure, or NULL on a failure
 */
- 
-static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *mate, int port, int irq)
+static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, const struct ide_port_info *d, ide_hwif_t *mate, int port, int irq)
 {
        unsigned long ctl = 0, base = 0;
        ide_hwif_t *hwif;
@@ -387,19 +388,20 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
                return NULL;    /* no room in ide_hwifs[] */
        if (hwif->io_ports[IDE_DATA_OFFSET] != base ||
            hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) {
-                memset(&hwif->hw, 0, sizeof(hwif->hw));
+                hw_regs_t hw;
-#ifndef IDE_ARCH_OBSOLETE_INIT
-                ide_std_init_ports(&hwif->hw, base, (ctl | 2));
+                memset(&hw, 0, sizeof(hw));
-                hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0;
+#ifndef CONFIG_IDE_ARCH_OBSOLETE_INIT
+                ide_std_init_ports(&hw, base, ctl | 2);
 #else
-                ide_init_hwif_ports(&hwif->hw, base, (ctl | 2), NULL);
+                ide_init_hwif_ports(&hw, base, ctl | 2, NULL);
 #endif
-                memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
+                memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
                hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
        }
-        hwif->chipset = ide_pci;
+        hwif->chipset = d->chipset ? d->chipset : ide_pci;
        hwif->pci_dev = dev;
-        hwif->cds = (struct ide_pci_device_s *) d;
+        hwif->cds = d;
        hwif->channel = port;
        if (!hwif->irq)
@@ -414,21 +416,17 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d,
 /**
 *      ide_hwif_setup_dma      -       configure DMA interface
 *      @dev: PCI device
- *      @d: IDE pci data
+ *      @d: IDE port info
- *      @hwif: Hardware interface we are configuring
+ *      @hwif: IDE interface
 *
 *      Set up the DMA base for the interface. Enable the master bits as
 *      necessary and attempt to bring the device DMA into a ready to use
 *      state
 */
- 
-#ifndef CONFIG_BLK_DEV_IDEDMA_PCI
+static void ide_hwif_setup_dma(struct pci_dev *dev, const struct ide_port_info *d, ide_hwif_t *hwif)
-static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif)
-{
-}
-#else
-static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwif_t *hwif)
 {
+#ifdef CONFIG_BLK_DEV_IDEDMA_PCI
        u16 pcicmd;
        pci_read_config_word(dev, PCI_COMMAND, &pcicmd);
@@ -460,13 +458,13 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi
                                "(BIOS)\n", hwif->name, d->name);
                }
        }
-}
 #endif /* CONFIG_BLK_DEV_IDEDMA_PCI*/
+}
 /**
 *      ide_setup_pci_controller        -       set up IDE PCI
 *      @dev: PCI device
- *      @d: IDE PCI data
+ *      @d: IDE port info
 *      @noisy: verbose flag
 *      @config: returned as 1 if we configured the hardware
 *
@@ -474,8 +472,8 @@ static void ide_hwif_setup_dma(struct pci_dev *dev, ide_pci_device_t *d, ide_hwi
 *      up the PCI side of the device, checks that the device is enabled
 *      and enables it if need be
 */
- 
-static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, int noisy, int *config)
+static int ide_setup_pci_controller(struct pci_dev *dev, const struct ide_port_info *d, int noisy, int *config)
 {
        int ret;
        u16 pcicmd;
@@ -500,9 +498,6 @@ static int ide_setup_pci_controller(struct pci_dev *dev, ide_pci_device_t *d, in
                printk(KERN_INFO "%s: device enabled (Linux)\n", d->name);
        }
-        if (noisy)
-                printk(KERN_INFO "%s: chipset revision %d\n",
-                                 d->name, dev->revision);
 out:
        return ret;
 }
@@ -510,9 +505,9 @@ out:
 /**
 *      ide_pci_setup_ports     -       configure ports/devices on PCI IDE
 *      @dev: PCI device
- *      @d: IDE pci device info
+ *      @d: IDE port info
 *      @pciirq: IRQ line
- *      @index: ata index to update
+ *      @idx: ATA index table to update
 *
 *      Scan the interfaces attached to this device and do any
 *      necessary per port setup. Attach the devices and ask the
@@ -522,26 +517,25 @@ out:
 *      but is also used directly as a helper function by some controllers
 *      where the chipset setup is not the default PCI IDE one.
 */
- 
-void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, ata_index_t *index)
+void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d, int pciirq, u8 *idx)
 {
        int channels = (d->host_flags & IDE_HFLAG_SINGLE) ? 1 : 2, port;
-        int at_least_one_hwif_enabled = 0;
        ide_hwif_t *hwif, *mate = NULL;
        u8 tmp;
-        index->all = 0xf0f0;
        /*
         * Set up the IDE ports
         */
-         
        for (port = 0; port < channels; ++port) {
-                ide_pci_enablebit_t *e = &(d->enablebits[port]);
+                const ide_pci_enablebit_t *e = &(d->enablebits[port]);
-        
                if (e->reg && (pci_read_config_byte(dev, e->reg, &tmp) ||
-                    (tmp & e->mask) != e->val))
+                    (tmp & e->mask) != e->val)) {
+                        printk(KERN_INFO "%s: IDE port disabled\n", d->name);
                        continue;       /* port not enabled */
+                }
                if ((hwif = ide_hwif_configure(dev, d, mate, port, pciirq)) == NULL)
                        continue;
@@ -549,11 +543,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                /* setup proper ancestral information */
                hwif->gendev.parent = &dev->dev;
-                if (hwif->channel) {
+                *(idx + port) = hwif->index;
-                        index->b.high = hwif->index;
-                } else {
-                        index->b.low = hwif->index;
-                }
                
                if (d->init_iops)
@@ -562,15 +552,28 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                if ((d->host_flags & IDE_HFLAG_NO_DMA) == 0)
                        ide_hwif_setup_dma(dev, d, hwif);
-                if ((d->host_flags & IDE_HFLAG_LEGACY_IRQS) && hwif->irq == 0)
+                if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
+                    (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
                        hwif->irq = port ? 15 : 14;
+                hwif->fixup = d->fixup;
                hwif->host_flags = d->host_flags;
                hwif->pio_mask = d->pio_mask;
                if ((d->host_flags & IDE_HFLAG_SERIALIZE) && hwif->mate)
                        hwif->mate->serialized = hwif->serialized = 1;
+                if (d->host_flags & IDE_HFLAG_IO_32BIT) {
+                        hwif->drives[0].io_32bit = 1;
+                        hwif->drives[1].io_32bit = 1;
+                }
+                if (d->host_flags & IDE_HFLAG_UNMASK_IRQS) {
+                        hwif->drives[0].unmask = 1;
+                        hwif->drives[1].unmask = 1;
+                }
                if (hwif->dma_base) {
                        hwif->swdma_mask = d->swdma_mask;
                        hwif->mwdma_mask = d->mwdma_mask;
@@ -580,6 +583,9 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                hwif->drives[0].autotune = 1;
                hwif->drives[1].autotune = 1;
+                if (d->host_flags & IDE_HFLAG_RQSIZE_256)
+                        hwif->rqsize = 256;
                if (d->init_hwif)
                        /* Call chipset-specific routine
                         * for each enabled hwif
@@ -587,10 +593,7 @@ void ide_pci_setup_ports(struct pci_dev *dev, ide_pci_device_t *d, int pciirq, a
                        d->init_hwif(hwif);
                mate = hwif;
-                at_least_one_hwif_enabled = 1;
        }
-        if (!at_least_one_hwif_enabled)
-                printk(KERN_INFO "%s: neither IDE port enabled (BIOS)\n", d->name);
 }
 EXPORT_SYMBOL_GPL(ide_pci_setup_ports);
@@ -602,13 +605,13 @@ EXPORT_SYMBOL_GPL(ide_pci_setup_ports);
 *
 * One thing that is not standardized is the location of the
 * primary/secondary interface "enable/disable" bits.  For chipsets that
- * we "know" about, this information is in the ide_pci_device_t struct;
+ * we "know" about, this information is in the struct ide_port_info;
 * for all other chipsets, we just assume both interfaces are enabled.
 */
-static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d,
+static int do_ide_setup_pci_device(struct pci_dev *dev,
-                                   ata_index_t *index, u8 noisy)
+                                   const struct ide_port_info *d,
+                                   u8 *idx, u8 noisy)
 {
-        static ata_index_t ata_index = { .b = { .low = 0xff, .high = 0xff } };
        int tried_config = 0;
        int pciirq, ret;
@@ -658,51 +661,35 @@ static int do_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d,
        /* FIXME: silent failure can happen */
-        *index = ata_index;
+        ide_pci_setup_ports(dev, d, pciirq, idx);
-        ide_pci_setup_ports(dev, d, pciirq, index);
 out:
        return ret;
 }
-int ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t *d)
+int ide_setup_pci_device(struct pci_dev *dev, const struct ide_port_info *d)
 {
-        ide_hwif_t *hwif = NULL, *mate = NULL;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        ata_index_t index_list;
        int ret;
-        ret = do_ide_setup_pci_device(dev, d, &index_list, 1);
+        ret = do_ide_setup_pci_device(dev, d, &idx[0], 1);
-        if (ret < 0)
-                goto out;
-        if ((index_list.b.low & 0xf0) != 0xf0)
+        if (ret >= 0)
-                hwif = &ide_hwifs[index_list.b.low];
+                ide_device_add(idx);
-        if ((index_list.b.high & 0xf0) != 0xf0)
-                mate = &ide_hwifs[index_list.b.high];
-        if (hwif)
-                probe_hwif_init_with_fixup(hwif, d->fixup);
-        if (mate)
-                probe_hwif_init_with_fixup(mate, d->fixup);
-        if (hwif)
-                ide_proc_register_port(hwif);
-        if (mate)
-                ide_proc_register_port(mate);
-out:
        return ret;
 }
 EXPORT_SYMBOL_GPL(ide_setup_pci_device);
 int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2,
-                          ide_pci_device_t *d)
+                          const struct ide_port_info *d)
 {
        struct pci_dev *pdev[] = { dev1, dev2 };
-        ata_index_t index_list[2];
        int ret, i;
+        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
        for (i = 0; i < 2; i++) {
-                ret = do_ide_setup_pci_device(pdev[i], d, index_list + i, !i);
+                ret = do_ide_setup_pci_device(pdev[i], d, &idx[i*2], !i);
                /*
                 * FIXME: Mom, mom, they stole me the helper function to undo
                 * do_ide_setup_pci_device() on the first device!
@@ -711,25 +698,7 @@ int ide_setup_pci_devices(struct pci_dev *dev1, struct pci_dev *dev2,
                        goto out;
        }
-        for (i = 0; i < 2; i++) {
+        ide_device_add(idx);
-                u8 idx[2] = { index_list[i].b.low, index_list[i].b.high };
-                int j;
-                for (j = 0; j < 2; j++) {
-                        if ((idx[j] & 0xf0) != 0xf0)
-                                probe_hwif_init(ide_hwifs + idx[j]);
-                }
-        }
-        for (i = 0; i < 2; i++) {
-                u8 idx[2] = { index_list[i].b.low, index_list[i].b.high };
-                int j;
-                for (j = 0; j < 2; j++) {
-                        if ((idx[j] & 0xf0) != 0xf0)
-                                ide_proc_register_port(ide_hwifs + idx[j]);
-                }
-        }
 out:
        return ret;
 }
@@ -754,9 +723,6 @@ static LIST_HEAD(ide_pci_drivers);
 *      hands the controllers off to the core PCI code to do the rest of
 *      the work.
 *
- *      The driver_data of the driver table must point to an ide_pci_device_t
- *      describing the interface.
- *
 *      Returns are the same as for pci_register_driver
 */
diff --git a/drivers/input/fixp-arith.h b/drivers/input/fixp-arith.h
index ed3d2da0c48..3089d738232 100644
--- a/drivers/input/fixp-arith.h
+++ b/drivers/input/fixp-arith.h
@@ -24,7 +24,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 *
 * Should you need to contact me, the author, you can do so by
- * e-mail - mail your message to <deneux@ifrance.com>
+ * e-mail - mail your message to <johann.deneux@gmail.com>
 */
 #include <linux/types.h>
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index ec1b6cfefcd..bfc6061f155 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -136,7 +136,8 @@ static int gameport_measure_speed(struct gameport *gameport)
        }
        gameport_close(gameport);
-        return (cpu_data[raw_smp_processor_id()].loops_per_jiffy * (unsigned long)HZ / (1000 / 50)) / (tx < 1 ? 1 : tx);
+        return (cpu_data(raw_smp_processor_id()).loops_per_jiffy *
+                (unsigned long)HZ / (1000 / 50)) / (tx < 1 ? 1 : tx);
 #else
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 27fc475bd3a..a6ca9d5e252 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -4,7 +4,7 @@
 *  Copyright (c) 1999-2001 Vojtech Pavlik
 *
 *  Based on the work of:
- *      Andree Borrmann         Mats Sj�vall
+ *      Andree Borrmann         Mats Sjövall
 */
 /*
diff --git a/drivers/input/joystick/iforce/Makefile b/drivers/input/joystick/iforce/Makefile
index 17ae42bf9ff..74daff49ab6 100644
--- a/drivers/input/joystick/iforce/Makefile
+++ b/drivers/input/joystick/iforce/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the I-Force driver
 #
-# By Johann Deneux <deneux@ifrance.com>
+# By Johann Deneux <johann.deneux@gmail.com>
 #
 # Goal definition
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 76f1969552c..babc913d549 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -4,7 +4,7 @@
 * OMAP Keypad Driver
 *
 * Copyright (C) 2003 Nokia Corporation
- * Written by Timo Ter�s <ext-timo.teras@nokia.com>
+ * Written by Timo Teräs <ext-timo.teras@nokia.com>
 *
 * Added support for H2 & H3 Keypad
 * Copyright (C) 2004 Texas Instruments
@@ -481,6 +481,6 @@ static void __exit omap_kp_exit(void)
 module_init(omap_kp_init);
 module_exit(omap_kp_exit);
-MODULE_AUTHOR("Timo Ter�s");
+MODULE_AUTHOR("Timo Teräs");
 MODULE_DESCRIPTION("OMAP Keypad Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7acc6351bb4..8f5c7b90187 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -70,9 +70,9 @@ config INPUT_WISTRON_BTNS
        select LEDS_CLASS
        select CHECK_SIGNATURE
        help
-          Say Y here for support of Winstron laptop button interface, used on
+          Say Y here for support of Wistron laptop button interfaces, used on
          laptops of various brands, including Acer and Fujitsu-Siemens. If
-          available, mail and wifi leds will be controlable via /sys/class/leds.
+          available, mail and wifi LEDs will be controllable via /sys/class/leds.
          To compile this driver as a module, choose M here: the module will
          be called wistron_btns.
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index da316d13d7f..21a9c0b69a1 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -906,7 +906,7 @@ static void psmouse_activate(struct psmouse *psmouse)
 /*
 * psmouse_deactivate() puts the mouse into poll mode so that we don't get motion
- * reports from it unless we explicitely request it.
+ * reports from it unless we explicitly request it.
 */
 static void psmouse_deactivate(struct psmouse *psmouse)
diff --git a/drivers/input/mouse/vsxxxaa.c b/drivers/input/mouse/vsxxxaa.c
index 4a321576f34..404eedd5ffa 100644
--- a/drivers/input/mouse/vsxxxaa.c
+++ b/drivers/input/mouse/vsxxxaa.c
@@ -330,7 +330,7 @@ vsxxxaa_handle_POR_packet (struct vsxxxaa *mouse)
        /*
         * Check for Power-On-Reset packets. These are sent out
-         * after plugging the mouse in, or when explicitely
+         * after plugging the mouse in, or when explicitly
         * requested by sending 'T'.
         *
         * [0]: 1       0       1       0       R3      R2      R1      R0
diff --git a/drivers/isdn/act2000/act2000_isa.c b/drivers/isdn/act2000/act2000_isa.c
index 09ea50dd345..819ea85576a 100644
--- a/drivers/isdn/act2000/act2000_isa.c
+++ b/drivers/isdn/act2000/act2000_isa.c
@@ -126,7 +126,7 @@ act2000_isa_enable_irq(act2000_card * card)
 /*
 * Install interrupt handler, enable irq on card.
- * If irq is -1, choose next free irq, else irq is given explicitely.
+ * If irq is -1, choose next free irq, else irq is given explicitly.
 */
 int
 act2000_isa_config_irq(act2000_card * card, short irq)
diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c
index 82edc1c1db7..4d425c644d4 100644
--- a/drivers/isdn/hardware/eicon/capifunc.c
+++ b/drivers/isdn/hardware/eicon/capifunc.c
@@ -321,7 +321,7 @@ void sendf(APPL * appl, word command, dword Id, word Number, byte * format, ...)
                                  DBG_BLK((((char *)(long)GET_DWORD(&msg.info.data_b3_ind.Data)) + i,
                                        ((dlength - i) < 256) ? (dlength - i) : 256))
                                  if (!(myDriverDebugHandle.dbgMask & DL_PRV0))
-                                          break; /* not more if not explicitely requested */
+                                          break; /* not more if not explicitly requested */
                                }
                        }
                        break;
@@ -965,7 +965,7 @@ static u16 diva_send_message(struct capi_ctr *ctrl,
                                        ((GET_WORD(&msg->info.data_b3_req.Data_Length) - j) <
                                          256) ? (GET_WORD(&msg->info.data_b3_req.Data_Length) - j) : 256))
                                if (!(myDriverDebugHandle.dbgMask & DL_PRV0))
-                                        break;  /* not more if not explicitely requested */
+                                        break;  /* not more if not explicitly requested */
                        }
                }
 #endif
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c
index 3b19caeba25..c0d7036404a 100644
--- a/drivers/isdn/hisax/amd7930_fn.c
+++ b/drivers/isdn/hisax/amd7930_fn.c
@@ -767,7 +767,7 @@ Amd7930_init(struct IsdnCardState *cs)
                /* read */
                if (*ptr++ >= 0x100) {
                        if (cmd < 8)
-                                /* setzt Register zur�ck */
+                                /* reset register */
                                rByteAMD(cs, cmd);
                        else {
                                wByteAMD(cs, 0x00, cmd);
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
index b73027ff50e..39f421ed8de 100644
--- a/drivers/isdn/hisax/enternow_pci.c
+++ b/drivers/isdn/hisax/enternow_pci.c
@@ -75,16 +75,16 @@
 static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $";
-/* f�r PowerISDN PCI */
+/* for PowerISDN PCI */
 #define TJ_AMD_IRQ                                              0x20
 #define TJ_LED1                                                 0x40
 #define TJ_LED2                                                 0x80
-/* Das Fenster zum AMD...
+/* The window to [the] AMD [chip]...
- * Ab Adresse hw.njet.base + TJ_AMD_PORT werden vom AMD jeweils 8 Bit in
+ * From address hw.njet.base + TJ_AMD_PORT onwards, the AMD
- * den TigerJet i/o-Raum gemappt
+ * maps [consecutive/multiple] 8 bits into the TigerJet I/O space
- * -> 0x01 des AMD bei hw.njet.base + 0C4 */
+ * -> 0x01 of the AMD at hw.njet.base + 0C4 */
 #define TJ_AMD_PORT                                             0xC0
@@ -96,11 +96,11 @@ static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $";
 static unsigned char
 ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset)
 {
-        /* direktes Register */
+        /* direct register */
        if(offset < 8)
                return (inb(cs->hw.njet.isac + 4*offset));
-        /* indirektes Register */
+        /* indirect register */
        else {
                outb(offset, cs->hw.njet.isac + 4*AMD_CR);
                return(inb(cs->hw.njet.isac + 4*AMD_DR));
@@ -111,11 +111,11 @@ ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset)
 static void
 WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value)
 {
-        /* direktes Register */
+        /* direct register */
        if(offset < 8)
                outb(value, cs->hw.njet.isac + 4*offset);
-        /* indirektes Register */
+        /* indirect register */
        else {
                outb(offset, cs->hw.njet.isac + 4*AMD_CR);
                outb(value, cs->hw.njet.isac + 4*AMD_DR);
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 077080aca79..fba8b624ffc 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1,6 +1,6 @@
 /* $Id: hfc_pci.c,v 1.48.2.4 2004/02/11 13:21:33 keil Exp $
 *
- * low level driver for CCD�s hfc-pci based cards
+ * low level driver for CCD's hfc-pci based cards
 *
 * Author       Werner Cornelius
 *              based on existing driver for CCD hfc ISA cards
diff --git a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/hisax/isdnhdlc.c
index 268dced6c34..c69a77a8006 100644
--- a/drivers/isdn/hisax/isdnhdlc.c
+++ b/drivers/isdn/hisax/isdnhdlc.c
@@ -1,7 +1,7 @@
 /*
 * isdnhdlc.c  --  General purpose ISDN HDLC decoder.
 *
- *Copyright (C) 2002    Wolfgang M�es      <wolfgang@iksw-muees.de>
+ *Copyright (C) 2002    Wolfgang Mües      <wolfgang@iksw-muees.de>
 *              2001    Frode Isaksen      <fisaksen@bewan.com>
 *              2001    Kai Germaschewski  <kai.germaschewski@gmx.de>
 *
@@ -27,7 +27,7 @@
 /*-------------------------------------------------------------------*/
-MODULE_AUTHOR("Wolfgang M�es <wolfgang@iksw-muees.de>, "
+MODULE_AUTHOR("Wolfgang Mües <wolfgang@iksw-muees.de>, "
              "Frode Isaksen <fisaksen@bewan.com>, "
              "Kai Germaschewski <kai.germaschewski@gmx.de>");
 MODULE_DESCRIPTION("General purpose ISDN HDLC decoder");
diff --git a/drivers/isdn/hisax/isdnhdlc.h b/drivers/isdn/hisax/isdnhdlc.h
index 45167d2f8fb..cf0a95a2401 100644
--- a/drivers/isdn/hisax/isdnhdlc.h
+++ b/drivers/isdn/hisax/isdnhdlc.h
@@ -5,7 +5,7 @@
 * Neccessary because some ISDN devices don't have HDLC
 * controllers. Also included: a bit reversal table.
 *
- *Copyright (C) 2002    Wolfgang M�es      <wolfgang@iksw-muees.de>
+ *Copyright (C) 2002    Wolfgang Mües      <wolfgang@iksw-muees.de>
 *              2001    Frode Isaksen      <fisaksen@bewan.com>
 *              2001    Kai Germaschewski  <kai.germaschewski@gmx.de>
 *
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
index 43d61d1bc5b..70840a710ac 100644
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -304,7 +304,7 @@ initjade(struct IsdnCardState *cs)
        cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR,  0x00);
        /* Setup host access to hdlc controller */
        jade_write_indirect(cs, jade_HDLCCNTRACCESS, (jadeINDIRECT_HAH1|jadeINDIRECT_HAH2));
-        /* Unmask HDLC int (don�t forget DSP int later on)*/
+        /* Unmask HDLC int (don't forget DSP int later on)*/
        cs->BC_Write_Reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2));
        /* once again TRANSPARENT */    
diff --git a/drivers/isdn/pcbit/capi.c b/drivers/isdn/pcbit/capi.c
index 7b55e151f1b..ac5a91ccde8 100644
--- a/drivers/isdn/pcbit/capi.c
+++ b/drivers/isdn/pcbit/capi.c
@@ -15,9 +15,9 @@
 /*
 *        Documentation:
- *        - "Common ISDN API - Perfil Portugu�s - Vers�o 2.1",
+ *        - "Common ISDN API - Perfil Português - Versão 2.1",
 *           Telecom Portugal, Fev 1992.
- *        - "Common ISDN API - Especifica��o de protocolos para 
+ *        - "Common ISDN API - Especificação de protocolos para
 *           acesso aos canais B", Inesc, Jan 1994.
 */
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c
index 50914439d86..0fd64075129 100644
--- a/drivers/leds/leds-s3c24xx.c
+++ b/drivers/leds/leds-s3c24xx.c
@@ -43,7 +43,7 @@ static void s3c24xx_led_set(struct led_classdev *led_cdev,
        struct s3c24xx_gpio_led *led = to_gpio(led_cdev);
        struct s3c24xx_led_platdata *pd = led->pdata;
-        /* there will be a sort delay between setting the output and
+        /* there will be a short delay between setting the output and
         * going from output to input when using tristate. */
        s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index c803d2bba65..48d647abea4 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -563,7 +563,7 @@ static void media_bay_step(int i)
                                ide_init_hwif_ports(&hw, (unsigned long) bay->cd_base, (unsigned long) 0, NULL);
                                hw.irq = bay->cd_irq;
                                hw.chipset = ide_pmac;
-                                bay->cd_index = ide_register_hw(&hw, 0, NULL);
+                                bay->cd_index = ide_register_hw(&hw, NULL, 0, NULL);
                                pmu_resume();
                        }
                        if (bay->cd_index == -1) {
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index f7c509b7a8e..dc741d3a453 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -1521,7 +1521,7 @@ pmu_sr_intr(void)
                        req = current_req;
                        /* 
                         * For PMU sleep and freq change requests, we lock the
-                         * PMU until it's explicitely unlocked. This avoids any
+                         * PMU until it's explicitly unlocked. This avoids any
                         * spurrious event polling getting in
                         */
                        current_req = req->next;
diff --git a/drivers/md/Kconfig b/drivers/md/Kconfig
index 34a8c60a254..9b6fbf044fd 100644
--- a/drivers/md/Kconfig
+++ b/drivers/md/Kconfig
@@ -267,6 +267,12 @@ config DM_MULTIPATH_RDAC
        ---help---
          Multipath support for LSI/Engenio RDAC.
+config DM_MULTIPATH_HP
+        tristate "HP MSA multipath support (EXPERIMENTAL)"
+        depends on DM_MULTIPATH && BLK_DEV_DM && EXPERIMENTAL
+        ---help---
+          Multipath support for HP MSA (Active/Passive) series hardware.
 config DM_DELAY
        tristate "I/O delaying target (EXPERIMENTAL)"
        depends on BLK_DEV_DM && EXPERIMENTAL
@@ -276,4 +282,10 @@ config DM_DELAY
        If unsure, say N.
+config DM_UEVENT
+        bool "DM uevents (EXPERIMENTAL)"
+        depends on BLK_DEV_DM && EXPERIMENTAL
+        ---help---
+        Generate udev events for DM events.
 endif # MD
diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index c49366cdc05..d9aa7edb878 100644
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -8,6 +8,7 @@ dm-multipath-objs := dm-hw-handler.o dm-path-selector.o dm-mpath.o
 dm-snapshot-objs := dm-snap.o dm-exception-store.o
 dm-mirror-objs  := dm-log.o dm-raid1.o
 dm-rdac-objs    := dm-mpath-rdac.o
+dm-hp-sw-objs   := dm-mpath-hp-sw.o
 md-mod-objs     := md.o bitmap.o
 raid456-objs    := raid5.o raid6algos.o raid6recov.o raid6tables.o \
                   raid6int1.o raid6int2.o raid6int4.o \
@@ -35,6 +36,7 @@ obj-$(CONFIG_DM_CRYPT)		+= dm-crypt.o
 obj-$(CONFIG_DM_DELAY)          += dm-delay.o
 obj-$(CONFIG_DM_MULTIPATH)      += dm-multipath.o dm-round-robin.o
 obj-$(CONFIG_DM_MULTIPATH_EMC)  += dm-emc.o
+obj-$(CONFIG_DM_MULTIPATH_HP)   += dm-hp-sw.o
 obj-$(CONFIG_DM_MULTIPATH_RDAC) += dm-rdac.o
 obj-$(CONFIG_DM_SNAPSHOT)       += dm-snapshot.o
 obj-$(CONFIG_DM_MIRROR)         += dm-mirror.o
@@ -48,6 +50,10 @@ ifeq ($(CONFIG_ALTIVEC),y)
 altivec_flags := -maltivec -mabi=altivec
 endif
+ifeq ($(CONFIG_DM_UEVENT),y)
+dm-mod-objs                     += dm-uevent.o
+endif
 targets += raid6int1.c
 $(obj)/raid6int1.c:   UNROLL := 1
 $(obj)/raid6int1.c:   $(src)/raid6int.uc $(src)/unroll.pl FORCE
diff --git a/drivers/md/dm-bio-list.h b/drivers/md/dm-bio-list.h
index 3f7b827649e..d4509be0fe6 100644
--- a/drivers/md/dm-bio-list.h
+++ b/drivers/md/dm-bio-list.h
@@ -21,11 +21,6 @@ static inline int bio_list_empty(const struct bio_list *bl)
        return bl->head == NULL;
 }
-#define BIO_LIST_INIT { .head = NULL, .tail = NULL }
-#define BIO_LIST(bl) \
-        struct bio_list bl = BIO_LIST_INIT
 static inline void bio_list_init(struct bio_list *bl)
 {
        bl->head = bl->tail = NULL;
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index 64fee90bb68..0eb5416798b 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -36,7 +36,6 @@ struct dm_crypt_io {
        struct work_struct work;
        atomic_t pending;
        int error;
-        int post_process;
 };
 /*
@@ -57,7 +56,7 @@ struct crypt_config;
 struct crypt_iv_operations {
        int (*ctr)(struct crypt_config *cc, struct dm_target *ti,
-                   const char *opts);
+                   const char *opts);
        void (*dtr)(struct crypt_config *cc);
        const char *(*status)(struct crypt_config *cc);
        int (*generator)(struct crypt_config *cc, u8 *iv, sector_t sector);
@@ -80,6 +79,8 @@ struct crypt_config {
        mempool_t *page_pool;
        struct bio_set *bs;
+        struct workqueue_struct *io_queue;
+        struct workqueue_struct *crypt_queue;
        /*
         * crypto related data
         */
@@ -112,7 +113,7 @@ static void clone_init(struct dm_crypt_io *, struct bio *);
 * Different IV generation algorithms:
 *
 * plain: the initial vector is the 32-bit little-endian version of the sector
- *        number, padded with zeros if neccessary.
+ *        number, padded with zeros if necessary.
 *
 * essiv: "encrypted sector|salt initial vector", the sector number is
 *        encrypted with the bulk cipher using a salt as key. The salt
@@ -137,7 +138,7 @@ static int crypt_iv_plain_gen(struct crypt_config *cc, u8 *iv, sector_t sector)
 }
 static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
-                              const char *opts)
+                              const char *opts)
 {
        struct crypto_cipher *essiv_tfm;
        struct crypto_hash *hash_tfm;
@@ -175,6 +176,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
        if (err) {
                ti->error = "Error calculating hash in ESSIV";
+                kfree(salt);
                return err;
        }
@@ -188,7 +190,7 @@ static int crypt_iv_essiv_ctr(struct crypt_config *cc, struct dm_target *ti,
        if (crypto_cipher_blocksize(essiv_tfm) !=
            crypto_blkcipher_ivsize(cc->tfm)) {
                ti->error = "Block size of ESSIV cipher does "
-                                "not match IV size of block cipher";
+                            "not match IV size of block cipher";
                crypto_free_cipher(essiv_tfm);
                kfree(salt);
                return -EINVAL;
@@ -319,10 +321,10 @@ crypt_convert_scatterlist(struct crypt_config *cc, struct scatterlist *out,
        return r;
 }
-static void
+static void crypt_convert_init(struct crypt_config *cc,
-crypt_convert_init(struct crypt_config *cc, struct convert_context *ctx,
+                               struct convert_context *ctx,
-                   struct bio *bio_out, struct bio *bio_in,
+                               struct bio *bio_out, struct bio *bio_in,
-                   sector_t sector, int write)
+                               sector_t sector, int write)
 {
        ctx->bio_in = bio_in;
        ctx->bio_out = bio_out;
@@ -338,7 +340,7 @@ crypt_convert_init(struct crypt_config *cc, struct convert_context *ctx,
 * Encrypt / decrypt data from one bio to another one (can be the same one)
 */
 static int crypt_convert(struct crypt_config *cc,
-                         struct convert_context *ctx)
+                         struct convert_context *ctx)
 {
        int r = 0;
@@ -370,7 +372,7 @@ static int crypt_convert(struct crypt_config *cc,
                }
                r = crypt_convert_scatterlist(cc, &sg_out, &sg_in, sg_in.length,
-                                              ctx->write, ctx->sector);
+                                              ctx->write, ctx->sector);
                if (r < 0)
                        break;
@@ -380,13 +382,13 @@ static int crypt_convert(struct crypt_config *cc,
        return r;
 }
- static void dm_crypt_bio_destructor(struct bio *bio)
+static void dm_crypt_bio_destructor(struct bio *bio)
- {
+{
        struct dm_crypt_io *io = bio->bi_private;
        struct crypt_config *cc = io->target->private;
        bio_free(bio, cc->bs);
- }
+}
 /*
 * Generate a new unfragmented bio with the given size
@@ -458,7 +460,7 @@ static void crypt_free_buffer_pages(struct crypt_config *cc, struct bio *clone)
 * One of the bios was finished. Check for completion of
 * the whole request and correctly clean up the buffer.
 */
-static void dec_pending(struct dm_crypt_io *io, int error)
+static void crypt_dec_pending(struct dm_crypt_io *io, int error)
 {
        struct crypt_config *cc = (struct crypt_config *) io->target->private;
@@ -474,18 +476,36 @@ static void dec_pending(struct dm_crypt_io *io, int error)
 }
 /*
- * kcryptd:
+ * kcryptd/kcryptd_io:
 *
 * Needed because it would be very unwise to do decryption in an
 * interrupt context.
+ *
+ * kcryptd performs the actual encryption or decryption.
+ *
+ * kcryptd_io performs the IO submission.
+ *
+ * They must be separated as otherwise the final stages could be
+ * starved by new requests which can block in the first stages due
+ * to memory allocation.
 */
-static struct workqueue_struct *_kcryptd_workqueue;
 static void kcryptd_do_work(struct work_struct *work);
+static void kcryptd_do_crypt(struct work_struct *work);
 static void kcryptd_queue_io(struct dm_crypt_io *io)
 {
+        struct crypt_config *cc = io->target->private;
        INIT_WORK(&io->work, kcryptd_do_work);
-        queue_work(_kcryptd_workqueue, &io->work);
+        queue_work(cc->io_queue, &io->work);
+}
+static void kcryptd_queue_crypt(struct dm_crypt_io *io)
+{
+        struct crypt_config *cc = io->target->private;
+        INIT_WORK(&io->work, kcryptd_do_crypt);
+        queue_work(cc->crypt_queue, &io->work);
 }
 static void crypt_endio(struct bio *clone, int error)
@@ -508,13 +528,12 @@ static void crypt_endio(struct bio *clone, int error)
        }
        bio_put(clone);
-        io->post_process = 1;
+        kcryptd_queue_crypt(io);
-        kcryptd_queue_io(io);
        return;
 out:
        bio_put(clone);
-        dec_pending(io, error);
+        crypt_dec_pending(io, error);
 }
 static void clone_init(struct dm_crypt_io *io, struct bio *clone)
@@ -544,7 +563,7 @@ static void process_read(struct dm_crypt_io *io)
         */
        clone = bio_alloc_bioset(GFP_NOIO, bio_segments(base_bio), cc->bs);
        if (unlikely(!clone)) {
-                dec_pending(io, -ENOMEM);
+                crypt_dec_pending(io, -ENOMEM);
                return;
        }
@@ -579,7 +598,7 @@ static void process_write(struct dm_crypt_io *io)
        while (remaining) {
                clone = crypt_alloc_buffer(io, remaining);
                if (unlikely(!clone)) {
-                        dec_pending(io, -ENOMEM);
+                        crypt_dec_pending(io, -ENOMEM);
                        return;
                }
@@ -589,7 +608,7 @@ static void process_write(struct dm_crypt_io *io)
                if (unlikely(crypt_convert(cc, &ctx) < 0)) {
                        crypt_free_buffer_pages(cc, clone);
                        bio_put(clone);
-                        dec_pending(io, -EIO);
+                        crypt_dec_pending(io, -EIO);
                        return;
                }
@@ -624,17 +643,23 @@ static void process_read_endio(struct dm_crypt_io *io)
        crypt_convert_init(cc, &ctx, io->base_bio, io->base_bio,
                           io->base_bio->bi_sector - io->target->begin, 0);
-        dec_pending(io, crypt_convert(cc, &ctx));
+        crypt_dec_pending(io, crypt_convert(cc, &ctx));
 }
 static void kcryptd_do_work(struct work_struct *work)
 {
        struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work);
-        if (io->post_process)
+        if (bio_data_dir(io->base_bio) == READ)
-                process_read_endio(io);
-        else if (bio_data_dir(io->base_bio) == READ)
                process_read(io);
+}
+static void kcryptd_do_crypt(struct work_struct *work)
+{
+        struct dm_crypt_io *io = container_of(work, struct dm_crypt_io, work);
+        if (bio_data_dir(io->base_bio) == READ)
+                process_read_endio(io);
        else
                process_write(io);
 }
@@ -690,7 +715,7 @@ static int crypt_set_key(struct crypt_config *cc, char *key)
        cc->key_size = key_size; /* initial settings */
        if ((!key_size && strcmp(key, "-")) ||
-            (key_size && crypt_decode_key(cc->key, key, key_size) < 0))
+           (key_size && crypt_decode_key(cc->key, key, key_size) < 0))
                return -EINVAL;
        set_bit(DM_CRYPT_KEY_VALID, &cc->flags);
@@ -746,7 +771,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        if (crypt_set_key(cc, argv[1])) {
                ti->error = "Error decoding key";
-                goto bad1;
+                goto bad_cipher;
        }
        /* Compatiblity mode for old dm-crypt cipher strings */
@@ -757,19 +782,19 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        if (strcmp(chainmode, "ecb") && !ivmode) {
                ti->error = "This chaining mode requires an IV mechanism";
-                goto bad1;
+                goto bad_cipher;
        }
-        if (snprintf(cc->cipher, CRYPTO_MAX_ALG_NAME, "%s(%s)", chainmode, 
+        if (snprintf(cc->cipher, CRYPTO_MAX_ALG_NAME, "%s(%s)",
-                     cipher) >= CRYPTO_MAX_ALG_NAME) {
+                     chainmode, cipher) >= CRYPTO_MAX_ALG_NAME) {
                ti->error = "Chain mode + cipher name is too long";
-                goto bad1;
+                goto bad_cipher;
        }
        tfm = crypto_alloc_blkcipher(cc->cipher, 0, CRYPTO_ALG_ASYNC);
        if (IS_ERR(tfm)) {
                ti->error = "Error allocating crypto tfm";
-                goto bad1;
+                goto bad_cipher;
        }
        strcpy(cc->cipher, cipher);
@@ -793,18 +818,18 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                cc->iv_gen_ops = &crypt_iv_null_ops;
        else {
                ti->error = "Invalid IV mode";
-                goto bad2;
+                goto bad_ivmode;
        }
        if (cc->iv_gen_ops && cc->iv_gen_ops->ctr &&
            cc->iv_gen_ops->ctr(cc, ti, ivopts) < 0)
-                goto bad2;
+                goto bad_ivmode;
        cc->iv_size = crypto_blkcipher_ivsize(tfm);
        if (cc->iv_size)
                /* at least a 64 bit sector number should fit in our buffer */
                cc->iv_size = max(cc->iv_size,
-                                  (unsigned int)(sizeof(u64) / sizeof(u8)));
+                                  (unsigned int)(sizeof(u64) / sizeof(u8)));
        else {
                if (cc->iv_gen_ops) {
                        DMWARN("Selected cipher does not support IVs");
@@ -817,13 +842,13 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        cc->io_pool = mempool_create_slab_pool(MIN_IOS, _crypt_io_pool);
        if (!cc->io_pool) {
                ti->error = "Cannot allocate crypt io mempool";
-                goto bad3;
+                goto bad_slab_pool;
        }
        cc->page_pool = mempool_create_page_pool(MIN_POOL_PAGES, 0);
        if (!cc->page_pool) {
                ti->error = "Cannot allocate page mempool";
-                goto bad4;
+                goto bad_page_pool;
        }
        cc->bs = bioset_create(MIN_IOS, MIN_IOS);
@@ -834,25 +859,25 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        if (crypto_blkcipher_setkey(tfm, cc->key, key_size) < 0) {
                ti->error = "Error setting key";
-                goto bad5;
+                goto bad_device;
        }
        if (sscanf(argv[2], "%llu", &tmpll) != 1) {
                ti->error = "Invalid iv_offset sector";
-                goto bad5;
+                goto bad_device;
        }
        cc->iv_offset = tmpll;
        if (sscanf(argv[4], "%llu", &tmpll) != 1) {
                ti->error = "Invalid device sector";
-                goto bad5;
+                goto bad_device;
        }
        cc->start = tmpll;
        if (dm_get_device(ti, argv[3], cc->start, ti->len,
-                          dm_table_get_mode(ti->table), &cc->dev)) {
+                          dm_table_get_mode(ti->table), &cc->dev)) {
                ti->error = "Device lookup failed";
-                goto bad5;
+                goto bad_device;
        }
        if (ivmode && cc->iv_gen_ops) {
@@ -861,27 +886,45 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                cc->iv_mode = kmalloc(strlen(ivmode) + 1, GFP_KERNEL);
                if (!cc->iv_mode) {
                        ti->error = "Error kmallocing iv_mode string";
-                        goto bad5;
+                        goto bad_ivmode_string;
                }
                strcpy(cc->iv_mode, ivmode);
        } else
                cc->iv_mode = NULL;
+        cc->io_queue = create_singlethread_workqueue("kcryptd_io");
+        if (!cc->io_queue) {
+                ti->error = "Couldn't create kcryptd io queue";
+                goto bad_io_queue;
+        }
+        cc->crypt_queue = create_singlethread_workqueue("kcryptd");
+        if (!cc->crypt_queue) {
+                ti->error = "Couldn't create kcryptd queue";
+                goto bad_crypt_queue;
+        }
        ti->private = cc;
        return 0;
-bad5:
+bad_crypt_queue:
+        destroy_workqueue(cc->io_queue);
+bad_io_queue:
+        kfree(cc->iv_mode);
+bad_ivmode_string:
+        dm_put_device(ti, cc->dev);
+bad_device:
        bioset_free(cc->bs);
 bad_bs:
        mempool_destroy(cc->page_pool);
-bad4:
+bad_page_pool:
        mempool_destroy(cc->io_pool);
-bad3:
+bad_slab_pool:
        if (cc->iv_gen_ops && cc->iv_gen_ops->dtr)
                cc->iv_gen_ops->dtr(cc);
-bad2:
+bad_ivmode:
        crypto_free_blkcipher(tfm);
-bad1:
+bad_cipher:
        /* Must zero key material before freeing */
        memset(cc, 0, sizeof(*cc) + cc->key_size * sizeof(u8));
        kfree(cc);
@@ -892,7 +935,8 @@ static void crypt_dtr(struct dm_target *ti)
 {
        struct crypt_config *cc = (struct crypt_config *) ti->private;
-        flush_workqueue(_kcryptd_workqueue);
+        destroy_workqueue(cc->io_queue);
+        destroy_workqueue(cc->crypt_queue);
        bioset_free(cc->bs);
        mempool_destroy(cc->page_pool);
@@ -918,9 +962,13 @@ static int crypt_map(struct dm_target *ti, struct bio *bio,
        io = mempool_alloc(cc->io_pool, GFP_NOIO);
        io->target = ti;
        io->base_bio = bio;
-        io->error = io->post_process = 0;
+        io->error = 0;
        atomic_set(&io->pending, 0);
-        kcryptd_queue_io(io);
+        if (bio_data_dir(io->base_bio) == READ)
+                kcryptd_queue_io(io);
+        else
+                kcryptd_queue_crypt(io);
        return DM_MAPIO_SUBMITTED;
 }
@@ -1037,25 +1085,12 @@ static int __init dm_crypt_init(void)
        if (!_crypt_io_pool)
                return -ENOMEM;
-        _kcryptd_workqueue = create_workqueue("kcryptd");
-        if (!_kcryptd_workqueue) {
-                r = -ENOMEM;
-                DMERR("couldn't create kcryptd");
-                goto bad1;
-        }
        r = dm_register_target(&crypt_target);
        if (r < 0) {
                DMERR("register failed %d", r);
-                goto bad2;
+                kmem_cache_destroy(_crypt_io_pool);
        }
-        return 0;
-bad2:
-        destroy_workqueue(_kcryptd_workqueue);
-bad1:
-        kmem_cache_destroy(_crypt_io_pool);
        return r;
 }
@@ -1066,7 +1101,6 @@ static void __exit dm_crypt_exit(void)
        if (r < 0)
                DMERR("unregister failed %d", r);
-        destroy_workqueue(_kcryptd_workqueue);
        kmem_cache_destroy(_crypt_io_pool);
 }
diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index 6928c136d3c..bdd37f881c4 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -83,7 +83,7 @@ static struct bio *flush_delayed_bios(struct delay_c *dc, int flush_all)
        struct dm_delay_info *delayed, *next;
        unsigned long next_expires = 0;
        int start_timer = 0;
-        BIO_LIST(flush_bios);
+        struct bio_list flush_bios = { };
        mutex_lock(&delayed_bios_lock);
        list_for_each_entry_safe(delayed, next, &dc->delayed_bios, list) {
@@ -163,34 +163,32 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                goto bad;
        }
-        if (argc == 3) {
+        dc->dev_write = NULL;
-                dc->dev_write = NULL;
+        if (argc == 3)
                goto out;
-        }
        if (sscanf(argv[4], "%llu", &tmpll) != 1) {
                ti->error = "Invalid write device sector";
-                goto bad;
+                goto bad_dev_read;
        }
        dc->start_write = tmpll;
        if (sscanf(argv[5], "%u", &dc->write_delay) != 1) {
                ti->error = "Invalid write delay";
-                goto bad;
+                goto bad_dev_read;
        }
        if (dm_get_device(ti, argv[3], dc->start_write, ti->len,
                          dm_table_get_mode(ti->table), &dc->dev_write)) {
                ti->error = "Write device lookup failed";
-                dm_put_device(ti, dc->dev_read);
+                goto bad_dev_read;
-                goto bad;
        }
 out:
        dc->delayed_pool = mempool_create_slab_pool(128, delayed_cache);
        if (!dc->delayed_pool) {
                DMERR("Couldn't create delayed bio pool.");
-                goto bad;
+                goto bad_dev_write;
        }
        setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc);
@@ -203,6 +201,11 @@ out:
        ti->private = dc;
        return 0;
+bad_dev_write:
+        if (dc->dev_write)
+                dm_put_device(ti, dc->dev_write);
+bad_dev_read:
+        dm_put_device(ti, dc->dev_read);
 bad:
        kfree(dc);
        return -EINVAL;
@@ -305,7 +308,7 @@ static int delay_status(struct dm_target *ti, status_type_t type,
                       (unsigned long long) dc->start_read,
                       dc->read_delay);
                if (dc->dev_write)
-                        DMEMIT("%s %llu %u", dc->dev_write->name,
+                        DMEMIT(" %s %llu %u", dc->dev_write->name,
                               (unsigned long long) dc->start_write,
                               dc->write_delay);
                break;
diff --git a/drivers/md/dm-emc.c b/drivers/md/dm-emc.c
index 342517261ec..6b91b9ab1d4 100644
--- a/drivers/md/dm-emc.c
+++ b/drivers/md/dm-emc.c
@@ -81,7 +81,7 @@ static struct bio *get_failover_bio(struct dm_path *path, unsigned data_size)
        }
        if (bio_add_page(bio, page, data_size, 0) != data_size) {
-                DMERR("get_failover_bio: alloc_page() failed.");
+                DMERR("get_failover_bio: bio_add_page() failed.");
                __free_page(page);
                bio_put(bio);
                return NULL;
@@ -211,12 +211,10 @@ fail_path:
 static struct emc_handler *alloc_emc_handler(void)
 {
-        struct emc_handler *h = kmalloc(sizeof(*h), GFP_KERNEL);
+        struct emc_handler *h = kzalloc(sizeof(*h), GFP_KERNEL);
-        if (h) {
+        if (h)
-                memset(h, 0, sizeof(*h));
                spin_lock_init(&h->lock);
-        }
        return h;
 }
diff --git a/drivers/md/dm-hw-handler.c b/drivers/md/dm-hw-handler.c
index baafaaba4d4..2ee84d8aa0b 100644
--- a/drivers/md/dm-hw-handler.c
+++ b/drivers/md/dm-hw-handler.c
@@ -91,12 +91,10 @@ void dm_put_hw_handler(struct hw_handler_type *hwht)
 static struct hwh_internal *_alloc_hw_handler(struct hw_handler_type *hwht)
 {
-        struct hwh_internal *hwhi = kmalloc(sizeof(*hwhi), GFP_KERNEL);
+        struct hwh_internal *hwhi = kzalloc(sizeof(*hwhi), GFP_KERNEL);
-        if (hwhi) {
+        if (hwhi)
-                memset(hwhi, 0, sizeof(*hwhi));
                hwhi->hwht = *hwht;
-        }
        return hwhi;
 }
diff --git a/drivers/md/dm-hw-handler.h b/drivers/md/dm-hw-handler.h
index e0832e6fcf3..46809dcb121 100644
--- a/drivers/md/dm-hw-handler.h
+++ b/drivers/md/dm-hw-handler.h
@@ -58,5 +58,6 @@ unsigned dm_scsi_err_handler(struct hw_handler *hwh, struct bio *bio);
 #define MP_FAIL_PATH 1
 #define MP_BYPASS_PG 2
 #define MP_ERROR_IO  4  /* Don't retry this I/O */
+#define MP_RETRY 8
 #endif
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index b441d82c338..138200bf5e0 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -700,7 +700,7 @@ static int dev_rename(struct dm_ioctl *param, size_t param_size)
        int r;
        char *new_name = (char *) param + param->data_start;
-        if (new_name < (char *) (param + 1) ||
+        if (new_name < (char *) param->data ||
            invalid_str(new_name, (void *) param + param_size)) {
                DMWARN("Invalid new logical volume name supplied.");
                return -EINVAL;
@@ -726,7 +726,7 @@ static int dev_set_geometry(struct dm_ioctl *param, size_t param_size)
        if (!md)
                return -ENXIO;
-        if (geostr < (char *) (param + 1) ||
+        if (geostr < (char *) param->data ||
            invalid_str(geostr, (void *) param + param_size)) {
                DMWARN("Invalid geometry supplied.");
                goto out;
@@ -1233,7 +1233,7 @@ static int target_message(struct dm_ioctl *param, size_t param_size)
        if (r)
                goto out;
-        if (tmsg < (struct dm_target_msg *) (param + 1) ||
+        if (tmsg < (struct dm_target_msg *) param->data ||
            invalid_str(tmsg->message, (void *) param + param_size)) {
                DMWARN("Invalid target message parameters.");
                r = -EINVAL;
@@ -1358,7 +1358,7 @@ static int copy_params(struct dm_ioctl __user *user, struct dm_ioctl **param)
        if (tmp.data_size < sizeof(tmp))
                return -EINVAL;
-        dmi = (struct dm_ioctl *) vmalloc(tmp.data_size);
+        dmi = vmalloc(tmp.data_size);
        if (!dmi)
                return -ENOMEM;
@@ -1515,3 +1515,35 @@ void dm_interface_exit(void)
        dm_hash_exit();
 }
+/**
+ * dm_copy_name_and_uuid - Copy mapped device name & uuid into supplied buffers
+ * @md: Pointer to mapped_device
+ * @name: Buffer (size DM_NAME_LEN) for name
+ * @uuid: Buffer (size DM_UUID_LEN) for uuid or empty string if uuid not defined
+ */
+int dm_copy_name_and_uuid(struct mapped_device *md, char *name, char *uuid)
+{
+        int r = 0;
+        struct hash_cell *hc;
+        if (!md)
+                return -ENXIO;
+        dm_get(md);
+        down_read(&_hash_lock);
+        hc = dm_get_mdptr(md);
+        if (!hc || hc->md != md) {
+                r = -ENXIO;
+                goto out;
+        }
+        strcpy(name, hc->name);
+        strcpy(uuid, hc->uuid ? : "");
+out:
+        up_read(&_hash_lock);
+        dm_put(md);
+        return r;
+}
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index a66428d860f..072ee4353ea 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -696,7 +696,7 @@ static struct dirty_log_type _disk_type = {
        .module = THIS_MODULE,
        .ctr = disk_ctr,
        .dtr = disk_dtr,
-        .suspend = disk_flush,
+        .postsuspend = disk_flush,
        .resume = disk_resume,
        .get_region_size = core_get_region_size,
        .is_clean = core_is_clean,
diff --git a/drivers/md/dm-log.h b/drivers/md/dm-log.h
index 86a301c8daf..3fae87eb596 100644
--- a/drivers/md/dm-log.h
+++ b/drivers/md/dm-log.h
@@ -32,7 +32,8 @@ struct dirty_log_type {
         * There are times when we don't want the log to touch
         * the disk.
         */
-        int (*suspend)(struct dirty_log *log);
+        int (*presuspend)(struct dirty_log *log);
+        int (*postsuspend)(struct dirty_log *log);
        int (*resume)(struct dirty_log *log);
        /*
diff --git a/drivers/md/dm-mpath-hp-sw.c b/drivers/md/dm-mpath-hp-sw.c
new file mode 100644
index 00000000000..204bf42c944
--- /dev/null
+++ b/drivers/md/dm-mpath-hp-sw.c
@@ -0,0 +1,248 @@
+/*
+ * Copyright (C) 2005 Mike Christie, All rights reserved.
+ * Copyright (C) 2007 Red Hat, Inc. All rights reserved.
+ * Authors: Mike Christie
+ *          Dave Wysochanski
+ *
+ * This file is released under the GPL.
+ *
+ * This module implements the specific path activation code for
+ * HP StorageWorks and FSC FibreCat Asymmetric (Active/Passive)
+ * storage arrays.
+ * These storage arrays have controller-based failover, not
+ * LUN-based failover.  However, LUN-based failover is the design
+ * of dm-multipath. Thus, this module is written for LUN-based failover.
+ */
+#include <linux/blkdev.h>
+#include <linux/list.h>
+#include <linux/types.h>
+#include <scsi/scsi.h>
+#include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_dbg.h>
+#include "dm.h"
+#include "dm-hw-handler.h"
+#define DM_MSG_PREFIX "multipath hp-sw"
+#define DM_HP_HWH_NAME "hp-sw"
+#define DM_HP_HWH_VER "1.0.0"
+struct hp_sw_context {
+        unsigned char sense[SCSI_SENSE_BUFFERSIZE];
+};
+/*
+ * hp_sw_error_is_retryable - Is an HP-specific check condition retryable?
+ * @req: path activation request
+ *
+ * Examine error codes of request and determine whether the error is retryable.
+ * Some error codes are already retried by scsi-ml (see
+ * scsi_decide_disposition), but some HP specific codes are not.
+ * The intent of this routine is to supply the logic for the HP specific
+ * check conditions.
+ *
+ * Returns:
+ *  1 - command completed with retryable error
+ *  0 - command completed with non-retryable error
+ *
+ * Possible optimizations
+ * 1. More hardware-specific error codes
+ */
+static int hp_sw_error_is_retryable(struct request *req)
+{
+        /*
+         * NOT_READY is known to be retryable
+         * For now we just dump out the sense data and call it retryable
+         */
+        if (status_byte(req->errors) == CHECK_CONDITION)
+                __scsi_print_sense(DM_HP_HWH_NAME, req->sense, req->sense_len);
+        /*
+         * At this point we don't have complete information about all the error
+         * codes from this hardware, so we are just conservative and retry
+         * when in doubt.
+         */
+        return 1;
+}
+/*
+ * hp_sw_end_io - Completion handler for HP path activation.
+ * @req: path activation request
+ * @error: scsi-ml error
+ *
+ *  Check sense data, free request structure, and notify dm that
+ *  pg initialization has completed.
+ *
+ * Context: scsi-ml softirq
+ *
+ */
+static void hp_sw_end_io(struct request *req, int error)
+{
+        struct dm_path *path = req->end_io_data;
+        unsigned err_flags = 0;
+        if (!error) {
+                DMDEBUG("%s path activation command - success",
+                        path->dev->name);
+                goto out;
+        }
+        if (hp_sw_error_is_retryable(req)) {
+                DMDEBUG("%s path activation command - retry",
+                        path->dev->name);
+                err_flags = MP_RETRY;
+                goto out;
+        }
+        DMWARN("%s path activation fail - error=0x%x",
+               path->dev->name, error);
+        err_flags = MP_FAIL_PATH;
+out:
+        req->end_io_data = NULL;
+        __blk_put_request(req->q, req);
+        dm_pg_init_complete(path, err_flags);
+}
+/*
+ * hp_sw_get_request - Allocate an HP specific path activation request
+ * @path: path on which request will be sent (needed for request queue)
+ *
+ * The START command is used for path activation request.
+ * These arrays are controller-based failover, not LUN based.
+ * One START command issued to a single path will fail over all
+ * LUNs for the same controller.
+ *
+ * Possible optimizations
+ * 1. Make timeout configurable
+ * 2. Preallocate request
+ */
+static struct request *hp_sw_get_request(struct dm_path *path)
+{
+        struct request *req;
+        struct block_device *bdev = path->dev->bdev;
+        struct request_queue *q = bdev_get_queue(bdev);
+        struct hp_sw_context *h = path->hwhcontext;
+        req = blk_get_request(q, WRITE, GFP_NOIO);
+        if (!req)
+                goto out;
+        req->timeout = 60 * HZ;
+        req->errors = 0;
+        req->cmd_type = REQ_TYPE_BLOCK_PC;
+        req->cmd_flags |= REQ_FAILFAST | REQ_NOMERGE;
+        req->end_io_data = path;
+        req->sense = h->sense;
+        memset(req->sense, 0, SCSI_SENSE_BUFFERSIZE);
+        memset(&req->cmd, 0, BLK_MAX_CDB);
+        req->cmd[0] = START_STOP;
+        req->cmd[4] = 1;
+        req->cmd_len = COMMAND_SIZE(req->cmd[0]);
+out:
+        return req;
+}
+/*
+ * hp_sw_pg_init - HP path activation implementation.
+ * @hwh: hardware handler specific data
+ * @bypassed: unused; is the path group bypassed? (see dm-mpath.c)
+ * @path: path to send initialization command
+ *
+ * Send an HP-specific path activation command on 'path'.
+ * Do not try to optimize in any way, just send the activation command.
+ * More than one path activation command may be sent to the same controller.
+ * This seems to work fine for basic failover support.
+ *
+ * Possible optimizations
+ * 1. Detect an in-progress activation request and avoid submitting another one
+ * 2. Model the controller and only send a single activation request at a time
+ * 3. Determine the state of a path before sending an activation request
+ *
+ * Context: kmpathd (see process_queued_ios() in dm-mpath.c)
+ */
+static void hp_sw_pg_init(struct hw_handler *hwh, unsigned bypassed,
+                          struct dm_path *path)
+{
+        struct request *req;
+        struct hp_sw_context *h;
+        path->hwhcontext = hwh->context;
+        h = hwh->context;
+        req = hp_sw_get_request(path);
+        if (!req) {
+                DMERR("%s path activation command - allocation fail",
+                      path->dev->name);
+                goto retry;
+        }
+        DMDEBUG("%s path activation command - sent", path->dev->name);
+        blk_execute_rq_nowait(req->q, NULL, req, 1, hp_sw_end_io);
+        return;
+retry:
+        dm_pg_init_complete(path, MP_RETRY);
+}
+static int hp_sw_create(struct hw_handler *hwh, unsigned argc, char **argv)
+{
+        struct hp_sw_context *h;
+        h = kmalloc(sizeof(*h), GFP_KERNEL);
+        if (!h)
+                return -ENOMEM;
+        hwh->context = h;
+        return 0;
+}
+static void hp_sw_destroy(struct hw_handler *hwh)
+{
+        struct hp_sw_context *h = hwh->context;
+        kfree(h);
+}
+static struct hw_handler_type hp_sw_hwh = {
+        .name = DM_HP_HWH_NAME,
+        .module = THIS_MODULE,
+        .create = hp_sw_create,
+        .destroy = hp_sw_destroy,
+        .pg_init = hp_sw_pg_init,
+};
+static int __init hp_sw_init(void)
+{
+        int r;
+        r = dm_register_hw_handler(&hp_sw_hwh);
+        if (r < 0)
+                DMERR("register failed %d", r);
+        else
+                DMINFO("version " DM_HP_HWH_VER " loaded");
+        return r;
+}
+static void __exit hp_sw_exit(void)
+{
+        int r;
+        r = dm_unregister_hw_handler(&hp_sw_hwh);
+        if (r < 0)
+                DMERR("unregister failed %d", r);
+}
+module_init(hp_sw_init);
+module_exit(hp_sw_exit);
+MODULE_DESCRIPTION("DM Multipath HP StorageWorks / FSC FibreCat (A/P) support");
+MODULE_AUTHOR("Mike Christie, Dave Wysochanski <dm-devel@redhat.com>");
+MODULE_LICENSE("GPL");
+MODULE_VERSION(DM_HP_HWH_VER);
diff --git a/drivers/md/dm-mpath-rdac.c b/drivers/md/dm-mpath-rdac.c
index 16b16134577..e04eb5c697f 100644
--- a/drivers/md/dm-mpath-rdac.c
+++ b/drivers/md/dm-mpath-rdac.c
@@ -664,20 +664,21 @@ static struct hw_handler_type rdac_handler = {
 static int __init rdac_init(void)
 {
-        int r = dm_register_hw_handler(&rdac_handler);
+        int r;
-        if (r < 0) {
-                DMERR("%s: register failed %d", RDAC_DM_HWH_NAME, r);
-                return r;
-        }
        rdac_wkqd = create_singlethread_workqueue("rdac_wkqd");
        if (!rdac_wkqd) {
                DMERR("Failed to create workqueue rdac_wkqd.");
-                dm_unregister_hw_handler(&rdac_handler);
                return -ENOMEM;
        }
+        r = dm_register_hw_handler(&rdac_handler);
+        if (r < 0) {
+                DMERR("%s: register failed %d", RDAC_DM_HWH_NAME, r);
+                destroy_workqueue(rdac_wkqd);
+                return r;
+        }
        DMINFO("%s: version %s loaded", RDAC_DM_HWH_NAME, RDAC_DM_HWH_VER);
        return 0;
 }
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 31056abca89..24b2b1e32fa 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -10,6 +10,7 @@
 #include "dm-hw-handler.h"
 #include "dm-bio-list.h"
 #include "dm-bio-record.h"
+#include "dm-uevent.h"
 #include <linux/ctype.h>
 #include <linux/init.h>
@@ -75,6 +76,8 @@ struct multipath {
        unsigned queue_io;              /* Must we queue all I/O? */
        unsigned queue_if_no_path;      /* Queue I/O if last path fails? */
        unsigned saved_queue_if_no_path;/* Saved state during suspension */
+        unsigned pg_init_retries;       /* Number of times to retry pg_init */
+        unsigned pg_init_count;         /* Number of times pg_init called */
        struct work_struct process_queued_ios;
        struct bio_list queued_ios;
@@ -225,6 +228,8 @@ static void __switch_pg(struct multipath *m, struct pgpath *pgpath)
                m->pg_init_required = 0;
                m->queue_io = 0;
        }
+        m->pg_init_count = 0;
 }
 static int __choose_path_in_pg(struct multipath *m, struct priority_group *pg)
@@ -424,6 +429,7 @@ static void process_queued_ios(struct work_struct *work)
                must_queue = 0;
        if (m->pg_init_required && !m->pg_init_in_progress) {
+                m->pg_init_count++;
                m->pg_init_required = 0;
                m->pg_init_in_progress = 1;
                init_required = 1;
@@ -689,9 +695,11 @@ static int parse_features(struct arg_set *as, struct multipath *m)
        int r;
        unsigned argc;
        struct dm_target *ti = m->ti;
+        const char *param_name;
        static struct param _params[] = {
-                {0, 1, "invalid number of feature args"},
+                {0, 3, "invalid number of feature args"},
+                {1, 50, "pg_init_retries must be between 1 and 50"},
        };
        r = read_param(_params, shift(as), &argc, &ti->error);
@@ -701,12 +709,28 @@ static int parse_features(struct arg_set *as, struct multipath *m)
        if (!argc)
                return 0;
-        if (!strnicmp(shift(as), MESG_STR("queue_if_no_path")))
+        do {
-                return queue_if_no_path(m, 1, 0);
+                param_name = shift(as);
-        else {
+                argc--;
+                if (!strnicmp(param_name, MESG_STR("queue_if_no_path"))) {
+                        r = queue_if_no_path(m, 1, 0);
+                        continue;
+                }
+                if (!strnicmp(param_name, MESG_STR("pg_init_retries")) &&
+                    (argc >= 1)) {
+                        r = read_param(_params + 1, shift(as),
+                                       &m->pg_init_retries, &ti->error);
+                        argc--;
+                        continue;
+                }
                ti->error = "Unrecognised multipath feature request";
-                return -EINVAL;
+                r = -EINVAL;
-        }
+        } while (argc && !r);
+        return r;
 }
 static int multipath_ctr(struct dm_target *ti, unsigned int argc,
@@ -834,6 +858,9 @@ static int fail_path(struct pgpath *pgpath)
        if (pgpath == m->current_pgpath)
                m->current_pgpath = NULL;
+        dm_path_uevent(DM_UEVENT_PATH_FAILED, m->ti,
+                      pgpath->path.dev->name, m->nr_valid_paths);
        queue_work(kmultipathd, &m->trigger_event);
 out:
@@ -873,6 +900,9 @@ static int reinstate_path(struct pgpath *pgpath)
        if (!m->nr_valid_paths++ && m->queue_size)
                queue_work(kmultipathd, &m->process_queued_ios);
+        dm_path_uevent(DM_UEVENT_PATH_REINSTATED, m->ti,
+                      pgpath->path.dev->name, m->nr_valid_paths);
        queue_work(kmultipathd, &m->trigger_event);
 out:
@@ -976,6 +1006,26 @@ static int bypass_pg_num(struct multipath *m, const char *pgstr, int bypassed)
 }
 /*
+ * Should we retry pg_init immediately?
+ */
+static int pg_init_limit_reached(struct multipath *m, struct pgpath *pgpath)
+{
+        unsigned long flags;
+        int limit_reached = 0;
+        spin_lock_irqsave(&m->lock, flags);
+        if (m->pg_init_count <= m->pg_init_retries)
+                m->pg_init_required = 1;
+        else
+                limit_reached = 1;
+        spin_unlock_irqrestore(&m->lock, flags);
+        return limit_reached;
+}
+/*
 * pg_init must call this when it has completed its initialisation
 */
 void dm_pg_init_complete(struct dm_path *path, unsigned err_flags)
@@ -985,8 +1035,14 @@ void dm_pg_init_complete(struct dm_path *path, unsigned err_flags)
        struct multipath *m = pg->m;
        unsigned long flags;
-        /* We insist on failing the path if the PG is already bypassed. */
+        /*
-        if (err_flags && pg->bypassed)
+         * If requested, retry pg_init until maximum number of retries exceeded.
+         * If retry not requested and PG already bypassed, always fail the path.
+         */
+        if (err_flags & MP_RETRY) {
+                if (pg_init_limit_reached(m, pgpath))
+                        err_flags |= MP_FAIL_PATH;
+        } else if (err_flags && pg->bypassed)
                err_flags |= MP_FAIL_PATH;
        if (err_flags & MP_FAIL_PATH)
@@ -996,7 +1052,7 @@ void dm_pg_init_complete(struct dm_path *path, unsigned err_flags)
                bypass_pg(m, pg, 1);
        spin_lock_irqsave(&m->lock, flags);
-        if (err_flags) {
+        if (err_flags & ~MP_RETRY) {
                m->current_pgpath = NULL;
                m->current_pg = NULL;
        } else if (!m->pg_init_required)
@@ -1148,11 +1204,15 @@ static int multipath_status(struct dm_target *ti, status_type_t type,
        /* Features */
        if (type == STATUSTYPE_INFO)
-                DMEMIT("1 %u ", m->queue_size);
+                DMEMIT("2 %u %u ", m->queue_size, m->pg_init_count);
-        else if (m->queue_if_no_path)
+        else {
-                DMEMIT("1 queue_if_no_path ");
+                DMEMIT("%u ", m->queue_if_no_path +
-        else
+                              (m->pg_init_retries > 0) * 2);
-                DMEMIT("0 ");
+                if (m->queue_if_no_path)
+                        DMEMIT("queue_if_no_path ");
+                if (m->pg_init_retries)
+                        DMEMIT("pg_init_retries %u ", m->pg_init_retries);
+        }
        if (hwh->type && hwh->type->status)
                sz += hwh->type->status(hwh, type, result + sz, maxlen - sz);
diff --git a/drivers/md/dm-path-selector.c b/drivers/md/dm-path-selector.c
index f10a0c89b3f..ca1bb636a3e 100644
--- a/drivers/md/dm-path-selector.c
+++ b/drivers/md/dm-path-selector.c
@@ -94,12 +94,10 @@ out:
 static struct ps_internal *_alloc_path_selector(struct path_selector_type *pst)
 {
-        struct ps_internal *psi = kmalloc(sizeof(*psi), GFP_KERNEL);
+        struct ps_internal *psi = kzalloc(sizeof(*psi), GFP_KERNEL);
-        if (psi) {
+        if (psi)
-                memset(psi, 0, sizeof(*psi));
                psi->pst = *pst;
-        }
        return psi;
 }
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index d09ff15490a..31123d4a6b9 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -19,6 +19,7 @@
 #include <linux/time.h>
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
+#include <linux/log2.h>
 #define DM_MSG_PREFIX "raid1"
 #define DM_IO_PAGES 64
@@ -113,6 +114,7 @@ struct region {
 * Mirror set structures.
 *---------------------------------------------------------------*/
 struct mirror {
+        struct mirror_set *ms;
        atomic_t error_count;
        struct dm_dev *dev;
        sector_t offset;
@@ -974,6 +976,7 @@ static struct mirror_set *alloc_context(unsigned int nr_mirrors,
        if (rh_init(&ms->rh, ms, dl, region_size, ms->nr_regions)) {
                ti->error = "Error creating dirty region hash";
+                dm_io_client_destroy(ms->io_client);
                kfree(ms);
                return NULL;
        }
@@ -994,7 +997,7 @@ static void free_context(struct mirror_set *ms, struct dm_target *ti,
 static inline int _check_region_size(struct dm_target *ti, uint32_t size)
 {
-        return !(size % (PAGE_SIZE >> 9) || (size & (size - 1)) ||
+        return !(size % (PAGE_SIZE >> 9) || !is_power_of_2(size) ||
                 size > ti->len);
 }
@@ -1015,6 +1018,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
                return -ENXIO;
        }
+        ms->mirror[mirror].ms = ms;
        ms->mirror[mirror].offset = offset;
        return 0;
@@ -1163,16 +1167,14 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        ms->kmirrord_wq = create_singlethread_workqueue("kmirrord");
        if (!ms->kmirrord_wq) {
                DMERR("couldn't start kmirrord");
-                free_context(ms, ti, m);
+                r = -ENOMEM;
-                return -ENOMEM;
+                goto err_free_context;
        }
        INIT_WORK(&ms->kmirrord_work, do_mirror);
        r = parse_features(ms, argc, argv, &args_used);
-        if (r) {
+        if (r)
-                free_context(ms, ti, ms->nr_mirrors);
+                goto err_destroy_wq;
-                return r;
-        }
        argv += args_used;
        argc -= args_used;
@@ -1188,19 +1190,22 @@ static int mirror_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        if (argc) {
                ti->error = "Too many mirror arguments";
-                free_context(ms, ti, ms->nr_mirrors);
+                r = -EINVAL;
-                return -EINVAL;
+                goto err_destroy_wq;
        }
        r = kcopyd_client_create(DM_IO_PAGES, &ms->kcopyd_client);
-        if (r) {
+        if (r)
-                destroy_workqueue(ms->kmirrord_wq);
+                goto err_destroy_wq;
-                free_context(ms, ti, ms->nr_mirrors);
-                return r;
-        }
        wake(ms);
        return 0;
+err_destroy_wq:
+        destroy_workqueue(ms->kmirrord_wq);
+err_free_context:
+        free_context(ms, ti, ms->nr_mirrors);
+        return r;
 }
 static void mirror_dtr(struct dm_target *ti)
@@ -1302,7 +1307,7 @@ static void mirror_postsuspend(struct dm_target *ti)
        wait_event(_kmirrord_recovery_stopped,
                   !atomic_read(&ms->rh.recovery_in_flight));
-        if (log->type->suspend && log->type->suspend(log))
+        if (log->type->postsuspend && log->type->postsuspend(log))
                /* FIXME: need better error handling */
                DMWARN("log suspend failed");
 }
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 98a633f3d6b..cee16fadd9e 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -17,6 +17,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/log2.h>
 #include "dm-snap.h"
 #include "dm-bio-list.h"
@@ -415,7 +416,7 @@ static int set_chunk_size(struct dm_snapshot *s, const char *chunk_size_arg,
        chunk_size = round_up(chunk_size, PAGE_SIZE >> 9);
        /* Check chunk_size is a power of 2 */
-        if (chunk_size & (chunk_size - 1)) {
+        if (!is_power_of_2(chunk_size)) {
                *error = "Chunk size is not a power of 2";
                return -EINVAL;
        }
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index 51f5e076001..969944a8aba 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -11,6 +11,7 @@
 #include <linux/blkdev.h>
 #include <linux/bio.h>
 #include <linux/slab.h>
+#include <linux/log2.h>
 #define DM_MSG_PREFIX "striped"
@@ -99,7 +100,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        /*
         * chunk_size is a power of two
         */
-        if (!chunk_size || (chunk_size & (chunk_size - 1)) ||
+        if (!is_power_of_2(chunk_size) ||
            (chunk_size < (PAGE_SIZE >> SECTOR_SHIFT))) {
                ti->error = "Invalid chunk size";
                return -EINVAL;
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index fbe477bb2c6..8939e610508 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -213,12 +213,11 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
 int dm_table_create(struct dm_table **result, int mode,
                    unsigned num_targets, struct mapped_device *md)
 {
-        struct dm_table *t = kmalloc(sizeof(*t), GFP_KERNEL);
+        struct dm_table *t = kzalloc(sizeof(*t), GFP_KERNEL);
        if (!t)
                return -ENOMEM;
-        memset(t, 0, sizeof(*t));
        INIT_LIST_HEAD(&t->devices);
        atomic_set(&t->holders, 1);
diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index 477a041a41c..835cf95b857 100644
--- a/drivers/md/dm-target.c
+++ b/drivers/md/dm-target.c
@@ -88,12 +88,10 @@ void dm_put_target_type(struct target_type *t)
 static struct tt_internal *alloc_target(struct target_type *t)
 {
-        struct tt_internal *ti = kmalloc(sizeof(*ti), GFP_KERNEL);
+        struct tt_internal *ti = kzalloc(sizeof(*ti), GFP_KERNEL);
-        if (ti) {
+        if (ti)
-                memset(ti, 0, sizeof(*ti));
                ti->tt = *t;
-        }
        return ti;
 }
diff --git a/drivers/md/dm-uevent.c b/drivers/md/dm-uevent.c
new file mode 100644
index 00000000000..50377e5dc2a
--- /dev/null
+++ b/drivers/md/dm-uevent.c
@@ -0,0 +1,222 @@
+/*
+ * Device Mapper Uevent Support (dm-uevent)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright IBM Corporation, 2007
+ *      Author: Mike Anderson <andmike@linux.vnet.ibm.com>
+ */
+#include <linux/list.h>
+#include <linux/slab.h>
+#include <linux/kobject.h>
+#include <linux/dm-ioctl.h>
+#include "dm.h"
+#include "dm-uevent.h"
+#define DM_MSG_PREFIX "uevent"
+static const struct {
+        enum dm_uevent_type type;
+        enum kobject_action action;
+        char *name;
+} _dm_uevent_type_names[] = {
+        {DM_UEVENT_PATH_FAILED, KOBJ_CHANGE, "PATH_FAILED"},
+        {DM_UEVENT_PATH_REINSTATED, KOBJ_CHANGE, "PATH_REINSTATED"},
+};
+static struct kmem_cache *_dm_event_cache;
+struct dm_uevent {
+        struct mapped_device *md;
+        enum kobject_action action;
+        struct kobj_uevent_env ku_env;
+        struct list_head elist;
+        char name[DM_NAME_LEN];
+        char uuid[DM_UUID_LEN];
+};
+static void dm_uevent_free(struct dm_uevent *event)
+{
+        kmem_cache_free(_dm_event_cache, event);
+}
+static struct dm_uevent *dm_uevent_alloc(struct mapped_device *md)
+{
+        struct dm_uevent *event;
+        event = kmem_cache_zalloc(_dm_event_cache, GFP_ATOMIC);
+        if (!event)
+                return NULL;
+        INIT_LIST_HEAD(&event->elist);
+        event->md = md;
+        return event;
+}
+static struct dm_uevent *dm_build_path_uevent(struct mapped_device *md,
+                                              struct dm_target *ti,
+                                              enum kobject_action action,
+                                              const char *dm_action,
+                                              const char *path,
+                                              unsigned nr_valid_paths)
+{
+        struct dm_uevent *event;
+        event = dm_uevent_alloc(md);
+        if (!event) {
+                DMERR("%s: dm_uevent_alloc() failed", __FUNCTION__);
+                goto err_nomem;
+        }
+        event->action = action;
+        if (add_uevent_var(&event->ku_env, "DM_TARGET=%s", ti->type->name)) {
+                DMERR("%s: add_uevent_var() for DM_TARGET failed",
+                      __FUNCTION__);
+                goto err_add;
+        }
+        if (add_uevent_var(&event->ku_env, "DM_ACTION=%s", dm_action)) {
+                DMERR("%s: add_uevent_var() for DM_ACTION failed",
+                      __FUNCTION__);
+                goto err_add;
+        }
+        if (add_uevent_var(&event->ku_env, "DM_SEQNUM=%u",
+                           dm_next_uevent_seq(md))) {
+                DMERR("%s: add_uevent_var() for DM_SEQNUM failed",
+                      __FUNCTION__);
+                goto err_add;
+        }
+        if (add_uevent_var(&event->ku_env, "DM_PATH=%s", path)) {
+                DMERR("%s: add_uevent_var() for DM_PATH failed", __FUNCTION__);
+                goto err_add;
+        }
+        if (add_uevent_var(&event->ku_env, "DM_NR_VALID_PATHS=%d",
+                           nr_valid_paths)) {
+                DMERR("%s: add_uevent_var() for DM_NR_VALID_PATHS failed",
+                      __FUNCTION__);
+                goto err_add;
+        }
+        return event;
+err_add:
+        dm_uevent_free(event);
+err_nomem:
+        return ERR_PTR(-ENOMEM);
+}
+/**
+ * dm_send_uevents - send uevents for given list
+ *
+ * @events:     list of events to send
+ * @kobj:       kobject generating event
+ *
+ */
+void dm_send_uevents(struct list_head *events, struct kobject *kobj)
+{
+        int r;
+        struct dm_uevent *event, *next;
+        list_for_each_entry_safe(event, next, events, elist) {
+                list_del_init(&event->elist);
+                /*
+                 * Need to call dm_copy_name_and_uuid from here for now.
+                 * Context of previous var adds and locking used for
+                 * hash_cell not compatable.
+                 */
+                if (dm_copy_name_and_uuid(event->md, event->name,
+                                          event->uuid)) {
+                        DMERR("%s: dm_copy_name_and_uuid() failed",
+                              __FUNCTION__);
+                        goto uevent_free;
+                }
+                if (add_uevent_var(&event->ku_env, "DM_NAME=%s", event->name)) {
+                        DMERR("%s: add_uevent_var() for DM_NAME failed",
+                              __FUNCTION__);
+                        goto uevent_free;
+                }
+                if (add_uevent_var(&event->ku_env, "DM_UUID=%s", event->uuid)) {
+                        DMERR("%s: add_uevent_var() for DM_UUID failed",
+                              __FUNCTION__);
+                        goto uevent_free;
+                }
+                r = kobject_uevent_env(kobj, event->action, event->ku_env.envp);
+                if (r)
+                        DMERR("%s: kobject_uevent_env failed", __FUNCTION__);
+uevent_free:
+                dm_uevent_free(event);
+        }
+}
+EXPORT_SYMBOL_GPL(dm_send_uevents);
+/**
+ * dm_path_uevent - called to create a new path event and queue it
+ *
+ * @event_type: path event type enum
+ * @ti:                 pointer to a dm_target
+ * @path:               string containing pathname
+ * @nr_valid_paths:     number of valid paths remaining
+ *
+ */
+void dm_path_uevent(enum dm_uevent_type event_type, struct dm_target *ti,
+                   const char *path, unsigned nr_valid_paths)
+{
+        struct mapped_device *md = dm_table_get_md(ti->table);
+        struct dm_uevent *event;
+        if (event_type >= ARRAY_SIZE(_dm_uevent_type_names)) {
+                DMERR("%s: Invalid event_type %d", __FUNCTION__, event_type);
+                goto out;
+        }
+        event = dm_build_path_uevent(md, ti,
+                                     _dm_uevent_type_names[event_type].action,
+                                     _dm_uevent_type_names[event_type].name,
+                                     path, nr_valid_paths);
+        if (IS_ERR(event))
+                goto out;
+        dm_uevent_add(md, &event->elist);
+out:
+        dm_put(md);
+}
+EXPORT_SYMBOL_GPL(dm_path_uevent);
+int dm_uevent_init(void)
+{
+        _dm_event_cache = KMEM_CACHE(dm_uevent, 0);
+        if (!_dm_event_cache)
+                return -ENOMEM;
+        DMINFO("version 1.0.3");
+        return 0;
+}
+void dm_uevent_exit(void)
+{
+        kmem_cache_destroy(_dm_event_cache);
+}
diff --git a/drivers/md/dm-uevent.h b/drivers/md/dm-uevent.h
new file mode 100644
index 00000000000..2eccc8bd671
--- /dev/null
+++ b/drivers/md/dm-uevent.h
@@ -0,0 +1,59 @@
+/*
+ * Device Mapper Uevent Support
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright IBM Corporation, 2007
+ *      Author: Mike Anderson <andmike@linux.vnet.ibm.com>
+ */
+#ifndef DM_UEVENT_H
+#define DM_UEVENT_H
+enum dm_uevent_type {
+        DM_UEVENT_PATH_FAILED,
+        DM_UEVENT_PATH_REINSTATED,
+};
+#ifdef CONFIG_DM_UEVENT
+extern int dm_uevent_init(void);
+extern void dm_uevent_exit(void);
+extern void dm_send_uevents(struct list_head *events, struct kobject *kobj);
+extern void dm_path_uevent(enum dm_uevent_type event_type,
+                           struct dm_target *ti, const char *path,
+                           unsigned nr_valid_paths);
+#else
+static inline int dm_uevent_init(void)
+{
+        return 0;
+}
+static inline void dm_uevent_exit(void)
+{
+}
+static inline void dm_send_uevents(struct list_head *events,
+                                   struct kobject *kobj)
+{
+}
+static inline void dm_path_uevent(enum dm_uevent_type event_type,
+                                  struct dm_target *ti, const char *path,
+                                  unsigned nr_valid_paths)
+{
+}
+#endif  /* CONFIG_DM_UEVENT */
+#endif  /* DM_UEVENT_H */
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index d837d37f620..07cbbb8eb3e 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -7,6 +7,7 @@
 #include "dm.h"
 #include "dm-bio-list.h"
+#include "dm-uevent.h"
 #include <linux/init.h>
 #include <linux/module.h>
@@ -112,6 +113,9 @@ struct mapped_device {
         */
        atomic_t event_nr;
        wait_queue_head_t eventq;
+        atomic_t uevent_seq;
+        struct list_head uevent_list;
+        spinlock_t uevent_lock; /* Protect access to uevent_list */
        /*
         * freeze/thaw support require holding onto a super block
@@ -143,11 +147,19 @@ static int __init local_init(void)
                return -ENOMEM;
        }
+        r = dm_uevent_init();
+        if (r) {
+                kmem_cache_destroy(_tio_cache);
+                kmem_cache_destroy(_io_cache);
+                return r;
+        }
        _major = major;
        r = register_blkdev(_major, _name);
        if (r < 0) {
                kmem_cache_destroy(_tio_cache);
                kmem_cache_destroy(_io_cache);
+                dm_uevent_exit();
                return r;
        }
@@ -162,6 +174,7 @@ static void local_exit(void)
        kmem_cache_destroy(_tio_cache);
        kmem_cache_destroy(_io_cache);
        unregister_blkdev(_major, _name);
+        dm_uevent_exit();
        _major = 0;
@@ -751,15 +764,13 @@ static void __clone_and_map(struct clone_info *ci)
 /*
 * Split the bio into several clones.
 */
-static void __split_bio(struct mapped_device *md, struct bio *bio)
+static int __split_bio(struct mapped_device *md, struct bio *bio)
 {
        struct clone_info ci;
        ci.map = dm_get_table(md);
-        if (!ci.map) {
+        if (unlikely(!ci.map))
-                bio_io_error(bio);
+                return -EIO;
-                return;
-        }
        ci.md = md;
        ci.bio = bio;
@@ -779,6 +790,8 @@ static void __split_bio(struct mapped_device *md, struct bio *bio)
        /* drop the extra reference count */
        dec_pending(ci.io, 0);
        dm_table_put(ci.map);
+        return 0;
 }
 /*-----------------------------------------------------------------
 * CRUD END
@@ -790,7 +803,7 @@ static void __split_bio(struct mapped_device *md, struct bio *bio)
 */
 static int dm_request(struct request_queue *q, struct bio *bio)
 {
-        int r;
+        int r = -EIO;
        int rw = bio_data_dir(bio);
        struct mapped_device *md = q->queuedata;
@@ -815,18 +828,11 @@ static int dm_request(struct request_queue *q, struct bio *bio)
        while (test_bit(DMF_BLOCK_IO, &md->flags)) {
                up_read(&md->io_lock);
-                if (bio_rw(bio) == READA) {
+                if (bio_rw(bio) != READA)
-                        bio_io_error(bio);
+                        r = queue_io(md, bio);
-                        return 0;
-                }
-                r = queue_io(md, bio);
-                if (r < 0) {
-                        bio_io_error(bio);
-                        return 0;
-                } else if (r == 0)
+                if (r <= 0)
-                        return 0;       /* deferred successfully */
+                        goto out_req;
                /*
                 * We're in a while loop, because someone could suspend
@@ -835,8 +841,13 @@ static int dm_request(struct request_queue *q, struct bio *bio)
                down_read(&md->io_lock);
        }
-        __split_bio(md, bio);
+        r = __split_bio(md, bio);
        up_read(&md->io_lock);
+out_req:
+        if (r < 0)
+                bio_io_error(bio);
        return 0;
 }
@@ -977,6 +988,9 @@ static struct mapped_device *alloc_dev(int minor)
        atomic_set(&md->holders, 1);
        atomic_set(&md->open_count, 0);
        atomic_set(&md->event_nr, 0);
+        atomic_set(&md->uevent_seq, 0);
+        INIT_LIST_HEAD(&md->uevent_list);
+        spin_lock_init(&md->uevent_lock);
        md->queue = blk_alloc_queue(GFP_KERNEL);
        if (!md->queue)
@@ -1044,12 +1058,14 @@ static struct mapped_device *alloc_dev(int minor)
        return NULL;
 }
+static void unlock_fs(struct mapped_device *md);
 static void free_dev(struct mapped_device *md)
 {
        int minor = md->disk->first_minor;
        if (md->suspended_bdev) {
-                thaw_bdev(md->suspended_bdev, NULL);
+                unlock_fs(md);
                bdput(md->suspended_bdev);
        }
        mempool_destroy(md->tio_pool);
@@ -1073,8 +1089,16 @@ static void free_dev(struct mapped_device *md)
 */
 static void event_callback(void *context)
 {
+        unsigned long flags;
+        LIST_HEAD(uevents);
        struct mapped_device *md = (struct mapped_device *) context;
+        spin_lock_irqsave(&md->uevent_lock, flags);
+        list_splice_init(&md->uevent_list, &uevents);
+        spin_unlock_irqrestore(&md->uevent_lock, flags);
+        dm_send_uevents(&uevents, &md->disk->kobj);
        atomic_inc(&md->event_nr);
        wake_up(&md->eventq);
 }
@@ -1233,7 +1257,8 @@ static void __flush_deferred_io(struct mapped_device *md, struct bio *c)
        while (c) {
                n = c->bi_next;
                c->bi_next = NULL;
-                __split_bio(md, c);
+                if (__split_bio(md, c))
+                        bio_io_error(c);
                c = n;
        }
 }
@@ -1491,6 +1516,11 @@ out:
 /*-----------------------------------------------------------------
 * Event notification.
 *---------------------------------------------------------------*/
+uint32_t dm_next_uevent_seq(struct mapped_device *md)
+{
+        return atomic_add_return(1, &md->uevent_seq);
+}
 uint32_t dm_get_event_nr(struct mapped_device *md)
 {
        return atomic_read(&md->event_nr);
@@ -1502,6 +1532,15 @@ int dm_wait_event(struct mapped_device *md, int event_nr)
                        (event_nr != atomic_read(&md->event_nr)));
 }
+void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&md->uevent_lock, flags);
+        list_add(elist, &md->uevent_list);
+        spin_unlock_irqrestore(&md->uevent_lock, flags);
+}
 /*
 * The gendisk is only valid as long as you have a reference
 * count on 'md'.
diff --git a/drivers/md/kcopyd.c b/drivers/md/kcopyd.c
index 7e052378c47..f3831f31223 100644
--- a/drivers/md/kcopyd.c
+++ b/drivers/md/kcopyd.c
@@ -198,7 +198,7 @@ struct kcopyd_job {
         * These fields are only used if the job has been split
         * into more manageable parts.
         */
-        struct semaphore lock;
+        struct mutex lock;
        atomic_t sub_jobs;
        sector_t progress;
 };
@@ -456,7 +456,7 @@ static void segment_complete(int read_err,
        sector_t count = 0;
        struct kcopyd_job *job = (struct kcopyd_job *) context;
-        down(&job->lock);
+        mutex_lock(&job->lock);
        /* update the error */
        if (read_err)
@@ -480,7 +480,7 @@ static void segment_complete(int read_err,
                        job->progress += count;
                }
        }
-        up(&job->lock);
+        mutex_unlock(&job->lock);
        if (count) {
                int i;
@@ -562,7 +562,7 @@ int kcopyd_copy(struct kcopyd_client *kc, struct io_region *from,
                dispatch_job(job);
        else {
-                init_MUTEX(&job->lock);
+                mutex_init(&job->lock);
                job->progress = 0;
                split_job(job);
        }
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 16775a0df7f..85478d6a9c1 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -9,7 +9,7 @@
 *
 * Better read-balancing code written by Mika Kuoppala <miku@iki.fi>, 2000
 *
- * Fixes to reconstruction by Jakob �stergaard" <jakob@ostenfeld.dk>
+ * Fixes to reconstruction by Jakob Østergaard" <jakob@ostenfeld.dk>
 * Various fixes by Neil Brown <neilb@cse.unsw.edu.au>
 *
 * Changes by Peter T. Breuer <ptb@it.uc3m.es> 31/1/2003 to support
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
index d2905720eb7..9c905399a23 100644
--- a/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@ -312,7 +312,7 @@ static int sort_and_eliminate(u32* values, int* count)
                return -EINVAL;
        }
-        /* bubble sort the first �count� items of the array �values� */
+        /* bubble sort the first @count items of the array @values */
        for( top = *count; top > 0; top--) {
                for( low = 0, high = 1; high < top; low++, high++) {
                        if( values[low] > values[high] ) {
diff --git a/drivers/media/dvb/bt8xx/bt878.c b/drivers/media/dvb/bt8xx/bt878.c
index eca602d9b3d..85e36a1d6d7 100644
--- a/drivers/media/dvb/bt8xx/bt878.c
+++ b/drivers/media/dvb/bt8xx/bt878.c
@@ -280,7 +280,7 @@ static irqreturn_t bt878_irq(int irq, void *dev_id)
                if (!(astat = (stat & mask)))
                        return IRQ_NONE;        /* this interrupt is not for me */
 /*              dprintk("bt878(%d) debug: irq count %d, stat 0x%8.8x, mask 0x%8.8x\n",bt->nr,count,stat,mask); */
-                btwrite(astat, BT878_AINT_STAT);        /* try to clear interupt condition */
+                btwrite(astat, BT878_AINT_STAT);        /* try to clear interrupt condition */
                if (astat & (BT878_ASCERR | BT878_AOCERR)) {
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 154a7ce7cb8..a05e5c18228 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -1,5 +1,5 @@
 /*
- * TerraTec Cinergy T�/qanu USB2 DVB-T adapter.
+ * TerraTec Cinergy T��/qanu USB2 DVB-T adapter.
 *
 * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and
 *                  Holger Waechtler <holger@qanu.de>
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 288e79f2cb0..7902ae1d9a1 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -128,7 +128,7 @@ struct ttusb {
        struct dvb_frontend* fe;
 };
-/* ugly workaround ... don't know why it's neccessary to read */
+/* ugly workaround ... don't know why it's necessary to read */
 /* all result codes. */
 #define DEBUG 0
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index dd6a7d68b07..3abd9fa54d2 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -1259,7 +1259,7 @@ struct tvcard bttv_tvcards[] = {
                .has_radio      = 1,
        },
        [BTTV_BOARD_LIFETEC_9415] = {
-                /* Tim R�stermundt <rosterm@uni-muenster.de>
+                /* Tim Röstermundt <rosterm@uni-muenster.de>
                in de.comp.os.unix.linux.hardware:
                        options bttv card=0 pll=1 radio=1 gpiomask=0x18e0
                        gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff
@@ -2824,7 +2824,7 @@ struct tvcard bttv_tvcards[] = {
        },
                /* ---- card 0x8b ---------------------------------- */
        [BTTV_BOARD_PV_M4900] = {
-                /* S�rgio Fortier <sergiofortier@yahoo.com.br> */
+                /* Sérgio Fortier <sergiofortier@yahoo.com.br> */
                .name           = "Prolink PixelView PlayTV MPEG2 PV-M4900",
                .video_inputs   = 3,
                .audio_inputs   = 1,
@@ -4709,18 +4709,18 @@ adtvk503_audio(struct bttv *btv, struct video_audio *v, int set)
 *
 * The board hardwire Y0 (xpoint) to MUX1 and MUXOUT to Yin.
 * GPIO pins are wired as:
- *  GPIO[0:3] - AX[0:3] (xpoint) - P1[0:3] (microcontroler)
+ *  GPIO[0:3] - AX[0:3] (xpoint) - P1[0:3] (microcontroller)
- *  GPIO[4:6] - AY[0:2] (xpoint) - P1[4:6] (microcontroler)
+ *  GPIO[4:6] - AY[0:2] (xpoint) - P1[4:6] (microcontroller)
- *  GPIO[7]   - DATA (xpoint)    - P1[7] (microcontroler)
+ *  GPIO[7]   - DATA (xpoint)    - P1[7] (microcontroller)
- *  GPIO[8]   -                  - P3[5] (microcontroler)
+ *  GPIO[8]   -                  - P3[5] (microcontroller)
- *  GPIO[9]   - RESET (xpoint)   - P3[6] (microcontroler)
+ *  GPIO[9]   - RESET (xpoint)   - P3[6] (microcontroller)
- *  GPIO[10]  - STROBE (xpoint)  - P3[7] (microcontroler)
+ *  GPIO[10]  - STROBE (xpoint)  - P3[7] (microcontroller)
- *  GPINTR    -                  - P3[4] (microcontroler)
+ *  GPINTR    -                  - P3[4] (microcontroller)
 *
- * The microcontroler is a 80C32 like. It should be possible to change xpoint
+ * The microcontroller is a 80C32 like. It should be possible to change xpoint
- * configuration either directly (as we are doing) or using the microcontroler
+ * configuration either directly (as we are doing) or using the microcontroller
 * which is also wired to I2C interface. I have no further info on the
- * microcontroler features, one would need to disassembly the firmware.
+ * microcontroller features, one would need to disassembly the firmware.
 * note: the vendor refused to give any information on this product, all
 *       that stuff was found using a multimeter! :)
 */
@@ -4788,7 +4788,7 @@ static void tibetCS16_init(struct bttv *btv)
 * The analog switch is controlled by the "master", but the detection order
 * of the four BT878A chips is in an order which I just don't understand.
 * The "master" is actually the second controller to be detected.  The
- * logic on the board uses logical numbers for the 4 controlers, but
+ * logic on the board uses logical numbers for the 4 controllers, but
 * those numbers are different from the detection sequence.  When working
 * with the analog switch, we need to "map" from the detection sequence
 * over to the board's logical controller number.  This mapping sequence
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index b8d5327c438..e467682aabd 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -907,7 +907,7 @@ static int em28xx_set_fmt(struct em28xx *dev, unsigned int cmd, struct v4l2_form
        /* stop io in case it is already in progress */
        if (dev->stream == STREAM_ON) {
-                em28xx_videodbg("VIDIOC_SET_FMT: interupting stream\n");
+                em28xx_videodbg("VIDIOC_SET_FMT: interrupting stream\n");
                if ((ret = em28xx_stream_interrupt(dev)))
                        return ret;
        }
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 7533fc20331..69283926a8d 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
 *
- * Copyright (C) 2001-2002 Alc�ve <www.alcove.com>
+ * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
 *
 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
 *
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index 323d0074120..d535748df44 100644
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
 *
- * Copyright (C) 2001-2002 Alc�ve <www.alcove.com>
+ * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
 *
 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
 *
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c
index e20aa3612a7..ad0232935df 100644
--- a/drivers/media/video/saa5246a.c
+++ b/drivers/media/video/saa5246a.c
@@ -196,10 +196,10 @@ static int i2c_senddata(struct saa5246a_device *t, ...)
        return i2c_sendbuf(t, buf[0], ct-1, buf+1);
 }
-/* Get count number of bytes from I�C-device at address adr, store them in buf.
+/* Get count number of bytes from I��C-device at address adr, store them in buf.
 * Start & stop handshaking is done by this routine, ack will be sent after the
 * last byte to inhibit further sending of data. If uaccess is 'true', data is
- * written to user-space with put_user. Returns -1 if I�C-device didn't send
+ * written to user-space with put_user. Returns -1 if I��C-device didn't send
 * acknowledge, 0 otherwise
 */
 static int i2c_getdata(struct saa5246a_device *t, int count, u8 *buf)
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
index 17f1e2e9a66..94bb59a32b1 100644
--- a/drivers/media/video/saa5249.c
+++ b/drivers/media/video/saa5249.c
@@ -291,10 +291,10 @@ static int i2c_senddata(struct saa5249_device *t, ...)
        return i2c_sendbuf(t, buf[0], ct-1, buf+1);
 }
-/* Get count number of bytes from I�C-device at address adr, store them in buf. Start & stop
+/* Get count number of bytes from I��C-device at address adr, store them in buf. Start & stop
 * handshaking is done by this routine, ack will be sent after the last byte to inhibit further
 * sending of data. If uaccess is 'true', data is written to user-space with put_user.
- * Returns -1 if I�C-device didn't send acknowledge, 0 otherwise
+ * Returns -1 if I��C-device didn't send acknowledge, 0 otherwise
 */
 static int i2c_getdata(struct saa5249_device *t, int count, u8 *buf)
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index ff555129c82..db3c9e3deb2 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -955,7 +955,7 @@ read_frame(struct vicam_camera *cam, int framenum)
                request[7] = realShutter >> 8;
        }
-        // Per John Markus Bj�rndalen, byte at index 8 causes problems if it isn't 0
+        // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0
        request[8] = 0;
        // bytes 9-15 do not seem to affect exposure or image quality
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index c3440b280d2..321249240d0 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -37,7 +37,7 @@
 * Video4linux 1/2 integration by Justin Schoeman
 * <justin@suntiger.ee.up.ac.za>
 * 2.4 PROCFS support ported from 2.4 kernels by
- *  I�aki Garc�a Etxebarria <garetxe@euskalnet.net>
+ *  Iñaki García Etxebarria <garetxe@euskalnet.net>
 * Makefile fix by "W. Michael Petullo" <mike@flyn.org>
 * 2.4 devfs support ported from 2.4 kernels by
 *  Dan Merillat <dan@merillat.org>
diff --git a/drivers/message/i2o/README b/drivers/message/i2o/README
index a81f851f7b5..911fc3021e3 100644
--- a/drivers/message/i2o/README
+++ b/drivers/message/i2o/README
@@ -30,13 +30,13 @@ Juha Sievanen, University of Helsinki Finland
        Bug fixes
        Core code extensions
-Auvo H�kkinen, University of Helsinki Finland
+Auvo Häkkinen, University of Helsinki Finland
        LAN OSM code
        /Proc interface to LAN class
        Bug fixes
        Core code extensions
-Taneli V�h�kangas, University of Helsinki Finland
+Taneli Vähäkangas, University of Helsinki Finland
        Fixes to i2o_config
 CREDITS
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index ce8f1a34ed2..6cbcc21de51 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -15,8 +15,8 @@
 *
 *      Fixes/additions:
 *              Philipp Rumpf
- *              Juha Siev�nen <Juha.Sievanen@cs.Helsinki.FI>
+ *              Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
- *              Auvo H�kkinen <Auvo.Hakkinen@cs.Helsinki.FI>
+ *              Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
 *              Deepak Saxena <deepak@plexity.net>
 *              Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
 *              Alan Cox <alan@redhat.com>:
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 84e046e94f5..c0fb77dc19b 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -10,12 +10,12 @@
 *              Added basic ioctl() support
 *      Deepak Saxena (06/07/1999):
 *              Added software download ioctl (still testing)
- *      Auvo H�kkinen (09/10/1999):
+ *      Auvo Häkkinen (09/10/1999):
 *              Changes to i2o_cfg_reply(), ioctl_parms()
 *              Added ioct_validate()
- *      Taneli V�h�kangas (09/30/1999):
+ *      Taneli Vähäkangas (09/30/1999):
 *              Fixed ioctl_swdl()
- *      Taneli V�h�kangas (10/04/1999):
+ *      Taneli Vähäkangas (10/04/1999):
 *              Changed ioctl_swdl(), implemented ioctl_swul() and ioctl_swdel()
 *      Deepak Saxena (11/18/1999):
 *              Added event managmenet support
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 06892ac2286..6fdd072201f 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -19,8 +19,8 @@
 *
 *
 *      Fixes/additions:
- *              Juha Siev�nen (Juha.Sievanen@cs.Helsinki.FI),
+ *              Juha Sievänen (Juha.Sievanen@cs.Helsinki.FI),
- *              Auvo H�kkinen (Auvo.Hakkinen@cs.Helsinki.FI)
+ *              Auvo Häkkinen (Auvo.Hakkinen@cs.Helsinki.FI)
 *              University of Helsinki, Department of Computer Science
 *                      LAN entries
 *              Markus Lidel <Markus.Lidel@shadowconnect.com>
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index a1ec16a075c..7814a06ae97 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -15,8 +15,8 @@
 *
 *      Fixes/additions:
 *              Philipp Rumpf
- *              Juha Siev�nen <Juha.Sievanen@cs.Helsinki.FI>
+ *              Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
- *              Auvo H�kkinen <Auvo.Hakkinen@cs.Helsinki.FI>
+ *              Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
 *              Deepak Saxena <deepak@plexity.net>
 *              Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
 *              Alan Cox <alan@redhat.com>:
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 3661e6e065d..685a89547a5 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -15,8 +15,8 @@
 *
 *      Fixes/additions:
 *              Philipp Rumpf
- *              Juha Siev�nen <Juha.Sievanen@cs.Helsinki.FI>
+ *              Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
- *              Auvo H�kkinen <Auvo.Hakkinen@cs.Helsinki.FI>
+ *              Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
 *              Deepak Saxena <deepak@plexity.net>
 *              Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
 *              Alan Cox <alan@redhat.com>:
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index a20a51efe11..25716193a53 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -10,8 +10,8 @@ config MFD_SM501
         ---help---
          This is the core driver for the Silicon Motion SM501 multimedia
          companion chip. This device is a multifunction device which may
-          provide numerous interfaces including USB host controller USB gadget,
+          provide numerous interfaces including USB host controller, USB gadget,
-          Asyncronous Serial ports, Audio functions and a dual display video
+          asynchronous serial ports, audio functions, and a dual display video
          interface. The device may be connected by PCI or local bus with
          varying functions enabled.
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index cf02ddc3436..b5e67c0ff43 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -180,7 +180,7 @@ config THINKPAD_ACPI
          For more information about this driver see 
          <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> .
-          This driver was formely known as ibm-acpi.
+          This driver was formerly known as ibm-acpi.
          If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
@@ -214,7 +214,7 @@ config THINKPAD_ACPI_BAY
        default y
        ---help---
          Allows the thinkpad_acpi driver to handle removable bays.  It will
-          eletrically disable the device in the bay, and also generate
+          electrically disable the device in the bay, and also generate
          notifications when the bay lever is ejected or inserted.
          If you are not sure, say Y here.
diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 1d9defb1a10..477bb43c899 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/drivers/misc/ibmasm/remote.c
@@ -17,7 +17,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Authors: Max Asb�ck <amax@us.ibm.com>
+ * Authors: Max Asböck <amax@us.ibm.com>
 *          Vernon Mauery <vernux@us.ibm.com>
 *
 */
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 1bfbb87e579..bb13858f60a 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -14,7 +14,7 @@
 *
 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
 *
- * Copyright (C) 2001-2002 Alc�ve <www.alcove.com>
+ * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
 *
 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
 *
@@ -277,7 +277,7 @@ static void do_sony_laptop_release_key(struct work_struct *work)
 static DECLARE_WORK(sony_laptop_release_key_work,
                do_sony_laptop_release_key);
-/* forward event to the input subsytem */
+/* forward event to the input subsystem */
 static void sony_laptop_report_input_event(u8 event)
 {
        struct input_dev *jog_dev = sony_laptop_input.jog_dev;
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 2a2a125b0c7..a592fc04cf7 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -54,7 +54,7 @@ config MTD_PHYSMAP_BANKWIDTH
        help
          This is the total width of the data bus of the flash devices
          in octets. For example, if you have a data bus width of 32
-          bits, you would set the bus width octect value to 4. This is
+          bits, you would set the bus width octet value to 4. This is
          used internally by the CFI drivers.
          Ignore this option if you use run-time physmap configuration
          (i.e., run-time calling physmap_configure()).
@@ -73,12 +73,12 @@ config MTD_PMC_MSP_EVM
        depends on PMC_MSP && MTD_CFI
        select MTD_PARTITIONS
        help
-          This provides a 'mapping' driver which support the way
+          This provides a 'mapping' driver which supports the way
-          in which user-programmable flash chips are connected on the
+          in which user-programmable flash chips are connected on the
-          PMC-Sierra MSP eval/demo boards
+          PMC-Sierra MSP eval/demo boards.
 choice
-        prompt "Maximum mappable memory avialable for flash IO"
+        prompt "Maximum mappable memory available for flash IO"
        depends on MTD_PMC_MSP_EVM
        default MSP_FLASH_MAP_LIMIT_32M
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 973b684c11e..eef6fecfff2 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -73,7 +73,7 @@
                Jean-Jacques Michel - bug fix
-                Tobias Ringstr�m - Rx interrupt status checking suggestion
+                Tobias Ringström - Rx interrupt status checking suggestion
                Andrew Morton - Clear blocked signals, avoid
                buffer overrun setting current->comm.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 83d52c8acab..ce34b539bf3 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -855,7 +855,7 @@ config BFIN_MAC_USE_L1
        depends on BFIN_MAC && BF537
        default y
        help
-          To get maximum network performace, you should use L1 memory as rx/tx buffers.
+          To get maximum network performance, you should use L1 memory as rx/tx buffers.
          Say N here if you want to reserve L1 memory for other uses.
 config BFIN_TX_DESC_NUM
@@ -1293,9 +1293,6 @@ config PCNET32_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config AMD8111_ETH
@@ -1313,7 +1310,7 @@ config AMD8111_ETH
          will be called amd8111e.
 config AMD8111E_NAPI
-        bool "Enable NAPI support"
+        bool "Use RX polling (NAPI)"
        depends on AMD8111_ETH
        help
          NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -1324,9 +1321,6 @@ config AMD8111E_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config ADAPTEC_STARFIRE
@@ -1355,9 +1349,6 @@ config ADAPTEC_STARFIRE_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config AC3200
@@ -1431,7 +1422,7 @@ config FORCEDETH
          called forcedeth.
 config FORCEDETH_NAPI
-        bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"
+        bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
        depends on FORCEDETH && EXPERIMENTAL
        help
          NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -1442,9 +1433,6 @@ config FORCEDETH_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config CS89x0
@@ -1756,9 +1744,6 @@ config VIA_RHINE_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
 config LAN_SAA9730
        bool "Philips SAA9730 Ethernet support"
        depends on NET_PCI && PCI && MIPS_ATLAS
@@ -2003,9 +1988,6 @@ config E1000_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config E1000_DISABLE_PACKET_SPLIT
@@ -2099,7 +2081,7 @@ config R8169
          will be called r8169.  This is recommended.
 config R8169_NAPI
-        bool "Use Rx and Tx Polling (NAPI) (EXPERIMENTAL)"
+        bool "Use Rx Polling (NAPI) (EXPERIMENTAL)"
        depends on R8169 && EXPERIMENTAL
        help
          NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -2110,9 +2092,6 @@ config R8169_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config R8169_VLAN
@@ -2364,7 +2343,7 @@ config GIANFAR
          and MPC86xx family of chips, and the FEC on the 8540.
 config GFAR_NAPI
-        bool "NAPI Support"
+        bool "Use Rx Polling (NAPI)"
        depends on GIANFAR
 config UCC_GETH
@@ -2376,7 +2355,7 @@ config UCC_GETH
          which is available on some Freescale SOCs.
 config UGETH_NAPI
-        bool "NAPI Support"
+        bool "Use Rx Polling (NAPI)"
        depends on UCC_GETH
 config UGETH_MAGIC_PACKET
@@ -2494,7 +2473,7 @@ config CHELSIO_T3
 config EHEA
        tristate "eHEA Ethernet support"
-        depends on IBMEBUS
+        depends on IBMEBUS && INET
        select INET_LRO
        ---help---
          This driver supports the IBM pSeries eHEA ethernet adapter.
@@ -2559,9 +2538,6 @@ config IXGB_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config S2IO
@@ -2584,14 +2560,11 @@ config S2IO_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config MYRI10GE
        tristate "Myricom Myri-10G Ethernet support"
-        depends on PCI
+        depends on PCI && INET
        select FW_LOADER
        select CRC32
        select INET_LRO
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 1cc74ec88a5..eebf5bb2b03 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1111,7 +1111,7 @@ static struct net_device_stats *amd8111e_get_stats(struct net_device * dev)
        return new_stats;
 }
-/* This function recalculate the interupt coalescing  mode on every interrupt
+/* This function recalculate the interrupt coalescing  mode on every interrupt
 according to the datarate and the packet rate.
 */
 static int amd8111e_calc_coalesce(struct net_device *dev)
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 3fa3bccd1ad..10f3a196be3 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -1,7 +1,7 @@
 /*
 *  Amiga Linux/m68k Ariadne Ethernet Driver
 *
- *  � Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
+ *  �� Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
 *                           Peter De Schrijver (p2@mind.be)
 *
 *  ---------------------------------------------------------------------------
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h
index f7913d5a39f..bb613f292e0 100644
--- a/drivers/net/ariadne.h
+++ b/drivers/net/ariadne.h
@@ -1,7 +1,7 @@
 /*
 *  Amiga Linux/m68k Ariadne Ethernet Driver
 *
- *  � Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org)
+ *  �� Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org)
 *                      Peter De Schrijver
 *                     (Peter.DeSchrijver@linux.cc.kuleuven.ac.be)
 *
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c
index 185f98e3964..504b7ce2747 100644
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -542,7 +542,7 @@ static struct {
 static int num_ifs;
 /*
- * Setup the base address and interupt of the Au1xxx ethernet macs
+ * Setup the base address and interrupt of the Au1xxx ethernet macs
 * based on cpu type and whether the interface is enabled in sys_pinfunc
 * register. The last interface is enabled if SYS_PF_NI2 (bit 4) is 0.
 */
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 80c0c8c415e..855dc10ffa1 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -55,7 +55,7 @@ static int expected_refcount = -1;
 static struct class *netdev_class;
 /*--------------------------- Data Structures -----------------------------*/
-/* Bonding sysfs lock.  Why can't we just use the subsytem lock?
+/* Bonding sysfs lock.  Why can't we just use the subsystem lock?
 * Because kobject_register tries to acquire the subsystem lock.  If
 * we already hold the lock (which we would if the user was creating
 * a new bond through the sysfs interface), we deadlock.
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 27ac010900a..3286d2a0a87 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -542,7 +542,8 @@ dm9000_probe(struct platform_device *pdev)
        if (id_val != DM9000_ID) {
                printk("%s: wrong id: 0x%08x\n", CARDNAME, id_val);
-                goto release;
+                ret = -ENODEV;
+                goto out;
        }
        /* from this point we assume that we have found a DM9000 */
@@ -602,8 +603,7 @@ dm9000_probe(struct platform_device *pdev)
        }
        return 0;
- release:
+out:
- out:
        printk("%s: not found (%d).\n", CARDNAME, ret);
        dm9000_release_board(pdev, db);
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 64f35e20fd4..3dbaec680b4 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1324,7 +1324,7 @@ static inline int e100_exec_cb_wait(struct nic *nic, struct sk_buff *skb,
                if (!--counter) break;
        }
-        /* ack any interupts, something could have been set */
+        /* ack any interrupts, something could have been set */
        iowrite8(~0, &nic->csr->scb.stat_ack);
        /* if the command failed, or is not OK, notify and return */
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 047263830e6..f1ce348470c 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3590,7 +3590,7 @@ e1000_update_stats(struct e1000_adapter *adapter)
        spin_lock_irqsave(&adapter->stats_lock, flags);
-        /* these counters are modified from e1000_adjust_tbi_stats,
+        /* these counters are modified from e1000_tbi_adjust_stats,
         * called from the interrupt context, so they must only
         * be written while holding adapter->stats_lock
         */
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index 43f7647ff24..7bb9c728a1d 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -111,7 +111,6 @@ MODULE_AUTHOR("Myson or whoever");
 MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver");
 MODULE_LICENSE("GPL");
 module_param(max_interrupt_work, int, 0);
-//MODULE_PARM(min_pci_latency, "i");
 module_param(debug, int, 0);
 module_param(rx_copybreak, int, 0);
 module_param(multicast_filter_limit, int, 0);
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index ad9e327c3b0..e0119f6a331 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -3,7 +3,7 @@
 *              devices like TTY. It interfaces between a raw TTY and the
 *              kernel's AX.25 protocol layers.
 *
- * Authors:     Andreas K�nsgen <ajk@iehk.rwth-aachen.de>
+ * Authors:     Andreas Könsgen <ajk@iehk.rwth-aachen.de>
 *              Ralf Baechle DL5RB <ralf@linux-mips.org>
 *
 * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by
diff --git a/drivers/net/hamradio/Kconfig b/drivers/net/hamradio/Kconfig
index 36d2c7d4f4d..62d5d5cfd6a 100644
--- a/drivers/net/hamradio/Kconfig
+++ b/drivers/net/hamradio/Kconfig
@@ -64,7 +64,7 @@ config DMASCC
          dmascc. If you don't pass any parameter to the driver, all
          possible I/O addresses are probed. This could irritate other devices
          that are currently not in use. You may specify the list of addresses
-          to be probed by "dmascc=addr1,addr2,..." (when compiled into the
+          to be probed by "dmascc.io=addr1,addr2,..." (when compiled into the
          kernel image) or "io=addr1,addr2,..." (when loaded as a module). The
          network interfaces will be called dmascc0 and dmascc1 for the board
          detected first, dmascc2 and dmascc3 for the second one, and so on.
diff --git a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c
index ccf6ec548a6..736d2473b7e 100644
--- a/drivers/net/irda/actisys-sir.c
+++ b/drivers/net/irda/actisys-sir.c
@@ -21,7 +21,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c
index b2e31f4a384..ae0b80a5680 100644
--- a/drivers/net/irda/actisys.c
+++ b/drivers/net/irda/actisys.c
@@ -19,7 +19,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index a82d8f98383..1257e1a7e81 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -595,7 +595,7 @@ toshoboe_startchip (struct toshoboe_cb *self)
  OUTB ((physaddr >> 18) & 0xff, OBOE_RING_BASE1);
  OUTB ((physaddr >> 26) & 0x3f, OBOE_RING_BASE2);
-  /*Enable DMA controler in byte mode and RX */
+  /*Enable DMA controller in byte mode and RX */
  OUTB (CONFIG0H_DMA_ON, OBOE_CONFIG0H);
  /* Start up the clocks */
diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c
index 0d2fe87fb9b..738531b16bd 100644
--- a/drivers/net/irda/girbil-sir.c
+++ b/drivers/net/irda/girbil-sir.c
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of
 *     the License, or (at your option) any later version.
 * 
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is
 *     provided "AS-IS" and at no charge.
 *
diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c
index 248aeb0c726..1f57391a618 100644
--- a/drivers/net/irda/girbil.c
+++ b/drivers/net/irda/girbil.c
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h
index 3f46b84c6c8..66fc2433e97 100644
--- a/drivers/net/irda/irport.h
+++ b/drivers/net/irda/irport.h
@@ -17,7 +17,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 6f5f697ec9f..2c6f7be36e8 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -20,7 +20,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 12b9378c587..a873d2b315c 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -20,7 +20,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h
index dacf671abcd..bbdc97ff83c 100644
--- a/drivers/net/irda/nsc-ircc.h
+++ b/drivers/net/irda/nsc-ircc.h
@@ -19,7 +19,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/drivers/net/irda/tekram-sir.c b/drivers/net/irda/tekram-sir.c
index 0dd6bc7af3f..d1ce5ae6a17 100644
--- a/drivers/net/irda/tekram-sir.c
+++ b/drivers/net/irda/tekram-sir.c
@@ -18,7 +18,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c
index 8f6258221cb..9bfd2441adb 100644
--- a/drivers/net/irda/tekram.c
+++ b/drivers/net/irda/tekram.c
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/drivers/net/irda/w83977af_ir.h b/drivers/net/irda/w83977af_ir.h
index 0b7661deafe..87c3975baf6 100644
--- a/drivers/net/irda/w83977af_ir.h
+++ b/drivers/net/irda/w83977af_ir.h
@@ -16,7 +16,7 @@
 *     published by the Free Software Foundation; either version 2 of 
 *     the License, or (at your option) any later version.
 *  
- *     Neither Dag Brattli nor University of Troms� admit liability nor
+ *     Neither Dag Brattli nor University of Tromsø admit liability nor
 *     provide warranty for any of this software. This material is 
 *     provided "AS-IS" and at no charge.
 *     
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 50e1ec67ef9..953117152bb 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -996,7 +996,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
   a delay.  Note that pre-2.0.34 kernels had a cache-alignment bug that
   made udelay() unreliable.
   The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
-   depricated.
+   deprecated.
 */
 #define eeprom_delay(ee_addr)   readl(ee_addr)
diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
index 8cd243d92af..2747b1f89ff 100644
--- a/drivers/net/phy/mdio-bitbang.c
+++ b/drivers/net/phy/mdio-bitbang.c
@@ -185,3 +185,5 @@ void free_mdio_bitbang(struct mii_bus *bus)
        module_put(ctrl->ops->owner);
        kfree(bus);
 }
+MODULE_LICENSE("GPL");
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 7c60df46fc6..dd18af0ce67 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -1223,7 +1223,7 @@ static irqreturn_t smc911x_interrupt(int irq, void *dev_id)
                }
 #endif
-                /* Handle PHY interupt condition */
+                /* Handle PHY interrupt condition */
                if (status & INT_STS_PHY_INT_) {
                        DBG(SMC_DEBUG_MISC, "%s: PHY irq\n", dev->name);
                        smc911x_phy_interrupt(dev);
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 571060a3c91..bccae7e5c6a 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1639,7 +1639,7 @@ spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg)
 /**
 * spider_net_interrupt - interrupt handler for spider_net
- * @irq: interupt number
+ * @irq: interrupt number
 * @ptr: pointer to net_device
 * @regs: PU registers
 *
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 8038f2882c9..d887c05588d 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -1654,7 +1654,7 @@ tc35815_rx(struct net_device *dev)
                                        panic_queues(dev);
                                }
 #endif
-                                /* pass BD to controler */
+                                /* pass BD to controller */
 #ifndef TC35815_USE_PACKEDBUFFER
                                if (!lp->rx_skbs[curid].skb) {
                                        lp->rx_skbs[curid].skb =
@@ -1694,7 +1694,7 @@ tc35815_rx(struct net_device *dev)
                }
 #endif
                for (i = 0; i < (bd_count + 1) / 2 + 1; i++) {
-                        /* pass FD to controler */
+                        /* pass FD to controller */
 #ifdef DEBUG
                        lp->rfd_cur->fd.FDNext = cpu_to_le32(0xdeaddead);
 #else
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index df10af7df7b..35d15e85007 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -1629,7 +1629,7 @@ tsi108_init_one(struct platform_device *pdev)
                goto register_fail;
        }
-        printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n"
+        printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n",
               dev->name, print_mac(mac, dev->dev_addr));
 #ifdef DEBUG
        data->msg_enable = DEBUG;
diff --git a/drivers/net/tulip/Kconfig b/drivers/net/tulip/Kconfig
index 1c537d5a306..49d7a290dbb 100644
--- a/drivers/net/tulip/Kconfig
+++ b/drivers/net/tulip/Kconfig
@@ -67,7 +67,7 @@ config TULIP_MMIO
          If in doubt, say N.
 config TULIP_NAPI
-        bool "Use NAPI RX polling "
+        bool "Use RX polling (NAPI)"
        depends on TULIP
        help
          NAPI is a new driver API designed to reduce CPU and interrupt load
@@ -78,18 +78,16 @@ config TULIP_NAPI
          deployed on potentially unfriendly networks (e.g. in a firewall),
          then say Y here.
-          See <file:Documentation/networking/NAPI_HOWTO.txt> for more
-          information.
          If in doubt, say N.
 config TULIP_NAPI_HW_MITIGATION
-        bool "Use Interrupt Mitigation "
+        bool "Use Interrupt Mitigation"
        depends on TULIP_NAPI
        ---help---
-          Use HW to reduce RX interrupts. Not strict necessary since NAPI reduces
+          Use HW to reduce RX interrupts. Not strictly necessary since NAPI
-          RX interrupts but itself. Although this reduces RX interrupts even at
+          reduces RX interrupts by itself. Interrupt mitigation reduces RX
-          low levels traffic at the cost of a small latency.
+          interrupts even at low levels of traffic at the cost of a small
+          latency.
          If in doubt, say Y.
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 3c8e3b63be0..35d0cfcf8c4 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -483,7 +483,7 @@ err_out_netdev:
   a delay.  Note that pre-2.0.34 kernels had a cache-alignment bug that
   made udelay() unreliable.
   The old method of using an ISA access as a delay, __SLOW_DOWN_IO__, is
-   depricated.
+   deprecated.
 */
 #define eeprom_delay(ee_addr)   ioread32(ee_addr)
diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index 8dc09a3790c..5a96d74e4ce 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -71,7 +71,7 @@ config USB_PEGASUS
        select MII
        ---help---
          Say Y here if you know you have Pegasus or Pegasus-II based adapter.
-          If in doubt then look at <file:drivers/usb/net/pegasus.h> for the
+          If in doubt then look at <file:drivers/net/usb/pegasus.h> for the
          complete list of supported devices.
          If your particular adapter is not in the list and you are _sure_ it
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 4ae05799ac4..5c4a92de9a0 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -1648,7 +1648,7 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx)
 *
 *      Scan the queues looking for transmitted packets that
 *      we can complete and clean up. Update any statistics as
- *      neccessary/
+ *      necessary/
 */
 static int velocity_tx_srv(struct velocity_info *vptr, u32 status)
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c141a264ac4..9d9ff76a9bc 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -49,7 +49,6 @@
 #include "pio.h"
 #include "sysfs.h"
 #include "xmit.h"
-#include "sysfs.h"
 #include "lo.h"
 #include "pcmcia.h"
@@ -3495,7 +3494,7 @@ static int b43_start(struct ieee80211_hw *hw)
        struct b43_wl *wl = hw_to_b43_wl(hw);
        struct b43_wldev *dev = wl->current_dev;
        int did_init = 0;
-        int err;
+        int err = 0;
        mutex_lock(&wl->mutex);
@@ -3521,7 +3520,7 @@ static int b43_start(struct ieee80211_hw *hw)
        return err;
 }
-void b43_stop(struct ieee80211_hw *hw)
+static void b43_stop(struct ieee80211_hw *hw)
 {
        struct b43_wl *wl = hw_to_b43_wl(hw);
        struct b43_wldev *dev = wl->current_dev;
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c
index f0749510bcd..d09479e816c 100644
--- a/drivers/net/wireless/b43legacy/main.c
+++ b/drivers/net/wireless/b43legacy/main.c
@@ -3306,7 +3306,7 @@ static int b43legacy_start(struct ieee80211_hw *hw)
        struct b43legacy_wl *wl = hw_to_b43legacy_wl(hw);
        struct b43legacy_wldev *dev = wl->current_dev;
        int did_init = 0;
-        int err;
+        int err = 0;
        mutex_lock(&wl->mutex);
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
index 9ecf2bf0d25..47c135a7f4d 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_xmit.h
@@ -87,7 +87,7 @@ void bcm43xx_generate_txhdr(struct bcm43xx_private *bcm,
 /* RX header as received from the hardware. */
 struct bcm43xx_rxhdr {
-        /* Frame Length. Must be generated explicitely in PIO mode. */
+        /* Frame Length. Must be generated explicitly in PIO mode. */
        __le16 frame_length;
        PAD_BYTES(2);
        /* Flags field 1 */
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index c144e3cdb89..a6c7904de28 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -2089,12 +2089,46 @@ static void isr_indicate_rf_kill(struct ipw2100_priv *priv, u32 status)
        queue_delayed_work(priv->workqueue, &priv->rf_kill, round_jiffies(HZ));
 }
+static void send_scan_event(void *data)
+{
+        struct ipw2100_priv *priv = data;
+        union iwreq_data wrqu;
+        wrqu.data.length = 0;
+        wrqu.data.flags = 0;
+        wireless_send_event(priv->net_dev, SIOCGIWSCAN, &wrqu, NULL);
+}
+static void ipw2100_scan_event_later(struct work_struct *work)
+{
+        send_scan_event(container_of(work, struct ipw2100_priv,
+                                        scan_event_later.work));
+}
+static void ipw2100_scan_event_now(struct work_struct *work)
+{
+        send_scan_event(container_of(work, struct ipw2100_priv,
+                                        scan_event_now));
+}
 static void isr_scan_complete(struct ipw2100_priv *priv, u32 status)
 {
        IPW_DEBUG_SCAN("scan complete\n");
        /* Age the scan results... */
        priv->ieee->scans++;
        priv->status &= ~STATUS_SCANNING;
+        /* Only userspace-requested scan completion events go out immediately */
+        if (!priv->user_requested_scan) {
+                if (!delayed_work_pending(&priv->scan_event_later))
+                        queue_delayed_work(priv->workqueue,
+                                        &priv->scan_event_later,
+                                        round_jiffies(msecs_to_jiffies(4000)));
+        } else {
+                priv->user_requested_scan = 0;
+                cancel_delayed_work(&priv->scan_event_later);
+                queue_work(priv->workqueue, &priv->scan_event_now);
+        }
 }
 #ifdef CONFIG_IPW2100_DEBUG
@@ -4349,6 +4383,7 @@ static void ipw2100_kill_workqueue(struct ipw2100_priv *priv)
                cancel_delayed_work(&priv->wx_event_work);
                cancel_delayed_work(&priv->hang_check);
                cancel_delayed_work(&priv->rf_kill);
+                cancel_delayed_work(&priv->scan_event_later);
                destroy_workqueue(priv->workqueue);
                priv->workqueue = NULL;
        }
@@ -6012,7 +6047,7 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
         * ends up causing problems.  So, we just handle
         * the WX extensions through the ipw2100_ioctl interface */
-        /* memset() puts everything to 0, so we only have explicitely set
+        /* memset() puts everything to 0, so we only have explicitly set
         * those values that need to be something else */
        /* If power management is turned on, default to AUTO mode */
@@ -6092,6 +6127,8 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
        INIT_DELAYED_WORK(&priv->wx_event_work, ipw2100_wx_event_work);
        INIT_DELAYED_WORK(&priv->hang_check, ipw2100_hang_check);
        INIT_DELAYED_WORK(&priv->rf_kill, ipw2100_rf_kill);
+        INIT_WORK(&priv->scan_event_now, ipw2100_scan_event_now);
+        INIT_DELAYED_WORK(&priv->scan_event_later, ipw2100_scan_event_later);
        tasklet_init(&priv->irq_tasklet, (void (*)(unsigned long))
                     ipw2100_irq_tasklet, (unsigned long)priv);
@@ -7396,6 +7433,8 @@ static int ipw2100_wx_set_scan(struct net_device *dev,
        }
        IPW_DEBUG_WX("Initiating scan...\n");
+        priv->user_requested_scan = 1;
        if (ipw2100_set_scan_options(priv) || ipw2100_start_scan(priv)) {
                IPW_DEBUG_WX("Start scan failed.\n");
@@ -7470,7 +7509,7 @@ static int ipw2100_wx_set_power(struct net_device *dev,
        switch (wrqu->power.flags & IW_POWER_MODE) {
        case IW_POWER_ON:       /* If not specified */
        case IW_POWER_MODE:     /* If set all mask */
-        case IW_POWER_ALL_R:    /* If explicitely state all */
+        case IW_POWER_ALL_R:    /* If explicitly state all */
                break;
        default:                /* Otherwise we don't support it */
                IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h
index 2b8be2418fa..bbf1ddcafba 100644
--- a/drivers/net/wireless/ipw2100.h
+++ b/drivers/net/wireless/ipw2100.h
@@ -586,6 +586,10 @@ struct ipw2100_priv {
        struct delayed_work wx_event_work;
        struct delayed_work hang_check;
        struct delayed_work rf_kill;
+        struct work_struct scan_event_now;
+        struct delayed_work scan_event_later;
+        int user_requested_scan;
        u32 interrupts;
        int tx_interrupts;
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index feb8fcbab2d..e3c828401b9 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -9603,7 +9603,7 @@ static int ipw_wx_set_power(struct net_device *dev,
        switch (wrqu->power.flags & IW_POWER_MODE) {
        case IW_POWER_ON:       /* If not specified */
        case IW_POWER_MODE:     /* If set all mask */
-        case IW_POWER_ALL_R:    /* If explicitely state all */
+        case IW_POWER_ALL_R:    /* If explicitly state all */
                break;
        default:                /* Otherwise we don't support it */
                IPW_DEBUG_WX("SET PM Mode: %X not supported.\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index f4aabcf480e..262ab0b5582 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -37,9 +37,6 @@
 #include <linux/workqueue.h>
-#include <net/mac80211.h>
-#include <linux/wireless.h>
 #define IWL 3945
 #include "../net/mac80211/ieee80211_rate.h"
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index acb38750535..19bcb01e278 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -38,7 +38,6 @@
 #include <net/mac80211.h>
 #include <linux/etherdevice.h>
-#include <linux/delay.h>
 #define IWL 3945
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 287c75705c4..8dc78c0bf1f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -36,9 +36,6 @@
 #include <linux/workqueue.h>
-#include <net/mac80211.h>
-#include <linux/wireless.h>
 #define IWL 4965
 #include "../net/mac80211/ieee80211_rate.h"
@@ -2024,12 +2021,18 @@ static int open_file_generic(struct inode *inode, struct file *file)
 static void rs_dbgfs_set_mcs(struct iwl_rate_scale_priv *rs_priv,
                                struct iwl_rate *mcs, int index)
 {
-        const u32 cck_rate = 0x820A;
+        u32 base_rate;
+        if (rs_priv->phymode == (u8) MODE_IEEE80211A)
+                base_rate = 0x800D;
+        else
+                base_rate = 0x820A;
        if (rs_priv->dbg_fixed.rate_n_flags) {
                if (index < 12)
                        mcs->rate_n_flags = rs_priv->dbg_fixed.rate_n_flags;
                else
-                        mcs->rate_n_flags = cck_rate;
+                        mcs->rate_n_flags = base_rate;
                IWL_DEBUG_RATE("Fixed rate ON\n");
                return;
        }
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index b50d20267c8..557deebca1b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -35,9 +35,7 @@
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <net/mac80211.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
-#include <linux/delay.h>
 #define IWL 4965
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 75e3b5c3f15..83019d1d7cc 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -48,8 +48,6 @@
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <linux/firmware.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
@@ -1749,21 +1747,22 @@ static void iwl_unset_hw_setting(struct iwl_priv *priv)
 * return : set the bit for each supported rate insert in ie
 */
 static u16 iwl_supported_rate_to_ie(u8 *ie, u16 supported_rate,
-                                    u16 basic_rate, int max_count)
+                                    u16 basic_rate, int *left)
 {
        u16 ret_rates = 0, bit;
        int i;
-        u8 *rates;
+        u8 *cnt = ie;
+        u8 *rates = ie + 1;
-        rates = &(ie[1]);
        for (bit = 1, i = 0; i < IWL_RATE_COUNT; i++, bit <<= 1) {
                if (bit & supported_rate) {
                        ret_rates |= bit;
-                        rates[*ie] = iwl_rates[i].ieee |
+                        rates[*cnt] = iwl_rates[i].ieee |
-                            ((bit & basic_rate) ? 0x80 : 0x00);
+                                ((bit & basic_rate) ? 0x80 : 0x00);
-                        *ie = *ie + 1;
+                        (*cnt)++;
-                        if (*ie >= max_count)
+                        (*left)--;
+                        if ((*left <= 0) ||
+                            (*cnt >= IWL_SUPPORTED_RATES_IE_LEN))
                                break;
                }
        }
@@ -1780,7 +1779,7 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
 {
        int len = 0;
        u8 *pos = NULL;
-        u16 ret_rates;
+        u16 active_rates, ret_rates, cck_rates;
        /* Make sure there is enough space for the probe request,
         * two mandatory IEs and the data */
@@ -1825,19 +1824,27 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
        left -= 2;
        if (left < 0)
                return 0;
        /* ... fill it in... */
        *pos++ = WLAN_EID_SUPP_RATES;
        *pos = 0;
-        ret_rates = priv->active_rate = priv->rates_mask;
+        priv->active_rate = priv->rates_mask;
+        active_rates = priv->active_rate;
        priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
-        iwl_supported_rate_to_ie(pos, priv->active_rate,
+        cck_rates = IWL_CCK_RATES_MASK & active_rates;
-                                 priv->active_rate_basic, left);
+        ret_rates = iwl_supported_rate_to_ie(pos, cck_rates,
+                        priv->active_rate_basic, &left);
+        active_rates &= ~ret_rates;
+        ret_rates = iwl_supported_rate_to_ie(pos, active_rates,
+                                 priv->active_rate_basic, &left);
+        active_rates &= ~ret_rates;
        len += 2 + *pos;
        pos += (*pos) + 1;
-        ret_rates = ~ret_rates & priv->active_rate;
+        if (active_rates == 0)
-        if (ret_rates == 0)
                goto fill_end;
        /* fill in supported extended rate */
@@ -1848,7 +1855,8 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
        /* ... fill it in... */
        *pos++ = WLAN_EID_EXT_SUPP_RATES;
        *pos = 0;
-        iwl_supported_rate_to_ie(pos, ret_rates, priv->active_rate_basic, left);
+        iwl_supported_rate_to_ie(pos, active_rates,
+                                 priv->active_rate_basic, &left);
        if (*pos > 0)
                len += 2 + *pos;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index b1a6e39f782..5e1279263b2 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -48,8 +48,6 @@
 #include <linux/netdevice.h>
 #include <linux/wireless.h>
 #include <linux/firmware.h>
-#include <linux/skbuff.h>
-#include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/if_arp.h>
@@ -1802,21 +1800,22 @@ static void iwl_unset_hw_setting(struct iwl_priv *priv)
 * return : set the bit for each supported rate insert in ie
 */
 static u16 iwl_supported_rate_to_ie(u8 *ie, u16 supported_rate,
-                                    u16 basic_rate, int max_count)
+                                    u16 basic_rate, int *left)
 {
        u16 ret_rates = 0, bit;
        int i;
-        u8 *rates;
+        u8 *cnt = ie;
+        u8 *rates = ie + 1;
-        rates = &(ie[1]);
        for (bit = 1, i = 0; i < IWL_RATE_COUNT; i++, bit <<= 1) {
                if (bit & supported_rate) {
                        ret_rates |= bit;
-                        rates[*ie] = iwl_rates[i].ieee |
+                        rates[*cnt] = iwl_rates[i].ieee |
-                            ((bit & basic_rate) ? 0x80 : 0x00);
+                                ((bit & basic_rate) ? 0x80 : 0x00);
-                        *ie = *ie + 1;
+                        (*cnt)++;
-                        if (*ie >= max_count)
+                        (*left)--;
+                        if ((*left <= 0) ||
+                            (*cnt >= IWL_SUPPORTED_RATES_IE_LEN))
                                break;
                }
        }
@@ -1839,7 +1838,7 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
 {
        int len = 0;
        u8 *pos = NULL;
-        u16 ret_rates;
+        u16 active_rates, ret_rates, cck_rates;
        /* Make sure there is enough space for the probe request,
         * two mandatory IEs and the data */
@@ -1884,19 +1883,27 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
        left -= 2;
        if (left < 0)
                return 0;
        /* ... fill it in... */
        *pos++ = WLAN_EID_SUPP_RATES;
        *pos = 0;
-        ret_rates = priv->active_rate = priv->rates_mask;
+        priv->active_rate = priv->rates_mask;
+        active_rates = priv->active_rate;
        priv->active_rate_basic = priv->rates_mask & IWL_BASIC_RATES_MASK;
-        iwl_supported_rate_to_ie(pos, priv->active_rate,
+        cck_rates = IWL_CCK_RATES_MASK & active_rates;
-                                 priv->active_rate_basic, left);
+        ret_rates = iwl_supported_rate_to_ie(pos, cck_rates,
+                        priv->active_rate_basic, &left);
+        active_rates &= ~ret_rates;
+        ret_rates = iwl_supported_rate_to_ie(pos, active_rates,
+                                 priv->active_rate_basic, &left);
+        active_rates &= ~ret_rates;
        len += 2 + *pos;
        pos += (*pos) + 1;
-        ret_rates = ~ret_rates & priv->active_rate;
+        if (active_rates == 0)
-        if (ret_rates == 0)
                goto fill_end;
        /* fill in supported extended rate */
@@ -1907,7 +1914,8 @@ static u16 iwl_fill_probe_req(struct iwl_priv *priv,
        /* ... fill it in... */
        *pos++ = WLAN_EID_EXT_SUPP_RATES;
        *pos = 0;
-        iwl_supported_rate_to_ie(pos, ret_rates, priv->active_rate_basic, left);
+        iwl_supported_rate_to_ie(pos, active_rates,
+                                 priv->active_rate_basic, &left);
        if (*pos > 0)
                len += 2 + *pos;
@@ -4494,13 +4502,13 @@ static u8 ratio2dB[100] = {
 * Conversion assumes that levels are voltages (20*log), not powers (10*log). */
 int iwl_calc_db_from_ratio(int sig_ratio)
 {
-        /* Anything above 1000:1 just report as 60 dB */
+        /* 1000:1 or higher just report as 60 dB */
-        if (sig_ratio > 1000)
+        if (sig_ratio >= 1000)
                return 60;
-        /* Above 100:1, divide by 10 and use table,
+        /* 100:1 or higher, divide by 10 and use table,
         *   add 20 dB to make up for divide by 10 */
-        if (sig_ratio > 100)
+        if (sig_ratio >= 100)
                return (20 + (int)ratio2dB[sig_ratio/10]);
        /* We shouldn't see this */
diff --git a/drivers/net/wireless/iwlwifi/iwlwifi.h b/drivers/net/wireless/iwlwifi/iwlwifi.h
index e0b97c34121..432ce887807 100644
--- a/drivers/net/wireless/iwlwifi/iwlwifi.h
+++ b/drivers/net/wireless/iwlwifi/iwlwifi.h
@@ -39,18 +39,13 @@ struct iwl_priv;
 /* Hardware specific file defines the PCI IDs table for that hardware module */
 extern struct pci_device_id iwl_hw_card_ids[];
+#include "iwl-hw.h"
 #if IWL == 3945
 #define DRV_NAME        "iwl3945"
-#include "iwl-hw.h"
 #include "iwl-3945-hw.h"
 #elif IWL == 4965
 #define DRV_NAME        "iwl4965"
-#include "iwl-hw.h"
 #include "iwl-4965-hw.h"
 #endif
 #include "iwl-prph.h"
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index c2d71afd57e..2402cb8dd32 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -4,18 +4,18 @@
 * Version:       0.4.1
 * Description:   Netwave AirSurfer Wireless LAN PC Card driver
 * Status:        Experimental.
- * Authors:       John Markus Bj�rndalen <johnm@cs.uit.no>
+ * Authors:       John Markus Bjørndalen <johnm@cs.uit.no>
 *                Dag Brattli <dagb@cs.uit.no>
 *                David Hinds <dahinds@users.sourceforge.net>
 * Created at:    A long time ago!
 * Modified at:   Mon Nov 10 11:54:37 1997
 * Modified by:   Dag Brattli <dagb@cs.uit.no>
 * 
- *     Copyright (c) 1997 University of Troms�, Norway
+ *     Copyright (c) 1997 University of Tromsø, Norway
 *
 * Revision History:
 *
- *   08-Nov-97 15:14:47   John Markus Bj�rndalen <johnm@cs.uit.no>
+ *   08-Nov-97 15:14:47   John Markus Bjørndalen <johnm@cs.uit.no>
 *    - Fixed some bugs in netwave_rx and cleaned it up a bit. 
 *      (One of the bugs would have destroyed packets when receiving
 *      multiple packets per interrupt). 
@@ -158,7 +158,7 @@ static int pc_debug = PCMCIA_DEBUG;
 module_param(pc_debug, int, 0);
 #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
 static char *version =
-"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bj�rndalen)\n";
+"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n";
 #else
 #define DEBUG(n, args...)
 #endif
diff --git a/drivers/net/wireless/p54common.c b/drivers/net/wireless/p54common.c
index 2c63cf0ad2c..1437db0cf4b 100644
--- a/drivers/net/wireless/p54common.c
+++ b/drivers/net/wireless/p54common.c
@@ -577,7 +577,7 @@ static int p54_set_filter(struct ieee80211_hw *dev, u16 filter_type,
        struct p54_tx_control_filter *filter;
        hdr = kzalloc(sizeof(*hdr) + sizeof(*filter) +
-                      priv->tx_hdr_len, GFP_KERNEL);
+                      priv->tx_hdr_len, GFP_ATOMIC);
        if (!hdr)
                return -ENOMEM;
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index bb6f46cfbb9..ff399f8083e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -550,7 +550,7 @@ void rt2x00lib_write_tx_desc(struct rt2x00_dev *rt2x00dev,
                        /*
                         * Check if we need to set the Length Extension
                         */
-                        if (bitrate == 110 && residual <= 3)
+                        if (bitrate == 110 && residual <= 30)
                                desc.service |= 0x80;
                }
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 3e42759473c..46c8c0840a6 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -2029,6 +2029,7 @@ static struct usb_device_id rt73usb_device_table[] = {
        { USB_DEVICE(0x050d, 0x7050), USB_DEVICE_DATA(&rt73usb_ops) },
        { USB_DEVICE(0x050d, 0x705a), USB_DEVICE_DATA(&rt73usb_ops) },
        { USB_DEVICE(0x050d, 0x905b), USB_DEVICE_DATA(&rt73usb_ops) },
+        { USB_DEVICE(0x050d, 0x905c), USB_DEVICE_DATA(&rt73usb_ops) },
        /* Billionton */
        { USB_DEVICE(0x1631, 0xc019), USB_DEVICE_DATA(&rt73usb_ops) },
        /* Buffalo */
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 0ef887dd286..de61c8fe649 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -131,7 +131,8 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
        struct rtl8187_tx_hdr *hdr;
        struct rtl8187_tx_info *info;
        struct urb *urb;
-        u32 tmp;
+        __le16 rts_dur = 0;
+        u32 flags;
        urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (!urb) {
@@ -139,24 +140,24 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb,
                return 0;
        }
-        hdr = (struct rtl8187_tx_hdr *)skb_push(skb, sizeof(*hdr));
+        flags = skb->len;
-        tmp = skb->len - sizeof(*hdr);
+        flags |= RTL8187_TX_FLAG_NO_ENCRYPT;
-        tmp |= RTL8187_TX_FLAG_NO_ENCRYPT;
+        flags |= control->rts_cts_rate << 19;
-        tmp |= control->rts_cts_rate << 19;
+        flags |= control->tx_rate << 24;
-        tmp |= control->tx_rate << 24;
+        if (ieee80211_get_morefrag((struct ieee80211_hdr *)skb->data))
-        if (ieee80211_get_morefrag((struct ieee80211_hdr *)skb))
+                flags |= RTL8187_TX_FLAG_MORE_FRAG;
-                tmp |= RTL8187_TX_FLAG_MORE_FRAG;
        if (control->flags & IEEE80211_TXCTL_USE_RTS_CTS) {
-                tmp |= RTL8187_TX_FLAG_RTS;
+                flags |= RTL8187_TX_FLAG_RTS;
-                hdr->rts_duration =
+                rts_dur = ieee80211_rts_duration(dev, priv->if_id, skb->len, control);
-                        ieee80211_rts_duration(dev, priv->if_id, skb->len, control);
        }
        if (control->flags & IEEE80211_TXCTL_USE_CTS_PROTECT)
-                tmp |= RTL8187_TX_FLAG_CTS;
+                flags |= RTL8187_TX_FLAG_CTS;
-        hdr->flags = cpu_to_le32(tmp);
+        hdr = (struct rtl8187_tx_hdr *)skb_push(skb, sizeof(*hdr));
+        hdr->flags = cpu_to_le32(flags);
        hdr->len = 0;
-        tmp = control->retry_limit << 8;
+        hdr->rts_duration = rts_dur;
-        hdr->retry = cpu_to_le32(tmp);
+        hdr->retry = cpu_to_le32(control->retry_limit << 8);
        info = (struct rtl8187_tx_info *)skb->cb;
        info->control = kmemdup(control, sizeof(*control), GFP_ATOMIC);
@@ -587,8 +588,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
        *total_flags = 0;
-        if (changed_flags & FIF_PROMISC_IN_BSS)
-                priv->rx_conf ^= RTL818X_RX_CONF_NICMAC;
        if (changed_flags & FIF_ALLMULTI)
                priv->rx_conf ^= RTL818X_RX_CONF_MULTICAST;
        if (changed_flags & FIF_FCSFAIL)
@@ -601,8 +600,6 @@ static void rtl8187_configure_filter(struct ieee80211_hw *dev,
        if (mc_count > 0)
                priv->rx_conf |= RTL818X_RX_CONF_MULTICAST;
-        if (priv->rx_conf & RTL818X_RX_CONF_NICMAC)
-                *total_flags |= FIF_PROMISC_IN_BSS;
        if (priv->rx_conf & RTL818X_RX_CONF_MULTICAST)
                *total_flags |= FIF_ALLMULTI;
        if (priv->rx_conf & RTL818X_RX_CONF_FCS)
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 935b144d9b5..d5c0c66188c 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -327,8 +327,8 @@ static void zd1201_usbrx(struct urb *urb)
                        memcpy(skb_put(skb, 6), &data[datalen-8], 6);
                        memcpy(skb_put(skb, 2), &data[datalen-24], 2);
                        memcpy(skb_put(skb, len), data, len);
-                        skb->dev->last_rx = jiffies;
                        skb->protocol = eth_type_trans(skb, zd->dev);
+                        skb->dev->last_rx = jiffies;
                        zd->stats.rx_packets++;
                        zd->stats.rx_bytes += skb->len;
                        netif_rx(skb);
@@ -384,8 +384,8 @@ static void zd1201_usbrx(struct urb *urb)
                        memcpy(skb_put(skb, 2), &data[6], 2);
                        memcpy(skb_put(skb, len), data+8, len);
                }
-                skb->dev->last_rx = jiffies;
                skb->protocol = eth_type_trans(skb, zd->dev);
+                skb->dev->last_rx = jiffies;
                zd->stats.rx_packets++;
                zd->stats.rx_bytes += skb->len;
                netif_rx(skb);
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index b0684f96576..c755b692381 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -1044,14 +1044,17 @@ error:
 static void disconnect(struct usb_interface *intf)
 {
        struct net_device *netdev = zd_intf_to_netdev(intf);
-        struct zd_mac *mac = zd_netdev_mac(netdev);
+        struct zd_mac *mac;
-        struct zd_usb *usb = &mac->chip.usb;
+        struct zd_usb *usb;
        /* Either something really bad happened, or we're just dealing with
         * a DEVICE_INSTALLER. */
        if (netdev == NULL)
                return;
+        mac = zd_netdev_mac(netdev);
+        usb = &mac->chip.usb;
        dev_dbg_f(zd_usb_dev(usb), "\n");
        zd_netdev_disconnect(netdev);
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 6420a90a4a9..cbde770eb12 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -240,7 +240,7 @@ config RTC_DRV_TWL92330
        depends on MENELAUS
        help
          If you say yes here you get support for the RTC on the
-          TWL92330 "Menelaus" power mangement chip, used with OMAP2
+          TWL92330 "Menelaus" power management chip, used with OMAP2
          platforms.  The support is integrated with the rest of
          the Menelaus driver; it's not separate module.
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 8b9d68f6e01..5b7385e430e 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -40,7 +40,7 @@ struct DCTL_data {
 *
 *   Each bit configuration leading to an action code 2 (Exit with
 *   programming error or unusual condition indication)
- *   are handled as fatal error�s.
+ *   are handled as fatal errors.
 *
 *   All other configurations are handled as recoverable errors.
 *
@@ -2001,7 +2001,7 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense)
                switch (sense[28]) {
                case 0x17:
                        /* issue a Diagnostic Control command with an
-                         * Inhibit Write subcommand and controler modifier */
+                         * Inhibit Write subcommand and controller modifier */
                        erp = dasd_3990_erp_DCTL(erp, 0x20);
                        break;
diff --git a/drivers/s390/char/sclp_cpi.c b/drivers/s390/char/sclp_cpi.c
index 29fe2a5ec2f..82a13d9fdfe 100644
--- a/drivers/s390/char/sclp_cpi.c
+++ b/drivers/s390/char/sclp_cpi.c
@@ -157,7 +157,7 @@ cpi_prepare_req(void)
        sclp_ascebc_str(evb->system_name, CPI_LENGTH_SYSTEM_NAME);
        EBC_TOUPPER(evb->system_name, CPI_LENGTH_SYSTEM_NAME);
-        /* set sytem level */
+        /* set system level */
        evb->system_level = LINUX_VERSION_CODE;
        /* set sysplex name */
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index b960f66843e..725b0dd1426 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -158,7 +158,7 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count)
        if (count == 0)
                return 0;
-        /* value comes in units of 128 �sec */
+        /* value comes in units of 128 ��sec */
        ret = time_to_nsec(value);
        do_div(ret, count);
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 44993723373..6bf3ebbe985 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
 * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com)
- * Fixes by : Jochen R�hrig (roehrig@de.ibm.com)
+ * Fixes by : Jochen Röhrig (roehrig@de.ibm.com)
 *            Arnaldo Carvalho de Melo <acme@conectiva.com.br>
              Peter Tiedemann (ptiedem@de.ibm.com)
 * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -19,7 +19,7 @@
 *  Dieter Wellerdiek (wel@de.ibm.com)
 *  Martin Schwidefsky (schwidefsky@de.ibm.com)
 *  Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
- *  Jochen R�hrig (roehrig@de.ibm.com)
+ *  Jochen Röhrig (roehrig@de.ibm.com)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -885,7 +885,7 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg)
        }
        /**
-         * Don�t setup a timer for receiving the initial RX frame
+         * Don't setup a timer for receiving the initial RX frame
         * if in compatibility mode, since VM TCP delays the initial
         * frame until it has some data to send.
         */
@@ -905,10 +905,10 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg)
                ccw_check_return_code(ch, rc, "init IO");
        }
        /**
-         * If in compatibility mode since we don�t setup a timer, we
+         * If in compatibility mode since we don't setup a timer, we
         * also signal RX channel up immediately. This enables us
         * to send packets early which in turn usually triggers some
-         * reply from VM TCP which brings up the RX channel to it�s
+         * reply from VM TCP which brings up the RX channel to it's
         * final state.
         */
        if ((CHANNEL_DIRECTION(ch->flags) == READ) &&
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c
index a2d08c9ba3c..ff999ff0b62 100644
--- a/drivers/s390/net/qeth_main.c
+++ b/drivers/s390/net/qeth_main.c
@@ -6643,7 +6643,8 @@ qeth_netdev_init(struct net_device *dev)
        dev->vlan_rx_kill_vid = qeth_vlan_rx_kill_vid;
        dev->vlan_rx_add_vid = qeth_vlan_rx_add_vid;
 #endif
-        dev->header_ops = &qeth_null_ops;
+        if (qeth_get_netdev_flags(card) & IFF_NOARP)
+                dev->header_ops = &qeth_null_ops;
 #ifdef CONFIG_QETH_IPV6
        /*IPv6 address autoconfiguration stuff*/
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 03b51025a8f..9abba8b90f7 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -1526,7 +1526,7 @@ struct aac_mntent {
        __le32                  capacityhigh;
 };
-#define FSCS_NOTCLEAN   0x0001  /* fsck is neccessary before mounting */
+#define FSCS_NOTCLEAN   0x0001  /* fsck is necessary before mounting */
 #define FSCS_READONLY   0x0002  /* possible result of broken mirror */
 #define FSCS_HIDDEN     0x0004  /* should be ignored - set during a clear */
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index f08e71e0205..a58c265dc8a 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1,6 +1,6 @@
 /* aha152x.c -- Adaptec AHA-152x driver
- * Author: J�rgen E. Fischer, fischer@norbit.de
+ * Author: Jürgen E. Fischer, fischer@norbit.de
- * Copyright 1993-2004 J�rgen E. Fischer
+ * Copyright 1993-2004 Jürgen E. Fischer
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
@@ -357,7 +357,7 @@ enum {
        check_condition = 0x0800,       /* requesting sense after CHECK CONDITION */
 };
-MODULE_AUTHOR("J�rgen Fischer");
+MODULE_AUTHOR("Jürgen Fischer");
 MODULE_DESCRIPTION(AHA152X_REVID);
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/aic7xxx/cam.h b/drivers/scsi/aic7xxx/cam.h
index 26f17e3fc45..687aef6ef18 100644
--- a/drivers/scsi/aic7xxx/cam.h
+++ b/drivers/scsi/aic7xxx/cam.h
@@ -48,7 +48,7 @@ typedef enum {
        CAM_REQ_ABORTED,        /* CCB request aborted by the host */
        CAM_UA_ABORT,           /* Unable to abort CCB request */
        CAM_REQ_CMP_ERR,        /* CCB request completed with an error */
-        CAM_BUSY,               /* CAM subsytem is busy */
+        CAM_BUSY,               /* CAM subsystem is busy */
        CAM_REQ_INVALID,        /* CCB request was invalid */
        CAM_PATH_INVALID,       /* Supplied Path ID is invalid */
        CAM_SEL_TIMEOUT,        /* Target Selection Timeout */
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index fd42d478920..a9def6e1d30 100644
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -1808,12 +1808,12 @@ static irqreturn_t dc395x_interrupt(int irq, void *dev_id)
        irqreturn_t handled = IRQ_NONE;
        /*
-         * Check for pending interupt
+         * Check for pending interrupt
         */
        scsi_status = DC395x_read16(acb, TRM_S1040_SCSI_STATUS);
        dma_status = DC395x_read8(acb, TRM_S1040_DMA_STATUS);
        if (scsi_status & SCSIINTERRUPT) {
-                /* interupt pending - let's process it! */
+                /* interrupt pending - let's process it! */
                dc395x_handle_interrupt(acb, scsi_status);
                handled = IRQ_HANDLED;
        }
@@ -4579,7 +4579,7 @@ static void adapter_uninit_chip(struct AdapterCtlBlk *acb)
        if (acb->config & HCC_SCSI_RESET)
                reset_scsi_bus(acb);
-        /* clear any pending interupt state */
+        /* clear any pending interrupt state */
        DC395x_read8(acb, TRM_S1040_SCSI_INTSTATUS);
 }
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index e4e4c6a39ed..78779209ac8 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -427,7 +427,7 @@ megaraid_exit(void)
 * @id          : pci device id of the class of controllers
 *
 * This routine should be called whenever a new adapter is detected by the
- * PCI hotplug susbsytem.
+ * PCI hotplug susbsystem.
 */
 static int __devinit
 megaraid_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 1e29f51d596..d692c713416 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1006,7 +1006,7 @@ int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a)
 * qla4xxx_start_firmware - starts qla4xxx firmware
 * @ha: Pointer to host adapter structure.
 *
- * This routine performs the neccessary steps to start the firmware for
+ * This routine performs the necessary steps to start the firmware for
 * the QLA4010 adapter.
 **/
 static int qla4xxx_start_firmware(struct scsi_qla_host *ha)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 69f542c4923..a69b155f39a 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -676,7 +676,7 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 *      success as well). Returns a negated errno value in case of error.
 *
 *      Note: most ioctls are forward onto the block subsystem or further
- *      down in the scsi subsytem.
+ *      down in the scsi subsystem.
 **/
 static int sd_ioctl(struct inode * inode, struct file * filp, 
                    unsigned int cmd, unsigned long arg)
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index dc15a22105f..4aafe89b557 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -1596,7 +1596,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
     * IO while SEL is true. But again, there are some disks out the in the
     * world that do that nevertheless. (Somebody claimed that this announces
     * reselection capability of the target.) So we better skip that test and
-     * only wait for BSY... (Famous german words: Der Kl�gere gibt nach :-)
+     * only wait for BSY... (Famous german words: Der Klügere gibt nach :-)
     */
    while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & 
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h
index 6e5b952312e..ae1fb179b88 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw2.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h
@@ -1781,7 +1781,7 @@ static struct SYM_FWB_SCR SYM_FWB_SCR = {
         *  While testing with bogus QUANTUM drives, the C1010 
         *  sometimes raised a spurious phase mismatch with 
         *  WSR and the CHMOV(1) triggered another PM.
-         *  Waiting explicitely for the PHASE seemed to avoid 
+         *  Waiting explicitly for the PHASE seemed to avoid
         *  the nested phase mismatch. Btw, this didn't happen 
         *  using my IBM drives.
         */
diff --git a/drivers/scsi/wd33c93.h b/drivers/scsi/wd33c93.h
index 61ffb860dac..00123f2383d 100644
--- a/drivers/scsi/wd33c93.h
+++ b/drivers/scsi/wd33c93.h
@@ -155,7 +155,7 @@
 #define WD33C93_FS_12_15 OWNID_FS_12
 #define WD33C93_FS_16_20 OWNID_FS_16
-   /* pass input-clock explicitely. accepted mhz values are 8-10,12-20 */
+   /* pass input-clock explicitly. accepted mhz values are 8-10,12-20 */
 #define WD33C93_FS_MHZ(mhz) (mhz)
   /* Control register */
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d6ae38e55d0..87665d7df6f 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -62,11 +62,11 @@ config SERIAL_8250_CONSOLE
          kernel will automatically use the first serial line, /dev/ttyS0, as
          system console.
-          you can set that using a kernel command line option such as
+          You can set that using a kernel command line option such as
          "console=uart8250,io,0x3f8,9600n8"
          "console=uart8250,mmio,0xff5e0000,115200n8".
-          and it will switch to normal serial console when correponding port is
+          and it will switch to normal serial console when the corresponding 
-          ready.
+          port is ready.
          "earlycon=uart8250,io,0x3f8,9600n8"
          "earlycon=uart8250,mmio,0xff5e0000,115200n8".
          it will not only setup early console.
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 3f26c4b2f32..e773c8e1496 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -20,8 +20,8 @@
 *                   - S3C2410 and S3C2440 serial support
 *                   - Power Management support
 *                   - Fix console via IrDA devices
- *                   - SysReq (Herbert P�tzl)
+ *                   - SysReq (Herbert Pötzl)
- *                   - Break character handling (Herbert P�tzl)
+ *                   - Break character handling (Herbert Pötzl)
 *                   - spin-lock initialisation (Dimitry Andric)
 *                   - added clock control
 *                   - updated init code to use platform_device info
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index e9aba932f21..7051e6c5edc 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -181,7 +181,7 @@ static int mpc52xx_psc_spi_transfer_rxtx(struct spi_device *spi,
                }
-                /* enable interupts and wait for wake up
+                /* enable interrupts and wait for wake up
                 * if just one byte is expected the Rx FIFO genererates no
                 * FFULL interrupt, so activate the RxRDY interrupt
                 */
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index e78c2ddc1f8..367b75c0b25 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -1272,7 +1272,7 @@ static int lh7a40x_set_halt(struct usb_ep *_ep, int value)
                        /*
                         * Attempts to halt IN endpoints will fail (returning -EAGAIN)
                         * if any transfer requests are still queued, or if the controller
-                         * FIFO still holds bytes that the host hasn�t collected.
+                         * FIFO still holds bytes that the host hasn't collected.
                         */
                        spin_unlock_irqrestore(&ep->dev->lock, flags);
                        DEBUG
diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 0dcb4164dc8..735db4aec83 100644
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -451,7 +451,7 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
        /* Some boards (mostly VIA?) report bogus overcurrent indications,
         * causing massive log spam unless we completely ignore them.  It
-         * may be relevant that VIA VT8235 controlers, where PORT_POWER is
+         * may be relevant that VIA VT8235 controllers, where PORT_POWER is
         * always set, seem to clear PORT_OCC and PORT_CSC when writing to
         * PORT_POWER; that's surprising, but maybe within-spec.
         */
diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 94d859aa73f..ba370c56172 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -1556,7 +1556,7 @@ sl811h_start(struct usb_hcd *hcd)
                hcd->power_budget = sl811->board->power * 2;
        }
-        /* enable power and interupts */
+        /* enable power and interrupts */
        port_power(sl811, 1);
        return 0;
diff --git a/drivers/usb/image/Kconfig b/drivers/usb/image/Kconfig
index 95ce703110d..7595dfb38e3 100644
--- a/drivers/usb/image/Kconfig
+++ b/drivers/usb/image/Kconfig
@@ -1,5 +1,5 @@
 #
-# USB Imageing devices configuration
+# USB Imaging devices configuration
 #
 comment "USB Imaging devices"
        depends on USB
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 04e87acd6e4..2677fea147d 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -118,7 +118,7 @@ static ssize_t set_brightness(struct device *dev, struct device_attribute *attr,
                                cytherm->brightness, buffer, 8);
        if (retval)
                dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval);
-        /* Inform �C that we have changed the brightness setting */
+        /* Inform ��C that we have changed the brightness setting */
        retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM,
                                0x01, buffer, 8);
        if (retval)
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index 5c0a26cbd12..cd137577bb2 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -1,7 +1,7 @@
 /* 
 * Emagic EMI 2|6 usb audio interface firmware loader.
 * Copyright (C) 2002
- *      Tapio Laxstr�m (tapio.laxstrom@iptime.fi)
+ *      Tapio Laxström (tapio.laxstrom@iptime.fi)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License, as published by
@@ -249,7 +249,7 @@ static void __exit emi26_exit (void)
 module_init(emi26_init);
 module_exit(emi26_exit);
-MODULE_AUTHOR("tapio laxstr�m");
+MODULE_AUTHOR("Tapio Laxström");
 MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader.");
 MODULE_LICENSE("GPL");
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 23153eac0df..4758cc5cceb 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -1,7 +1,7 @@
 /* 
 * Emagic EMI 2|6 usb audio interface firmware loader.
 * Copyright (C) 2002
- *      Tapio Laxstr�m (tapio.laxstrom@iptime.fi)
+ *      Tapio Laxström (tapio.laxstrom@iptime.fi)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License, as published by
@@ -292,7 +292,7 @@ static void __exit emi62_exit (void)
 module_init(emi62_init);
 module_exit(emi62_exit);
-MODULE_AUTHOR("tapio laxstr�m");
+MODULE_AUTHOR("Tapio Laxström");
 MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader.");
 MODULE_LICENSE("GPL");
diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
index 52c4f7bd7a8..c1b279939bb 100644
--- a/drivers/usb/serial/ChangeLog.history
+++ b/drivers/usb/serial/ChangeLog.history
@@ -400,7 +400,7 @@ visor.c Change Log comments:
 (11/11/2001) gkh
        Added support for the m125 devices, and added check to prevent oopses
-        for Cli� devices that lie about the number of ports they have.
+        for Clié devices that lie about the number of ports they have.
 (08/30/2001) gkh
        Added support for the Clie devices, both the 3.5 and 4.0 os versions.
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 99fefed7791..4a86696e6c7 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -527,7 +527,7 @@ config USB_SERIAL_CYBERJACK
        depends on USB_SERIAL && EXPERIMENTAL
        ---help---
          Say Y here if you want to use a cyberJack pinpad/e-com USB chipcard
-          reader. This is an interface to ISO 7816 compatible contactbased
+          reader. This is an interface to ISO 7816 compatible contact-based
          chipcards, e.g. GSM SIMs.
          To compile this driver as a module, choose M here: the
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 65257867b34..8a8a6b9fb05 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -83,7 +83,7 @@
 *
 * (18/Jun/2003) Ian Abbott
 *      Added Device ID of the USB relais from Rudolf Gugler (backported from
- *      Philipp G�hring's patch for 2.5.x kernel).
+ *      Philipp Gühring's patch for 2.5.x kernel).
 *      Moved read transfer buffer reallocation into startup function.
 *      Free existing write urb and transfer buffer in startup function.
 *      Only use urbs in write urb pool that were successfully allocated.
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index b57b90ae9f9..b51cbb0eaa0 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -17,7 +17,7 @@
 * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the 
 * FTDI_SIO implementation.
 *
- * Philipp G�hring - pg@futureware.at - added the Device ID of the USB relais
+ * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais
 * from Rudolf Gugler
 *
 */
@@ -44,7 +44,7 @@
 #define FTDI_ACTZWAVE_PID       0xF2D0
-/* www.starting-point-systems.com �Chameleon device */
+/* www.starting-point-systems.com ��Chameleon device */
 #define FTDI_MICRO_CHAMELEON_PID        0xCAA0  /* Product Id */
 /* www.irtrans.de device */
@@ -419,7 +419,7 @@
 /*
 * Teratronik product ids.
- * Submitted by O. W�lfelschneider.
+ * Submitted by O. Wölfelschneider.
 */
 #define FTDI_TERATRONIK_VCP_PID  0xEC88 /* Teratronik device (preferring VCP driver on windows) */
 #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index e836ad07fdb..9b38a08ac83 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -306,7 +306,7 @@ static struct usb_device_id ipaq_id_table [] = {
        { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */
        { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */
        { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */
-        { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350�Series */
+        { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350 Series */
        { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */
        { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */
        { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */
@@ -488,7 +488,7 @@ static struct usb_device_id ipaq_id_table [] = {
        { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */
        { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */
        { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */
-        { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC�Device */
+        { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC Device */
        { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */
        { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */
        { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6831dca93c1..93a7724e167 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -3,7 +3,7 @@
 * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $
 *
 * Current development and maintenance:
- *   (C) 2001-2002 Bj�rn Stenberg (bjorn@haxx.se)
+ *   (C) 2001-2002 Björn Stenberg (bjorn@haxx.se)
 *
 * Developed with the assistance of:
 *   (C) 2002 Alan Stern <stern@rowland.org>
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 9b656ec427d..22ab2380367 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -407,7 +407,7 @@ UNUSUAL_DEV(  0x04cb, 0x0100, 0x0000, 0x2210,
                "FinePix 1400Zoom",
                US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN),
-/* Reported by Peter W�chtler <pwaechtler@loewe-komp.de>
+/* Reported by Peter Wächtler <pwaechtler@loewe-komp.de>
 * The device needs the flags only.
 */
 UNUSUAL_DEV(  0x04ce, 0x0002, 0x0074, 0x0074,
@@ -1551,7 +1551,7 @@ UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x9999,
                US_FL_GO_SLOW ),
 /*
- * David H�rdeman <david@2gen.com>
+ * David Härdeman <david@2gen.com>
 * The key makes the SCSI stack print confusing (but harmless) messages
 */
 UNUSUAL_DEV(  0x4146, 0xba01, 0x0100, 0x0100,
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index b3bf4ecc983..fb9d8d0b2c0 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -661,7 +661,7 @@ config FB_HECUBA
       help
         This enables support for the Hecuba board. This driver was tested
         with an E-Ink 800x600 display and x86 SBCs through a 16 bit GPIO
-         interface (8 bit data, 4 bit control). If you anticpate using
+         interface (8 bit data, 4 bit control). If you anticipate using
         this driver, say Y or M; otherwise say N. You must specify the
         GPIO IO address to be used for setting control and data.
@@ -815,7 +815,7 @@ config FB_XVR500
        help
          This is the framebuffer device for the Sun XVR-500 and similar
          graphics cards based upon the 3DLABS Wildcat chipset.  The driver
-          only works on sparc64 systems where the system firwmare has
+          only works on sparc64 systems where the system firmware has
          mostly initialized the card already.  It is treated as a
          completely dumb framebuffer device.
@@ -828,7 +828,7 @@ config FB_XVR2500
        help
          This is the framebuffer device for the Sun XVR-2500 and similar
          graphics cards based upon the 3DLABS Wildcat chipset.  The driver
-          only works on sparc64 systems where the system firwmare has
+          only works on sparc64 systems where the system firmware has
          mostly initialized the card already.  It is treated as a
          completely dumb framebuffer device.
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index f2e243c353f..4c9ec3f58c5 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -112,7 +112,7 @@
   +----------+---------------------------------------------+----------+-------+
   |          |                ^                            |          |       |
   |          |                |upper_margin                |          |       |
-   |          |                �                            |          |       |
+   |          |                v                            |          |       |
   +----------###############################################----------+-------+
   |          #                ^                            #          |       |
   |          #                |                            #          |       |
@@ -133,15 +133,15 @@
   |          #                |                            #          |       |
   |          #                |                            #          |       |
   |          #                |                            #          |       |
-   |          #                �                            #          |       |
+   |          #                v                            #          |       |
   +----------###############################################----------+-------+
   |          |                ^                            |          |       |
   |          |                |lower_margin                |          |       |
-   |          |                �                            |          |       |
+   |          |                v                            |          |       |
   +----------+---------------------------------------------+----------+-------+
   |          |                ^                            |          |       |
   |          |                |vsync_len                   |          |       |
-   |          |                �                            |          |       |
+   |          |                v                            |          |       |
   +----------+---------------------------------------------+----------+-------+
@@ -325,7 +325,7 @@
   CCIR -> PAL
   -----------
-      - a scanline is 64 �s long, of which 52.48 �s are visible. This is about
+      - a scanline is 64 ��s long, of which 52.48 ��s are visible. This is about
        736 visible 70 ns pixels per line.
      - we have 625 scanlines, of which 575 are visible (interlaced); after
        rounding this becomes 576.
@@ -333,7 +333,7 @@
   RETMA -> NTSC
   -------------
-      - a scanline is 63.5 �s long, of which 53.5 �s are visible.  This is about
+      - a scanline is 63.5 ��s long, of which 53.5 ��s are visible.  This is about
        736 visible 70 ns pixels per line.
      - we have 525 scanlines, of which 485 are visible (interlaced); after
        rounding this becomes 484.
@@ -802,7 +802,7 @@ static u_short ecs_palette[32];
 static u_short do_vmode_full = 0;       /* Change the Video Mode */
 static u_short do_vmode_pan = 0;        /* Update the Video Mode */
-static short do_blank = 0;              /* (Un)Blank the Screen (�1) */
+static short do_blank = 0;              /* (Un)Blank the Screen (��1) */
 static u_short do_cursor = 0;           /* Move the Cursor */
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index abe0c435a66..d775eb6590b 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -26,7 +26,7 @@
 *                         Anthony Tong <atong@uiuc.edu>
 *
 *  Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern
- *  Many Thanks to Ville Syrj�l� for patches and fixing nasting 16 bit color bug.
+ *  Many Thanks to Ville Syrjälä for patches and fixing nasting 16 bit color bug.
 *
 *  This file is subject to the terms and conditions of the GNU General Public
 *  License. See the file COPYING in the main directory of this archive for
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index a22ccf9485a..267422f6625 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -27,7 +27,7 @@ config VGACON_SOFT_SCROLLBACK
         The scrollback buffer of the standard VGA console is located in
         the VGA RAM.  The size of this RAM is fixed and is quite small.
         If you require a larger scrollback buffer, this can be placed in
-         System RAM which is dynamically allocated during intialization.
+         System RAM which is dynamically allocated during initialization.
         Placing the scrollback buffer in System RAM will slightly slow
         down the console.
diff --git a/drivers/video/geode/video_gx.c b/drivers/video/geode/video_gx.c
index 7f3f18d0671..febf09c6349 100644
--- a/drivers/video/geode/video_gx.c
+++ b/drivers/video/geode/video_gx.c
@@ -127,7 +127,7 @@ static void gx_set_dclk_frequency(struct fb_info *info)
        int timeout = 1000;
        /* Rev. 1 Geode GXs use a 14 MHz reference clock instead of 48 MHz. */
-        if (cpu_data->x86_mask == 1) {
+        if (cpu_data(0).x86_mask == 1) {
                pll_table = gx_pll_table_14MHz;
                pll_table_len = ARRAY_SIZE(gx_pll_table_14MHz);
        } else {
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e8e38edb9b5..481d58f7535 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -4,7 +4,7 @@
 * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/
 * 945G/945GM integrated graphics chips.
 *
- * Copyright � 2002, 2003 David Dawes <dawes@xfree86.org>
+ * Copyright �� 2002, 2003 David Dawes <dawes@xfree86.org>
 *                   2004 Sylvain Meyer
 *                   2006 David Airlie
 *
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 2a0e32074f7..5f6fb7d2c40 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -3,7 +3,7 @@
 *
 * Linux framebuffer driver for Intel(R) 865G integrated graphics chips.
 *
- * Copyright � 2002, 2003 David Dawes <dawes@xfree86.org>
+ * Copyright �� 2002, 2003 David Dawes <dawes@xfree86.org>
 *                   2004 Sylvain Meyer
 *
 * This driver consists of two parts.  The first part (intelfbdrv.c) provides
diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig
index 7f4d25b8a18..f4fcf11b290 100644
--- a/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@ -8,7 +8,7 @@ config FB_OMAP
          Frame buffer driver for OMAP based boards.
 config FB_OMAP_BOOTLOADER_INIT
-        bool "Check bootloader initializaion"
+        bool "Check bootloader initialization"
        depends on FB_OMAP
        help
          Say Y here if you want to enable checking if the bootloader has
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ae08d458709..5857ccf5f6b 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -56,7 +56,7 @@
 *      - Add support for different devices
 *      - Backlight support
 *
- * 2004-09-05: Herbert P�tzl <herbert@13thfloor.at>
+ * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
 *      - added clock (de-)allocation code
 *      - added fixem fbmem option
 *
@@ -64,7 +64,7 @@
 *      - code cleanup
 *      - added a forgotten return in h1940fb_init
 *
- * 2004-07-19: Herbert P�tzl <herbert@13thfloor.at>
+ * 2004-07-19: Herbert Pötzl <herbert@13thfloor.at>
 *      - code cleanup and extended debugging
 *
 * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org>
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c
index ff9e805c43b..c31f549ebea 100644
--- a/drivers/video/vermilion/vermilion.c
+++ b/drivers/video/vermilion/vermilion.c
@@ -23,8 +23,8 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Authors:
- *   Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ *   Thomas Hellström <thomas-at-tungstengraphics-dot-com>
- *   Michel D�nzer <michel-at-tungstengraphics-dot-com>
+ *   Michel Dänzer <michel-at-tungstengraphics-dot-com>
 *   Alan Hourihane <alanh-at-tungstengraphics-dot-com>
 */
diff --git a/drivers/video/vermilion/vermilion.h b/drivers/video/vermilion/vermilion.h
index 1fc6695a49d..c4aba59d480 100644
--- a/drivers/video/vermilion/vermilion.h
+++ b/drivers/video/vermilion/vermilion.h
@@ -23,7 +23,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 *
 * Authors:
- *   Thomas Hellstr�m <thomas-at-tungstengraphics-dot-com>
+ *   Thomas Hellström <thomas-at-tungstengraphics-dot-com>
 */
 #ifndef _VERMILION_H_
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index c5982502c03..f236954d253 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -2,7 +2,7 @@
 *      i6300esb:       Watchdog timer driver for Intel 6300ESB chipset
 *
 *      (c) Copyright 2004 Google Inc.
- *      (c) Copyright 2005 David H�rdeman <david@2gen.com>
+ *      (c) Copyright 2005 David Härdeman <david@2gen.com>
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
@@ -19,7 +19,7 @@
 *      Initial version 0.01
 *  2004YYZZ Ross Biro
 *      Version 0.02
- *  20050210 David H�rdeman <david@2gen.com>
+ *  20050210 David Härdeman <david@2gen.com>
 *      Ported driver to kernel 2.6
 */
@@ -521,7 +521,7 @@ static void __exit watchdog_cleanup (void)
 module_init(watchdog_init);
 module_exit(watchdog_cleanup);
-MODULE_AUTHOR("Ross Biro and David H�rdeman");
+MODULE_AUTHOR("Ross Biro and David Härdeman");
 MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c
index 41508399009..cafc465f2ae 100644
--- a/drivers/watchdog/iTCO_vendor_support.c
+++ b/drivers/watchdog/iTCO_vendor_support.c
@@ -115,7 +115,7 @@ static void supermicro_old_pre_keepalive(unsigned long acpibase)
 *        For P4DPx:
 *        BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog
 *       This setting enables or disables Watchdog function. When enabled, the
- *       default watchdog timer is set to be 5 minutes (about 4’35”). It is
+ *       default watchdog timer is set to be 5 minutes (about 4m35s). It is
 *       enough to load and run the OS. The application (service or driver) has
 *       to take over the control once OS is running up and before watchdog
 *       expires.
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index d9e821d08de..51826c216d6 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -8,7 +8,7 @@
 *      which is based on wdt.c.
 *      Original copyright messages:
 *
- *      (c) Copyright 2003 P�draig Brady <P@draigBrady.com>
+ *      (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
 *
 *      (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
 *
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids
index 5bd4b05d4c4..560fef2a7b1 100644
--- a/drivers/zorro/zorro.ids
+++ b/drivers/zorro/zorro.ids
@@ -295,7 +295,7 @@
        0100  RH 800C [HD Controller]
        0200  RH 800C [RAM Expansion]
 0861  Kato
-# The Rainbow II and III are actually made by Ingenieurb�ro Helfrich
+# The Rainbow II and III are actually made by Ingenieurbüro Helfrich
        2000  Rainbow II [Graphics Card]
        2100  Rainbow III [Graphics Card]
        8000  Melody MPEG [Audio Card]
author	Steve French <sfrench@us.ibm.com>	2007-10-20 00:26:44 -0400
committer	Steve French <sfrench@us.ibm.com>	2007-10-20 00:26:44 -0400
commit	748c5151deb56e4b7b5a9b07a884243764933831 (patch)
tree	e9dd45b8806d00b56503cfa55c46f3ebce0d151c /drivers
parent	4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff)
parent	e8b8c977734193adedf2b0f607d6252c78e86394 (diff)