179 files changed, 1429 insertions, 2514 deletions
diff --git a/drivers/Kconfig b/drivers/Kconfig
index d38f43f593d4..2f557f570ade 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -68,6 +68,8 @@ source "drivers/ssb/Kconfig"
 source "drivers/mfd/Kconfig"
+source "drivers/regulator/Kconfig"
 source "drivers/media/Kconfig"
 source "drivers/video/Kconfig"
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 52dc2d8b8f22..8e37be19bbf5 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -738,7 +738,6 @@ static void piix_set_piomode(struct ata_port *ap, struct ata_device *adev)
 *      do_pata_set_dmamode - Initialize host controller PATA PIO timings
 *      @ap: Port whose timings we are configuring
 *      @adev: Drive in question
- *      @udma: udma mode, 0 - 6
 *      @isich: set if the chip is an ICH device
 *
 *      Set UDMA mode for device, in host controller PCI config space.
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 2ff633c119e2..82af7011f2dd 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1268,7 +1268,7 @@ u64 ata_tf_to_lba48(const struct ata_taskfile *tf)
        sectors |= ((u64)(tf->hob_lbah & 0xff)) << 40;
        sectors |= ((u64)(tf->hob_lbam & 0xff)) << 32;
-        sectors |= (tf->hob_lbal & 0xff) << 24;
+        sectors |= ((u64)(tf->hob_lbal & 0xff)) << 24;
        sectors |= (tf->lbah & 0xff) << 16;
        sectors |= (tf->lbam & 0xff) << 8;
        sectors |= (tf->lbal & 0xff);
@@ -1602,7 +1602,6 @@ unsigned long ata_id_xfermask(const u16 *id)
 /**
 *      ata_pio_queue_task - Queue port_task
 *      @ap: The ata_port to queue port_task for
- *      @fn: workqueue function to be scheduled
 *      @data: data for @fn to use
 *      @delay: delay time in msecs for workqueue function
 *
@@ -2159,6 +2158,10 @@ retry:
 static inline u8 ata_dev_knobble(struct ata_device *dev)
 {
        struct ata_port *ap = dev->link->ap;
+        if (ata_dev_blacklisted(dev) & ATA_HORKAGE_BRIDGE_OK)
+                return 0;
        return ((ap->cbl == ATA_CBL_SATA) && (!ata_id_is_sata(dev->id)));
 }
@@ -4063,6 +4066,9 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
        { "TSSTcorp CDDVDW SH-S202N", "SB00",     ATA_HORKAGE_IVB, },
        { "TSSTcorp CDDVDW SH-S202N", "SB01",     ATA_HORKAGE_IVB, },
+        /* Devices that do not need bridging limits applied */
+        { "MTRON MSP-SATA*",            NULL,   ATA_HORKAGE_BRIDGE_OK, },
        /* End Marker */
        { }
 };
@@ -4648,7 +4654,6 @@ static void ata_verify_xfer(struct ata_queued_cmd *qc)
 /**
 *      ata_qc_complete - Complete an active ATA command
 *      @qc: Command to complete
- *      @err_mask: ATA Status register contents
 *
 *      Indicate to the mid and upper layers that an ATA
 *      command has completed, with either an ok or not-ok status.
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 5b72e734300a..62367fe4d5dc 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -44,11 +44,16 @@
 #include <linux/libata.h>
 #define DRV_NAME        "sata_via"
-#define DRV_VERSION     "2.3"
+#define DRV_VERSION     "2.4"
+/*
+ * vt8251 is different from other sata controllers of VIA.  It has two
+ * channels, each channel has both Master and Slave slot.
+ */
 enum board_ids_enum {
        vt6420,
        vt6421,
+        vt8251,
 };
 enum {
@@ -70,6 +75,8 @@ enum {
 static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
 static int svia_scr_read(struct ata_link *link, unsigned int sc_reg, u32 *val);
 static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val);
+static int vt8251_scr_read(struct ata_link *link, unsigned int scr, u32 *val);
+static int vt8251_scr_write(struct ata_link *link, unsigned int scr, u32 val);
 static void svia_tf_load(struct ata_port *ap, const struct ata_taskfile *tf);
 static void svia_noop_freeze(struct ata_port *ap);
 static int vt6420_prereset(struct ata_link *link, unsigned long deadline);
@@ -79,12 +86,12 @@ static void vt6421_set_dma_mode(struct ata_port *ap, struct ata_device *adev);
 static const struct pci_device_id svia_pci_tbl[] = {
        { PCI_VDEVICE(VIA, 0x5337), vt6420 },
-        { PCI_VDEVICE(VIA, 0x0591), vt6420 },
+        { PCI_VDEVICE(VIA, 0x0591), vt6420 }, /* 2 sata chnls (Master) */
-        { PCI_VDEVICE(VIA, 0x3149), vt6420 },
+        { PCI_VDEVICE(VIA, 0x3149), vt6420 }, /* 2 sata chnls (Master) */
-        { PCI_VDEVICE(VIA, 0x3249), vt6421 },
+        { PCI_VDEVICE(VIA, 0x3249), vt6421 }, /* 2 sata chnls, 1 pata chnl */
-        { PCI_VDEVICE(VIA, 0x5287), vt6420 },
        { PCI_VDEVICE(VIA, 0x5372), vt6420 },
        { PCI_VDEVICE(VIA, 0x7372), vt6420 },
+        { PCI_VDEVICE(VIA, 0x5287), vt8251 }, /* 2 sata chnls (Master/Slave) */
        { }     /* terminate list */
 };
@@ -128,6 +135,13 @@ static struct ata_port_operations vt6421_sata_ops = {
        .scr_write              = svia_scr_write,
 };
+static struct ata_port_operations vt8251_ops = {
+        .inherits               = &svia_base_ops,
+        .hardreset              = sata_std_hardreset,
+        .scr_read               = vt8251_scr_read,
+        .scr_write              = vt8251_scr_write,
+};
 static const struct ata_port_info vt6420_port_info = {
        .flags          = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY,
        .pio_mask       = 0x1f,
@@ -152,6 +166,15 @@ static struct ata_port_info vt6421_pport_info = {
        .port_ops       = &vt6421_pata_ops,
 };
+static struct ata_port_info vt8251_port_info = {
+        .flags          = ATA_FLAG_SATA | ATA_FLAG_SLAVE_POSS |
+                          ATA_FLAG_NO_LEGACY,
+        .pio_mask       = 0x1f,
+        .mwdma_mask     = 0x07,
+        .udma_mask      = ATA_UDMA6,
+        .port_ops       = &vt8251_ops,
+};
 MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("SCSI low-level driver for VIA SATA controllers");
 MODULE_LICENSE("GPL");
@@ -174,6 +197,83 @@ static int svia_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)
        return 0;
 }
+static int vt8251_scr_read(struct ata_link *link, unsigned int scr, u32 *val)
+{
+        static const u8 ipm_tbl[] = { 1, 2, 6, 0 };
+        struct pci_dev *pdev = to_pci_dev(link->ap->host->dev);
+        int slot = 2 * link->ap->port_no + link->pmp;
+        u32 v = 0;
+        u8 raw;
+        switch (scr) {
+        case SCR_STATUS:
+                pci_read_config_byte(pdev, 0xA0 + slot, &raw);
+                /* read the DET field, bit0 and 1 of the config byte */
+                v |= raw & 0x03;
+                /* read the SPD field, bit4 of the configure byte */
+                if (raw & (1 << 4))
+                        v |= 0x02 << 4;
+                else
+                        v |= 0x01 << 4;
+                /* read the IPM field, bit2 and 3 of the config byte */
+                v |= ipm_tbl[(raw >> 2) & 0x3];
+                break;
+        case SCR_ERROR:
+                /* devices other than 5287 uses 0xA8 as base */
+                WARN_ON(pdev->device != 0x5287);
+                pci_read_config_dword(pdev, 0xB0 + slot * 4, &v);
+                break;
+        case SCR_CONTROL:
+                pci_read_config_byte(pdev, 0xA4 + slot, &raw);
+                /* read the DET field, bit0 and bit1 */
+                v |= ((raw & 0x02) << 1) | (raw & 0x01);
+                /* read the IPM field, bit2 and bit3 */
+                v |= ((raw >> 2) & 0x03) << 8;
+                break;
+        default:
+                return -EINVAL;
+        }
+        *val = v;
+        return 0;
+}
+static int vt8251_scr_write(struct ata_link *link, unsigned int scr, u32 val)
+{
+        struct pci_dev *pdev = to_pci_dev(link->ap->host->dev);
+        int slot = 2 * link->ap->port_no + link->pmp;
+        u32 v = 0;
+        switch (scr) {
+        case SCR_ERROR:
+                /* devices other than 5287 uses 0xA8 as base */
+                WARN_ON(pdev->device != 0x5287);
+                pci_write_config_dword(pdev, 0xB0 + slot * 4, val);
+                return 0;
+        case SCR_CONTROL:
+                /* set the DET field */
+                v |= ((val & 0x4) >> 1) | (val & 0x1);
+                /* set the IPM field */
+                v |= ((val >> 8) & 0x3) << 2;
+                pci_write_config_byte(pdev, 0xA4 + slot, v);
+                return 0;
+        default:
+                return -EINVAL;
+        }
+}
 /**
 *      svia_tf_load - send taskfile registers to host controller
 *      @ap: Port to which output is sent
@@ -396,6 +496,30 @@ static int vt6421_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
        return 0;
 }
+static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
+{
+        const struct ata_port_info *ppi[] = { &vt8251_port_info, NULL };
+        struct ata_host *host;
+        int i, rc;
+        rc = ata_pci_sff_prepare_host(pdev, ppi, &host);
+        if (rc)
+                return rc;
+        *r_host = host;
+        rc = pcim_iomap_regions(pdev, 1 << 5, DRV_NAME);
+        if (rc) {
+                dev_printk(KERN_ERR, &pdev->dev, "failed to iomap PCI BAR 5\n");
+                return rc;
+        }
+        /* 8251 hosts four sata ports as M/S of the two channels */
+        for (i = 0; i < host->n_ports; i++)
+                ata_slave_link_init(host->ports[i]);
+        return 0;
+}
 static void svia_configure(struct pci_dev *pdev)
 {
        u8 tmp8;
@@ -451,10 +575,10 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (rc)
                return rc;
-        if (board_id == vt6420)
+        if (board_id == vt6421)
-                bar_sizes = &svia_bar_sizes[0];
-        else
                bar_sizes = &vt6421_bar_sizes[0];
+        else
+                bar_sizes = &svia_bar_sizes[0];
        for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++)
                if ((pci_resource_start(pdev, i) == 0) ||
@@ -467,12 +591,19 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                        return -ENODEV;
                }
-        if (board_id == vt6420)
+        switch (board_id) {
+        case vt6420:
                rc = vt6420_prepare_host(pdev, &host);
-        else
+                break;
+        case vt6421:
                rc = vt6421_prepare_host(pdev, &host);
-        if (rc)
+                break;
-                return rc;
+        case vt8251:
+                rc = vt8251_prepare_host(pdev, &host);
+                break;
+        default:
+                return -EINVAL;
+        }
        svia_configure(pdev);
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 75dd6e22faff..c98c31ec2f75 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -355,7 +355,7 @@ static void __sysdev_resume(struct sys_device *dev)
 *      sysdev_suspend - Suspend all system devices.
 *      @state:         Power state to enter.
 *
- *      We perform an almost identical operation as sys_device_shutdown()
+ *      We perform an almost identical operation as sysdev_shutdown()
 *      above, though calling ->suspend() instead. Interrupts are disabled
 *      when this called. Devices are responsible for both saving state and
 *      quiescing or powering down the device.
@@ -437,7 +437,7 @@ aux_driver:
 /**
 *      sysdev_resume - Bring system devices back to life.
 *
- *      Similar to sys_device_suspend(), but we iterate the list forwards
+ *      Similar to sysdev_suspend(), but we iterate the list forwards
 *      to guarantee that parent devices are resumed before their children.
 *
 *      Note: Interrupts are disabled when called.
@@ -488,7 +488,8 @@ ssize_t sysdev_store_ulong(struct sys_device *sysdev,
        if (end == buf)
                return -EINVAL;
        *(unsigned long *)(ea->var) = new;
-        return end - buf;
+        /* Always return full write size even if we didn't consume all */
+        return size;
 }
 EXPORT_SYMBOL_GPL(sysdev_store_ulong);
@@ -511,7 +512,8 @@ ssize_t sysdev_store_int(struct sys_device *sysdev,
        if (end == buf || new > INT_MAX || new < INT_MIN)
                return -EINVAL;
        *(int *)(ea->var) = new;
-        return end - buf;
+        /* Always return full write size even if we didn't consume all */
+        return size;
 }
 EXPORT_SYMBOL_GPL(sysdev_store_int);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 3f09cd8bcc38..5c4ee70d5cf3 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -40,8 +40,7 @@
 * Heinz Mauelshagen <mge@sistina.com>, Feb 2002
 *
 * Support for falling back on the write file operation when the address space
- * operations prepare_write and/or commit_write are not available on the
+ * operations write_begin is not available on the backing filesystem.
- * backing filesystem.
 * Anton Altaparmakov, 16 Feb 2005
 *
 * Still To Fix:
@@ -765,7 +764,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
                 */
                if (!file->f_op->splice_read)
                        goto out_putf;
-                if (aops->prepare_write || aops->write_begin)
+                if (aops->write_begin)
                        lo_flags |= LO_FLAGS_USE_AOPS;
                if (!(lo_flags & LO_FLAGS_USE_AOPS) && !file->f_op->write)
                        lo_flags |= LO_FLAGS_READ_ONLY;
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index e6ee21d99d92..b0e569ba730d 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -867,7 +867,7 @@ static int bluecard_probe(struct pcmcia_device *link)
        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
        link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
        link->irq.Handler = bluecard_interrupt;
diff --git a/drivers/bluetooth/bpa10x.c b/drivers/bluetooth/bpa10x.c
index 32f3a8ed8d3d..b936d8ce2728 100644
--- a/drivers/bluetooth/bpa10x.c
+++ b/drivers/bluetooth/bpa10x.c
@@ -443,8 +443,8 @@ static void bpa10x_destruct(struct hci_dev *hdev)
        BT_DBG("%s", hdev->name);
-        kfree(data->rx_skb[0]);
+        kfree_skb(data->rx_skb[0]);
-        kfree(data->rx_skb[1]);
+        kfree_skb(data->rx_skb[1]);
        kfree(data);
 }
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 2cbe70b66470..b3e4d07a4ac2 100644
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -343,6 +343,7 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
        bt3c_info_t *info = dev_inst;
        unsigned int iobase;
        int iir;
+        irqreturn_t r = IRQ_NONE;
        BUG_ON(!info->hdev);
@@ -374,11 +375,12 @@ static irqreturn_t bt3c_interrupt(int irq, void *dev_inst)
                        outb(iir, iobase + CONTROL);
                }
+                r = IRQ_HANDLED;
        }
        spin_unlock(&(info->lock));
-        return IRQ_HANDLED;
+        return r;
 }
@@ -657,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link)
        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
        link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
        link->irq.Handler = bt3c_interrupt;
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 8e556b7ff9f6..efd689a062eb 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -293,6 +293,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
        unsigned int iobase;
        int boguscount = 0;
        int iir, lsr;
+        irqreturn_t r = IRQ_NONE;
        BUG_ON(!info->hdev);
@@ -302,6 +303,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
        iir = inb(iobase + UART_IIR) & UART_IIR_ID;
        while (iir) {
+                r = IRQ_HANDLED;
                /* Clear interrupt */
                lsr = inb(iobase + UART_LSR);
@@ -335,7 +337,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst)
        spin_unlock(&(info->lock));
-        return IRQ_HANDLED;
+        return r;
 }
@@ -586,7 +588,7 @@ static int btuart_probe(struct pcmcia_device *link)
        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
        link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
        link->irq.Handler = btuart_interrupt;
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index e6e6b037695a..901bdd95655f 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -297,6 +297,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
        unsigned char msr;
        int boguscount = 0;
        int iir, lsr;
+        irqreturn_t r = IRQ_NONE;
        BUG_ON(!info->hdev);
@@ -307,6 +308,7 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
        iir = inb(iobase + UART_IIR) & UART_IIR_ID;
        while (iir) {
+                r = IRQ_HANDLED;
                /* Clear interrupt */
                lsr = inb(iobase + UART_LSR);
@@ -343,11 +345,12 @@ static irqreturn_t dtl1_interrupt(int irq, void *dev_inst)
                info->ri_latch = msr & UART_MSR_RI;
                clear_bit(XMIT_WAITING, &(info->tx_state));
                dtl1_write_wakeup(info);
+                r = IRQ_HANDLED;
        }
        spin_unlock(&(info->lock));
-        return IRQ_HANDLED;
+        return r;
 }
@@ -568,7 +571,7 @@ static int dtl1_probe(struct pcmcia_device *link)
        link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
        link->io.NumPorts1 = 8;
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
+        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;
        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
        link->irq.Handler = dtl1_interrupt;
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 9aaa86b232b1..2eecb779437b 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -495,9 +495,10 @@ static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
        return cdrom_open(gd.cd_info, bdev, mode);
 }
-static int gdrom_bdops_release(struct block_device *bdev, fmode_t mode)
+static int gdrom_bdops_release(struct gendisk *disk, fmode_t mode)
 {
-        return cdrom_release(gd.cd_info, mode);
+        cdrom_release(gd.cd_info, mode);
+        return 0;
 }
 static int gdrom_bdops_mediachanged(struct gendisk *disk)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 122254155ae1..43b35d0369d6 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -812,28 +812,6 @@ config JS_RTC
          To compile this driver as a module, choose M here: the
          module will be called js-rtc.
-config SGI_DS1286
-        tristate "SGI DS1286 RTC support"
-        depends on SGI_HAS_DS1286
-        help
-          If you say Y here and create a character special file /dev/rtc with
-          major number 10 and minor number 135 using mknod ("man mknod"), you
-          will get access to the real time clock built into your computer.
-          Every SGI has such a clock built in. It reports status information
-          via the file /proc/rtc and its behaviour is set by various ioctls on
-          /dev/rtc.
-config SGI_IP27_RTC
-        bool "SGI M48T35 RTC support"
-        depends on SGI_IP27
-        help
-          If you say Y here and create a character special file /dev/rtc with
-          major number 10 and minor number 135 using mknod ("man mknod"), you
-          will get access to the real time clock built into your computer.
-          Every SGI has such a clock built in. It reports status information
-          via the file /proc/rtc and its behaviour is set by various ioctls on
-          /dev/rtc.
 config GEN_RTC
        tristate "Generic /dev/rtc emulation"
        depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 1a4247dccac4..438f71317c5c 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -74,8 +74,6 @@ obj-$(CONFIG_RTC)		+= rtc.o
 obj-$(CONFIG_HPET)              += hpet.o
 obj-$(CONFIG_GEN_RTC)           += genrtc.o
 obj-$(CONFIG_EFI_RTC)           += efirtc.o
-obj-$(CONFIG_SGI_DS1286)        += ds1286.o
-obj-$(CONFIG_SGI_IP27_RTC)      += ip27-rtc.o
 obj-$(CONFIG_DS1302)            += ds1302.o
 obj-$(CONFIG_XILINX_HWICAP)     += xilinx_hwicap/
 ifeq ($(CONFIG_GENERIC_NVRAM),y)
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c
deleted file mode 100644
index 0a826d7be10e..000000000000
--- a/drivers/char/ds1286.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/*
- * DS1286 Real Time Clock interface for Linux
- *
- * Copyright (C) 1998, 1999, 2000 Ralf Baechle
- *
- * Based on code written by Paul Gortmaker.
- *
- * This driver allows use of the real time clock (built into nearly all
- * computers) from user space. It exports the /dev/rtc interface supporting
- * various ioctl() and also the /proc/rtc pseudo-file for status
- * information.
- *
- * The ioctls can be used to set the interrupt behaviour and generation rate
- * from the RTC via IRQ 8. Then the /dev/rtc interface can be used to make
- * use of these timer interrupts, be they interval or alarm based.
- *
- * The /dev/rtc interface will block on reads until an interrupt has been
- * received. If a RTC interrupt has already happened, it will output an
- * unsigned long and then block. The output value contains the interrupt
- * status in the low byte and the number of interrupts since the last read
- * in the remaining high bytes. The /dev/rtc interface can also be used with
- * the select(2) call.
- *
- * 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.
- */
-#include <linux/ds1286.h>
-#include <linux/smp_lock.h>
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/miscdevice.h>
-#include <linux/slab.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/rtc.h>
-#include <linux/spinlock.h>
-#include <linux/bcd.h>
-#include <linux/proc_fs.h>
-#include <linux/jiffies.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#define DS1286_VERSION          "1.0"
-/*
- *      We sponge a minor off of the misc major. No need slurping
- *      up another valuable major dev number for this. If you add
- *      an ioctl, make sure you don't conflict with SPARC's RTC
- *      ioctls.
- */
-static DECLARE_WAIT_QUEUE_HEAD(ds1286_wait);
-static ssize_t ds1286_read(struct file *file, char *buf,
-                        size_t count, loff_t *ppos);
-static int ds1286_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg);
-static unsigned int ds1286_poll(struct file *file, poll_table *wait);
-static void ds1286_get_alm_time (struct rtc_time *alm_tm);
-static void ds1286_get_time(struct rtc_time *rtc_tm);
-static int ds1286_set_time(struct rtc_time *rtc_tm);
-static inline unsigned char ds1286_is_updating(void);
-static DEFINE_SPINLOCK(ds1286_lock);
-static int ds1286_read_proc(char *page, char **start, off_t off,
-                            int count, int *eof, void *data);
-/*
- *      Bits in rtc_status. (7 bits of room for future expansion)
- */
-#define RTC_IS_OPEN             0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON            0x02    /* missed irq timer active      */
-static unsigned char ds1286_status;     /* bitmapped status byte.       */
-static unsigned char days_in_mo[] = {
-        0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
-};
-/*
- *      Now all the various file operations that we export.
- */
-static ssize_t ds1286_read(struct file *file, char *buf,
-                           size_t count, loff_t *ppos)
-{
-        return -EIO;
-}
-static int ds1286_ioctl(struct inode *inode, struct file *file,
-                        unsigned int cmd, unsigned long arg)
-{
-        struct rtc_time wtime;
-        switch (cmd) {
-        case RTC_AIE_OFF:       /* Mask alarm int. enab. bit    */
-        {
-                unsigned long flags;
-                unsigned char val;
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val |=  RTC_TDM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-                return 0;
-        }
-        case RTC_AIE_ON:        /* Allow alarm interrupts.      */
-        {
-                unsigned long flags;
-                unsigned char val;
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val &=  ~RTC_TDM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-                return 0;
-        }
-        case RTC_WIE_OFF:       /* Mask watchdog int. enab. bit */
-        {
-                unsigned long flags;
-                unsigned char val;
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val |= RTC_WAM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-                return 0;
-        }
-        case RTC_WIE_ON:        /* Allow watchdog interrupts.   */
-        {
-                unsigned long flags;
-                unsigned char val;
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-                spin_lock_irqsave(&ds1286_lock, flags);
-                val = rtc_read(RTC_CMD);
-                val &= ~RTC_WAM;
-                rtc_write(val, RTC_CMD);
-                spin_unlock_irqrestore(&ds1286_lock, flags);
-                return 0;
-        }
-        case RTC_ALM_READ:      /* Read the present alarm time */
-        {
-                /*
-                 * This returns a struct rtc_time. Reading >= 0xc0
-                 * means "don't care" or "match all". Only the tm_hour,
-                 * tm_min, and tm_sec values are filled in.
-                 */
-                memset(&wtime, 0, sizeof(wtime));
-                ds1286_get_alm_time(&wtime);
-                break;
-        }
-        case RTC_ALM_SET:       /* Store a time into the alarm */
-        {
-                /*
-                 * This expects a struct rtc_time. Writing 0xff means
-                 * "don't care" or "match all". Only the tm_hour,
-                 * tm_min and tm_sec are used.
-                 */
-                unsigned char hrs, min, sec;
-                struct rtc_time alm_tm;
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-                if (copy_from_user(&alm_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-                hrs = alm_tm.tm_hour;
-                min = alm_tm.tm_min;
-                sec = alm_tm.tm_sec;
-                if (hrs >= 24)
-                        hrs = 0xff;
-                if (min >= 60)
-                        min = 0xff;
-                if (sec != 0)
-                        return -EINVAL;
-                min = bin2bcd(min);
-                min = bin2bcd(hrs);
-                spin_lock(&ds1286_lock);
-                rtc_write(hrs, RTC_HOURS_ALARM);
-                rtc_write(min, RTC_MINUTES_ALARM);
-                spin_unlock(&ds1286_lock);
-                return 0;
-        }
-        case RTC_RD_TIME:       /* Read the time/date from RTC  */
-        {
-                memset(&wtime, 0, sizeof(wtime));
-                ds1286_get_time(&wtime);
-                break;
-        }
-        case RTC_SET_TIME:      /* Set the RTC */
-        {
-                struct rtc_time rtc_tm;
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-                if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-                return ds1286_set_time(&rtc_tm);
-        }
-        default:
-                return -EINVAL;
-        }
-        return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0;
-}
-/*
- *      We enforce only one user at a time here with the open/close.
- *      Also clear the previous interrupt data on an open, and clean
- *      up things on a close.
- */
-static int ds1286_open(struct inode *inode, struct file *file)
-{
-        lock_kernel();
-        spin_lock_irq(&ds1286_lock);
-        if (ds1286_status & RTC_IS_OPEN)
-                goto out_busy;
-        ds1286_status |= RTC_IS_OPEN;
-        spin_unlock_irq(&ds1286_lock);
-        unlock_kernel();
-        return 0;
-out_busy:
-        spin_lock_irq(&ds1286_lock);
-        unlock_kernel();
-        return -EBUSY;
-}
-static int ds1286_release(struct inode *inode, struct file *file)
-{
-        ds1286_status &= ~RTC_IS_OPEN;
-        return 0;
-}
-static unsigned int ds1286_poll(struct file *file, poll_table *wait)
-{
-        poll_wait(file, &ds1286_wait, wait);
-        return 0;
-}
-/*
- *      The various file operations we support.
- */
-static const struct file_operations ds1286_fops = {
-        .llseek         = no_llseek,
-        .read           = ds1286_read,
-        .poll           = ds1286_poll,
-        .ioctl          = ds1286_ioctl,
-        .open           = ds1286_open,
-        .release        = ds1286_release,
-};
-static struct miscdevice ds1286_dev=
-{
-        .minor  = RTC_MINOR,
-        .name   = "rtc",
-        .fops   = &ds1286_fops,
-};
-static int __init ds1286_init(void)
-{
-        int err;
-        printk(KERN_INFO "DS1286 Real Time Clock Driver v%s\n", DS1286_VERSION);
-        err = misc_register(&ds1286_dev);
-        if (err)
-                goto out;
-        if (!create_proc_read_entry("driver/rtc", 0, 0, ds1286_read_proc, NULL)) {
-                err = -ENOMEM;
-                goto out_deregister;
-        }
-        return 0;
-out_deregister:
-        misc_deregister(&ds1286_dev);
-out:
-        return err;
-}
-static void __exit ds1286_exit(void)
-{
-        remove_proc_entry("driver/rtc", NULL);
-        misc_deregister(&ds1286_dev);
-}
-static char *days[] = {
-        "***", "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
-};
-/*
- *      Info exported via "/proc/rtc".
- */
-static int ds1286_proc_output(char *buf)
-{
-        char *p, *s;
-        struct rtc_time tm;
-        unsigned char hundredth, month, cmd, amode;
-        p = buf;
-        ds1286_get_time(&tm);
-        hundredth = rtc_read(RTC_HUNDREDTH_SECOND);
-        hundredth = bcd2bin(hundredth);
-        p += sprintf(p,
-                     "rtc_time\t: %02d:%02d:%02d.%02d\n"
-                     "rtc_date\t: %04d-%02d-%02d\n",
-                     tm.tm_hour, tm.tm_min, tm.tm_sec, hundredth,
-                     tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday);
-        /*
-         * We implicitly assume 24hr mode here. Alarm values >= 0xc0 will
-         * match any value for that particular field. Values that are
-         * greater than a valid time, but less than 0xc0 shouldn't appear.
-         */
-        ds1286_get_alm_time(&tm);
-        p += sprintf(p, "alarm\t\t: %s ", days[tm.tm_wday]);
-        if (tm.tm_hour <= 24)
-                p += sprintf(p, "%02d:", tm.tm_hour);
-        else
-                p += sprintf(p, "**:");
-        if (tm.tm_min <= 59)
-                p += sprintf(p, "%02d\n", tm.tm_min);
-        else
-                p += sprintf(p, "**\n");
-        month = rtc_read(RTC_MONTH);
-        p += sprintf(p,
-                     "oscillator\t: %s\n"
-                     "square_wave\t: %s\n",
-                     (month & RTC_EOSC) ? "disabled" : "enabled",
-                     (month & RTC_ESQW) ? "disabled" : "enabled");
-        amode = ((rtc_read(RTC_MINUTES_ALARM) & 0x80) >> 5) |
-                ((rtc_read(RTC_HOURS_ALARM) & 0x80) >> 6) |
-                ((rtc_read(RTC_DAY_ALARM) & 0x80) >> 7);
-        if (amode == 7)      s = "each minute";
-        else if (amode == 3) s = "minutes match";
-        else if (amode == 1) s = "hours and minutes match";
-        else if (amode == 0) s = "days, hours and minutes match";
-        else                 s = "invalid";
-        p += sprintf(p, "alarm_mode\t: %s\n", s);
-        cmd = rtc_read(RTC_CMD);
-        p += sprintf(p,
-                     "alarm_enable\t: %s\n"
-                     "wdog_alarm\t: %s\n"
-                     "alarm_mask\t: %s\n"
-                     "wdog_alarm_mask\t: %s\n"
-                     "interrupt_mode\t: %s\n"
-                     "INTB_mode\t: %s_active\n"
-                     "interrupt_pins\t: %s\n",
-                     (cmd & RTC_TDF) ? "yes" : "no",
-                     (cmd & RTC_WAF) ? "yes" : "no",
-                     (cmd & RTC_TDM) ? "disabled" : "enabled",
-                     (cmd & RTC_WAM) ? "disabled" : "enabled",
-                     (cmd & RTC_PU_LVL) ? "pulse" : "level",
-                     (cmd & RTC_IBH_LO) ? "low" : "high",
-                     (cmd & RTC_IPSW) ? "unswapped" : "swapped");
-        return  p - buf;
-}
-static int ds1286_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data)
-{
-        int len = ds1286_proc_output (page);
-        if (len <= off+count) *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len>count)
-                len = count;
-        if (len<0)
-                len = 0;
-        return len;
-}
-/*
- * Returns true if a clock update is in progress
- */
-static inline unsigned char ds1286_is_updating(void)
-{
-        return rtc_read(RTC_CMD) & RTC_TE;
-}
-static void ds1286_get_time(struct rtc_time *rtc_tm)
-{
-        unsigned char save_control;
-        unsigned long flags;
-        /*
-         * read RTC once any update in progress is done. The update
-         * can take just over 2ms. We wait 10 to 20ms. There is no need to
-         * to poll-wait (up to 1s - eeccch) for the falling edge of RTC_UIP.
-         * If you need to know *exactly* when a second has started, enable
-         * periodic update complete interrupts, (via ioctl) and then
-         * immediately read /dev/rtc which will block until you get the IRQ.
-         * Once the read clears, read the RTC time (again via ioctl). Easy.
-         */
-        if (ds1286_is_updating() != 0)
-                msleep(20);
-        /*
-         * Only the values that we read from the RTC are set. We leave
-         * tm_wday, tm_yday and tm_isdst untouched. Even though the
-         * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
-         * by the RTC when initially set to a non-zero value.
-         */
-        spin_lock_irqsave(&ds1286_lock, flags);
-        save_control = rtc_read(RTC_CMD);
-        rtc_write((save_control|RTC_TE), RTC_CMD);
-        rtc_tm->tm_sec = rtc_read(RTC_SECONDS);
-        rtc_tm->tm_min = rtc_read(RTC_MINUTES);
-        rtc_tm->tm_hour = rtc_read(RTC_HOURS) & 0x3f;
-        rtc_tm->tm_mday = rtc_read(RTC_DATE);
-        rtc_tm->tm_mon = rtc_read(RTC_MONTH) & 0x1f;
-        rtc_tm->tm_year = rtc_read(RTC_YEAR);
-        rtc_write(save_control, RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-        rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);
-        rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);
-        rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
-        rtc_tm->tm_mday = bcd2bin(rtc_tm->tm_mday);
-        rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
-        rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
-        /*
-         * Account for differences between how the RTC uses the values
-         * and how they are defined in a struct rtc_time;
-         */
-        if (rtc_tm->tm_year < 45)
-                rtc_tm->tm_year += 30;
-        if ((rtc_tm->tm_year += 40) < 70)
-                rtc_tm->tm_year += 100;
-        rtc_tm->tm_mon--;
-}
-static int ds1286_set_time(struct rtc_time *rtc_tm)
-{
-        unsigned char mon, day, hrs, min, sec, leap_yr;
-        unsigned char save_control;
-        unsigned int yrs;
-        unsigned long flags;
-        yrs = rtc_tm->tm_year + 1900;
-        mon = rtc_tm->tm_mon + 1;   /* tm_mon starts at zero */
-        day = rtc_tm->tm_mday;
-        hrs = rtc_tm->tm_hour;
-        min = rtc_tm->tm_min;
-        sec = rtc_tm->tm_sec;
-        if (yrs < 1970)
-                return -EINVAL;
-        leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-        if ((mon > 12) || (day == 0))
-                return -EINVAL;
-        if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-                return -EINVAL;
-        if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-                return -EINVAL;
-        if ((yrs -= 1940) > 255)    /* They are unsigned */
-                return -EINVAL;
-        if (yrs >= 100)
-                yrs -= 100;
-        sec = bin2bcd(sec);
-        min = bin2bcd(min);
-        hrs = bin2bcd(hrs);
-        day = bin2bcd(day);
-        mon = bin2bcd(mon);
-        yrs = bin2bcd(yrs);
-        spin_lock_irqsave(&ds1286_lock, flags);
-        save_control = rtc_read(RTC_CMD);
-        rtc_write((save_control|RTC_TE), RTC_CMD);
-        rtc_write(yrs, RTC_YEAR);
-        rtc_write(mon, RTC_MONTH);
-        rtc_write(day, RTC_DATE);
-        rtc_write(hrs, RTC_HOURS);
-        rtc_write(min, RTC_MINUTES);
-        rtc_write(sec, RTC_SECONDS);
-        rtc_write(0, RTC_HUNDREDTH_SECOND);
-        rtc_write(save_control, RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-        return 0;
-}
-static void ds1286_get_alm_time(struct rtc_time *alm_tm)
-{
-        unsigned char cmd;
-        unsigned long flags;
-        /*
-         * Only the values that we read from the RTC are set. That
-         * means only tm_wday, tm_hour, tm_min.
-         */
-        spin_lock_irqsave(&ds1286_lock, flags);
-        alm_tm->tm_min = rtc_read(RTC_MINUTES_ALARM) & 0x7f;
-        alm_tm->tm_hour = rtc_read(RTC_HOURS_ALARM)  & 0x1f;
-        alm_tm->tm_wday = rtc_read(RTC_DAY_ALARM)    & 0x07;
-        cmd = rtc_read(RTC_CMD);
-        spin_unlock_irqrestore(&ds1286_lock, flags);
-        alm_tm->tm_min = bcd2bin(alm_tm->tm_min);
-        alm_tm->tm_hour = bcd2bin(alm_tm->tm_hour);
-        alm_tm->tm_sec = 0;
-}
-module_init(ds1286_init);
-module_exit(ds1286_exit);
-MODULE_AUTHOR("Ralf Baechle");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS_MISCDEV(RTC_MINOR);
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 408f5f92cb4e..53fdc7ff3870 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -427,9 +427,6 @@ static int hpet_release(struct inode *inode, struct file *file)
        if (irq)
                free_irq(irq, devp);
-        if (file->f_flags & FASYNC)
-                hpet_fasync(-1, file, 0);
        file->private_data = NULL;
        return 0;
 }
diff --git a/drivers/char/ip27-rtc.c b/drivers/char/ip27-rtc.c
deleted file mode 100644
index 2abd881b4cbc..000000000000
--- a/drivers/char/ip27-rtc.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/*
- *      Driver for the SGS-Thomson M48T35 Timekeeper RAM chip
- *
- *      Real Time Clock interface for Linux
- *
- *      TODO: Implement periodic interrupts.
- *
- *      Copyright (C) 2000 Silicon Graphics, Inc.
- *      Written by Ulf Carlsson (ulfc@engr.sgi.com)
- *
- *      Based on code written by Paul Gortmaker.
- *
- *      This driver allows use of the real time clock (built into
- *      nearly all computers) from user space. It exports the /dev/rtc
- *      interface supporting various ioctl() and also the /proc/rtc
- *      pseudo-file for status information.
- *
- *      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.
- *
- */
-#define RTC_VERSION             "1.09b"
-#include <linux/bcd.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/smp_lock.h>
-#include <linux/types.h>
-#include <linux/miscdevice.h>
-#include <linux/ioport.h>
-#include <linux/fcntl.h>
-#include <linux/rtc.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/proc_fs.h>
-#include <asm/m48t35.h>
-#include <asm/sn/ioc3.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-#include <asm/sn/klconfig.h>
-#include <asm/sn/sn0/ip27.h>
-#include <asm/sn/sn0/hub.h>
-#include <asm/sn/sn_private.h>
-static long rtc_ioctl(struct file *filp, unsigned int cmd,
-                        unsigned long arg);
-static int rtc_read_proc(char *page, char **start, off_t off,
-                         int count, int *eof, void *data);
-static void get_rtc_time(struct rtc_time *rtc_tm);
-/*
- *      Bits in rtc_status. (6 bits of room for future expansion)
- */
-#define RTC_IS_OPEN             0x01    /* means /dev/rtc is in use     */
-#define RTC_TIMER_ON            0x02    /* missed irq timer active      */
-static unsigned char rtc_status;        /* bitmapped status byte.       */
-static unsigned long rtc_freq;  /* Current periodic IRQ rate    */
-static struct m48t35_rtc *rtc;
-/*
- *      If this driver ever becomes modularised, it will be really nice
- *      to make the epoch retain its value across module reload...
- */
-static unsigned long epoch = 1970;      /* year corresponding to 0x00   */
-static const unsigned char days_in_mo[] =
-{0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
-static long rtc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
-{
-        struct rtc_time wtime;
-        switch (cmd) {
-        case RTC_RD_TIME:       /* Read the time/date from RTC  */
-        {
-                get_rtc_time(&wtime);
-                break;
-        }
-        case RTC_SET_TIME:      /* Set the RTC */
-        {
-                struct rtc_time rtc_tm;
-                unsigned char mon, day, hrs, min, sec, leap_yr;
-                unsigned int yrs;
-                if (!capable(CAP_SYS_TIME))
-                        return -EACCES;
-                if (copy_from_user(&rtc_tm, (struct rtc_time*)arg,
-                                   sizeof(struct rtc_time)))
-                        return -EFAULT;
-                yrs = rtc_tm.tm_year + 1900;
-                mon = rtc_tm.tm_mon + 1;   /* tm_mon starts at zero */
-                day = rtc_tm.tm_mday;
-                hrs = rtc_tm.tm_hour;
-                min = rtc_tm.tm_min;
-                sec = rtc_tm.tm_sec;
-                if (yrs < 1970)
-                        return -EINVAL;
-                leap_yr = ((!(yrs % 4) && (yrs % 100)) || !(yrs % 400));
-                if ((mon > 12) || (day == 0))
-                        return -EINVAL;
-                if (day > (days_in_mo[mon] + ((mon == 2) && leap_yr)))
-                        return -EINVAL;
-                if ((hrs >= 24) || (min >= 60) || (sec >= 60))
-                        return -EINVAL;
-                if ((yrs -= epoch) > 255)    /* They are unsigned */
-                        return -EINVAL;
-                if (yrs > 169)
-                        return -EINVAL;
-                if (yrs >= 100)
-                        yrs -= 100;
-                sec = bin2bcd(sec);
-                min = bin2bcd(min);
-                hrs = bin2bcd(hrs);
-                day = bin2bcd(day);
-                mon = bin2bcd(mon);
-                yrs = bin2bcd(yrs);
-                spin_lock_irq(&rtc_lock);
-                rtc->control |= M48T35_RTC_SET;
-                rtc->year = yrs;
-                rtc->month = mon;
-                rtc->date = day;
-                rtc->hour = hrs;
-                rtc->min = min;
-                rtc->sec = sec;
-                rtc->control &= ~M48T35_RTC_SET;
-                spin_unlock_irq(&rtc_lock);
-                return 0;
-        }
-        default:
-                return -EINVAL;
-        }
-        return copy_to_user((void *)arg, &wtime, sizeof wtime) ? -EFAULT : 0;
-}
-/*
- *      We enforce only one user at a time here with the open/close.
- *      Also clear the previous interrupt data on an open, and clean
- *      up things on a close.
- */
-static int rtc_open(struct inode *inode, struct file *file)
-{
-        lock_kernel();
-        spin_lock_irq(&rtc_lock);
-        if (rtc_status & RTC_IS_OPEN) {
-                spin_unlock_irq(&rtc_lock);
-                unlock_kernel();
-                return -EBUSY;
-        }
-        rtc_status |= RTC_IS_OPEN;
-        spin_unlock_irq(&rtc_lock);
-        unlock_kernel();
-        return 0;
-}
-static int rtc_release(struct inode *inode, struct file *file)
-{
-        /*
-         * Turn off all interrupts once the device is no longer
-         * in use, and clear the data.
-         */
-        spin_lock_irq(&rtc_lock);
-        rtc_status &= ~RTC_IS_OPEN;
-        spin_unlock_irq(&rtc_lock);
-        return 0;
-}
-/*
- *      The various file operations we support.
- */
-static const struct file_operations rtc_fops = {
-        .owner          = THIS_MODULE,
-        .unlocked_ioctl = rtc_ioctl,
-        .open           = rtc_open,
-        .release        = rtc_release,
-};
-static struct miscdevice rtc_dev=
-{
-        RTC_MINOR,
-        "rtc",
-        &rtc_fops
-};
-static int __init rtc_init(void)
-{
-        rtc = (struct m48t35_rtc *)
-        (KL_CONFIG_CH_CONS_INFO(master_nasid)->memory_base + IOC3_BYTEBUS_DEV0);
-        printk(KERN_INFO "Real Time Clock Driver v%s\n", RTC_VERSION);
-        if (misc_register(&rtc_dev)) {
-                printk(KERN_ERR "rtc: cannot register misc device.\n");
-                return -ENODEV;
-        }
-        if (!create_proc_read_entry("driver/rtc", 0, NULL, rtc_read_proc, NULL)) {
-                printk(KERN_ERR "rtc: cannot create /proc/rtc.\n");
-                misc_deregister(&rtc_dev);
-                return -ENOENT;
-        }
-        rtc_freq = 1024;
-        return 0;
-}
-static void __exit rtc_exit (void)
-{
-        /* interrupts and timer disabled at this point by rtc_release */
-        remove_proc_entry ("rtc", NULL);
-        misc_deregister(&rtc_dev);
-}
-module_init(rtc_init);
-module_exit(rtc_exit);
-/*
- *      Info exported via "/proc/rtc".
- */
-static int rtc_get_status(char *buf)
-{
-        char *p;
-        struct rtc_time tm;
-        /*
-         * Just emulate the standard /proc/rtc
-         */
-        p = buf;
-        get_rtc_time(&tm);
-        /*
-         * There is no way to tell if the luser has the RTC set for local
-         * time or for Universal Standard Time (GMT). Probably local though.
-         */
-        p += sprintf(p,
-                     "rtc_time\t: %02d:%02d:%02d\n"
-                     "rtc_date\t: %04d-%02d-%02d\n"
-                     "rtc_epoch\t: %04lu\n"
-                     "24hr\t\t: yes\n",
-                     tm.tm_hour, tm.tm_min, tm.tm_sec,
-                     tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, epoch);
-        return  p - buf;
-}
-static int rtc_read_proc(char *page, char **start, off_t off,
-                                 int count, int *eof, void *data)
-{
-        int len = rtc_get_status(page);
-        if (len <= off+count) *eof = 1;
-        *start = page + off;
-        len -= off;
-        if (len>count) len = count;
-        if (len<0) len = 0;
-        return len;
-}
-static void get_rtc_time(struct rtc_time *rtc_tm)
-{
-        /*
-         * Do we need to wait for the last update to finish?
-         */
-        /*
-         * Only the values that we read from the RTC are set. We leave
-         * tm_wday, tm_yday and tm_isdst untouched. Even though the
-         * RTC has RTC_DAY_OF_WEEK, we ignore it, as it is only updated
-         * by the RTC when initially set to a non-zero value.
-         */
-        spin_lock_irq(&rtc_lock);
-        rtc->control |= M48T35_RTC_READ;
-        rtc_tm->tm_sec = rtc->sec;
-        rtc_tm->tm_min = rtc->min;
-        rtc_tm->tm_hour = rtc->hour;
-        rtc_tm->tm_mday = rtc->date;
-        rtc_tm->tm_mon = rtc->month;
-        rtc_tm->tm_year = rtc->year;
-        rtc->control &= ~M48T35_RTC_READ;
-        spin_unlock_irq(&rtc_lock);
-        rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);
-        rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);
-        rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
-        rtc_tm->tm_mday = bcd2bin(rtc_tm->tm_mday);
-        rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
-        rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
-        /*
-         * Account for differences between how the RTC uses the values
-         * and how they are defined in a struct rtc_time;
-         */
-        if ((rtc_tm->tm_year += (epoch - 1900)) <= 69)
-                rtc_tm->tm_year += 100;
-        rtc_tm->tm_mon--;
-}
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index 835a33c8d5f5..41fc11dc921c 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -162,8 +162,6 @@ static int ipmi_release(struct inode *inode, struct file *file)
        if (rv)
                return rv;
-        ipmi_fasync (-1, file, 0);
        /* FIXME - free the messages in the list. */
        kfree(priv);
@@ -957,3 +955,4 @@ module_exit(cleanup_ipmi);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Corey Minyard <minyard@mvista.com>");
 MODULE_DESCRIPTION("Linux device interface for the IPMI message handler.");
+MODULE_ALIAS("platform:ipmi_si");
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 235fab0bdf79..a4d57e31f713 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -870,7 +870,6 @@ static int ipmi_close(struct inode *ino, struct file *filep)
                clear_bit(0, &ipmi_wdog_open);
        }
-        ipmi_fasync(-1, filep, 0);
        expect_close = 0;
        return 0;
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index 9a626e50b793..4d64a02612a4 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -554,7 +554,7 @@ static int mgslpc_probe(struct pcmcia_device *link)
    /* Initialize the struct pcmcia_device structure */
    /* Interrupt setup */
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
    link->irq.IRQInfo1   = IRQ_LEVEL_ID;
    link->irq.Handler = NULL;
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 705a839f1796..675076f5fca8 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1139,18 +1139,12 @@ static int random_fasync(int fd, struct file *filp, int on)
        return fasync_helper(fd, filp, on, &fasync);
 }
-static int random_release(struct inode *inode, struct file *filp)
-{
-        return fasync_helper(-1, filp, 0, &fasync);
-}
 const struct file_operations random_fops = {
        .read  = random_read,
        .write = random_write,
        .poll  = random_poll,
        .unlocked_ioctl = random_ioctl,
        .fasync = random_fasync,
-        .release = random_release,
 };
 const struct file_operations urandom_fops = {
@@ -1158,7 +1152,6 @@ const struct file_operations urandom_fops = {
        .write = random_write,
        .unlocked_ioctl = random_ioctl,
        .fasync = random_fasync,
-        .release = random_release,
 };
 /***************************************************************
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 32dc89720d58..20d6efb6324e 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -788,8 +788,6 @@ static int rtc_release(struct inode *inode, struct file *file)
        }
        spin_unlock_irq(&rtc_lock);
-        if (file->f_flags & FASYNC)
-                rtc_fasync(-1, file, 0);
 no_irq:
 #endif
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 85e0eb76eeab..2457b07dabd6 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -898,7 +898,6 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
 static int sonypi_misc_release(struct inode *inode, struct file *file)
 {
-        sonypi_misc_fasync(-1, file, 0);
        mutex_lock(&sonypi_device.lock);
        sonypi_device.open_count--;
        mutex_unlock(&sonypi_device.lock);
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig
index 5a11e3cbcae2..e0dbd388757f 100644
--- a/drivers/edac/Kconfig
+++ b/drivers/edac/Kconfig
@@ -102,6 +102,13 @@ config EDAC_I3000
          Support for error detection and correction on the Intel
          3000 and 3010 server chipsets.
+config EDAC_X38
+        tristate "Intel X38"
+        depends on EDAC_MM_EDAC && PCI && X86
+        help
+          Support for error detection and correction on the Intel
+          X38 server chipsets.
 config EDAC_I82860
        tristate "Intel 82860"
        depends on EDAC_MM_EDAC && PCI && X86_32
diff --git a/drivers/edac/Makefile b/drivers/edac/Makefile
index e5e9104b5520..62c2d9bad8dc 100644
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_EDAC_I82443BXGX)		+= i82443bxgx_edac.o
 obj-$(CONFIG_EDAC_I82875P)              += i82875p_edac.o
 obj-$(CONFIG_EDAC_I82975X)              += i82975x_edac.o
 obj-$(CONFIG_EDAC_I3000)                += i3000_edac.o
+obj-$(CONFIG_EDAC_X38)                  += x38_edac.o
 obj-$(CONFIG_EDAC_I82860)               += i82860_edac.o
 obj-$(CONFIG_EDAC_R82600)               += r82600_edac.o
 obj-$(CONFIG_EDAC_PASEMI)               += pasemi_edac.o
diff --git a/drivers/edac/cell_edac.c b/drivers/edac/cell_edac.c
index 887072f5dc8b..cd2e3b8087e7 100644
--- a/drivers/edac/cell_edac.c
+++ b/drivers/edac/cell_edac.c
@@ -9,6 +9,7 @@
 */
 #undef DEBUG
+#include <linux/edac.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
@@ -164,6 +165,8 @@ static int __devinit cell_edac_probe(struct platform_device *pdev)
        if (regs == NULL)
                return -ENODEV;
+        edac_op_state = EDAC_OPSTATE_POLL;
        /* Get channel population */
        reg = in_be64(&regs->mic_mnt_cfg);
        dev_dbg(&pdev->dev, "MIC_MNT_CFG = 0x%016lx\n", reg);
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
new file mode 100644
index 000000000000..2406c2ce2844
--- /dev/null
+++ b/drivers/edac/x38_edac.c
@@ -0,0 +1,524 @@
+/*
+ * Intel X38 Memory Controller kernel module
+ * Copyright (C) 2008 Cluster Computing, Inc.
+ *
+ * This file may be distributed under the terms of the
+ * GNU General Public License.
+ *
+ * This file is based on i3200_edac.c
+ *
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/slab.h>
+#include <linux/edac.h>
+#include "edac_core.h"
+#define X38_REVISION            "1.1"
+#define EDAC_MOD_STR            "x38_edac"
+#define PCI_DEVICE_ID_INTEL_X38_HB      0x29e0
+#define X38_RANKS               8
+#define X38_RANKS_PER_CHANNEL   4
+#define X38_CHANNELS            2
+/* Intel X38 register addresses - device 0 function 0 - DRAM Controller */
+#define X38_MCHBAR_LOW  0x48    /* MCH Memory Mapped Register BAR */
+#define X38_MCHBAR_HIGH 0x4b
+#define X38_MCHBAR_MASK 0xfffffc000ULL  /* bits 35:14 */
+#define X38_MMR_WINDOW_SIZE     16384
+#define X38_TOM 0xa0    /* Top of Memory (16b)
+                                 *
+                                 * 15:10 reserved
+                                 *  9:0  total populated physical memory
+                                 */
+#define X38_TOM_MASK    0x3ff   /* bits 9:0 */
+#define X38_TOM_SHIFT 26        /* 64MiB grain */
+#define X38_ERRSTS      0xc8    /* Error Status Register (16b)
+                                 *
+                                 * 15    reserved
+                                 * 14    Isochronous TBWRR Run Behind FIFO Full
+                                 *       (ITCV)
+                                 * 13    Isochronous TBWRR Run Behind FIFO Put
+                                 *       (ITSTV)
+                                 * 12    reserved
+                                 * 11    MCH Thermal Sensor Event
+                                 *       for SMI/SCI/SERR (GTSE)
+                                 * 10    reserved
+                                 *  9    LOCK to non-DRAM Memory Flag (LCKF)
+                                 *  8    reserved
+                                 *  7    DRAM Throttle Flag (DTF)
+                                 *  6:2  reserved
+                                 *  1    Multi-bit DRAM ECC Error Flag (DMERR)
+                                 *  0    Single-bit DRAM ECC Error Flag (DSERR)
+                                 */
+#define X38_ERRSTS_UE           0x0002
+#define X38_ERRSTS_CE           0x0001
+#define X38_ERRSTS_BITS (X38_ERRSTS_UE | X38_ERRSTS_CE)
+/* Intel  MMIO register space - device 0 function 0 - MMR space */
+#define X38_C0DRB       0x200   /* Channel 0 DRAM Rank Boundary (16b x 4)
+                                 *
+                                 * 15:10 reserved
+                                 *  9:0  Channel 0 DRAM Rank Boundary Address
+                                 */
+#define X38_C1DRB       0x600   /* Channel 1 DRAM Rank Boundary (16b x 4) */
+#define X38_DRB_MASK    0x3ff   /* bits 9:0 */
+#define X38_DRB_SHIFT 26        /* 64MiB grain */
+#define X38_C0ECCERRLOG 0x280   /* Channel 0 ECC Error Log (64b)
+                                 *
+                                 * 63:48 Error Column Address (ERRCOL)
+                                 * 47:32 Error Row Address (ERRROW)
+                                 * 31:29 Error Bank Address (ERRBANK)
+                                 * 28:27 Error Rank Address (ERRRANK)
+                                 * 26:24 reserved
+                                 * 23:16 Error Syndrome (ERRSYND)
+                                 * 15: 2 reserved
+                                 *    1  Multiple Bit Error Status (MERRSTS)
+                                 *    0  Correctable Error Status (CERRSTS)
+                                 */
+#define X38_C1ECCERRLOG 0x680   /* Channel 1 ECC Error Log (64b) */
+#define X38_ECCERRLOG_CE        0x1
+#define X38_ECCERRLOG_UE        0x2
+#define X38_ECCERRLOG_RANK_BITS 0x18000000
+#define X38_ECCERRLOG_SYNDROME_BITS     0xff0000
+#define X38_CAPID0 0xe0 /* see P.94 of spec for details */
+static int x38_channel_num;
+static int how_many_channel(struct pci_dev *pdev)
+{
+        unsigned char capid0_8b; /* 8th byte of CAPID0 */
+        pci_read_config_byte(pdev, X38_CAPID0 + 8, &capid0_8b);
+        if (capid0_8b & 0x20) { /* check DCD: Dual Channel Disable */
+                debugf0("In single channel mode.\n");
+                x38_channel_num = 1;
+        } else {
+                debugf0("In dual channel mode.\n");
+                x38_channel_num = 2;
+        }
+        return x38_channel_num;
+}
+static unsigned long eccerrlog_syndrome(u64 log)
+{
+        return (log & X38_ECCERRLOG_SYNDROME_BITS) >> 16;
+}
+static int eccerrlog_row(int channel, u64 log)
+{
+        return ((log & X38_ECCERRLOG_RANK_BITS) >> 27) |
+                (channel * X38_RANKS_PER_CHANNEL);
+}
+enum x38_chips {
+        X38 = 0,
+};
+struct x38_dev_info {
+        const char *ctl_name;
+};
+struct x38_error_info {
+        u16 errsts;
+        u16 errsts2;
+        u64 eccerrlog[X38_CHANNELS];
+};
+static const struct x38_dev_info x38_devs[] = {
+        [X38] = {
+                .ctl_name = "x38"},
+};
+static struct pci_dev *mci_pdev;
+static int x38_registered = 1;
+static void x38_clear_error_info(struct mem_ctl_info *mci)
+{
+        struct pci_dev *pdev;
+        pdev = to_pci_dev(mci->dev);
+        /*
+         * Clear any error bits.
+         * (Yes, we really clear bits by writing 1 to them.)
+         */
+        pci_write_bits16(pdev, X38_ERRSTS, X38_ERRSTS_BITS,
+                         X38_ERRSTS_BITS);
+}
+static u64 x38_readq(const void __iomem *addr)
+{
+        return readl(addr) | (((u64)readl(addr + 4)) << 32);
+}
+static void x38_get_and_clear_error_info(struct mem_ctl_info *mci,
+                                 struct x38_error_info *info)
+{
+        struct pci_dev *pdev;
+        void __iomem *window = mci->pvt_info;
+        pdev = to_pci_dev(mci->dev);
+        /*
+         * This is a mess because there is no atomic way to read all the
+         * registers at once and the registers can transition from CE being
+         * overwritten by UE.
+         */
+        pci_read_config_word(pdev, X38_ERRSTS, &info->errsts);
+        if (!(info->errsts & X38_ERRSTS_BITS))
+                return;
+        info->eccerrlog[0] = x38_readq(window + X38_C0ECCERRLOG);
+        if (x38_channel_num == 2)
+                info->eccerrlog[1] = x38_readq(window + X38_C1ECCERRLOG);
+        pci_read_config_word(pdev, X38_ERRSTS, &info->errsts2);
+        /*
+         * If the error is the same for both reads then the first set
+         * of reads is valid.  If there is a change then there is a CE
+         * with no info and the second set of reads is valid and
+         * should be UE info.
+         */
+        if ((info->errsts ^ info->errsts2) & X38_ERRSTS_BITS) {
+                info->eccerrlog[0] = x38_readq(window + X38_C0ECCERRLOG);
+                if (x38_channel_num == 2)
+                        info->eccerrlog[1] =
+                                x38_readq(window + X38_C1ECCERRLOG);
+        }
+        x38_clear_error_info(mci);
+}
+static void x38_process_error_info(struct mem_ctl_info *mci,
+                                struct x38_error_info *info)
+{
+        int channel;
+        u64 log;
+        if (!(info->errsts & X38_ERRSTS_BITS))
+                return;
+        if ((info->errsts ^ info->errsts2) & X38_ERRSTS_BITS) {
+                edac_mc_handle_ce_no_info(mci, "UE overwrote CE");
+                info->errsts = info->errsts2;
+        }
+        for (channel = 0; channel < x38_channel_num; channel++) {
+                log = info->eccerrlog[channel];
+                if (log & X38_ECCERRLOG_UE) {
+                        edac_mc_handle_ue(mci, 0, 0,
+                                eccerrlog_row(channel, log), "x38 UE");
+                } else if (log & X38_ECCERRLOG_CE) {
+                        edac_mc_handle_ce(mci, 0, 0,
+                                eccerrlog_syndrome(log),
+                                eccerrlog_row(channel, log), 0, "x38 CE");
+                }
+        }
+}
+static void x38_check(struct mem_ctl_info *mci)
+{
+        struct x38_error_info info;
+        debugf1("MC%d: %s()\n", mci->mc_idx, __func__);
+        x38_get_and_clear_error_info(mci, &info);
+        x38_process_error_info(mci, &info);
+}
+void __iomem *x38_map_mchbar(struct pci_dev *pdev)
+{
+        union {
+                u64 mchbar;
+                struct {
+                        u32 mchbar_low;
+                        u32 mchbar_high;
+                };
+        } u;
+        void __iomem *window;
+        pci_read_config_dword(pdev, X38_MCHBAR_LOW, &u.mchbar_low);
+        pci_write_config_dword(pdev, X38_MCHBAR_LOW, u.mchbar_low | 0x1);
+        pci_read_config_dword(pdev, X38_MCHBAR_HIGH, &u.mchbar_high);
+        u.mchbar &= X38_MCHBAR_MASK;
+        if (u.mchbar != (resource_size_t)u.mchbar) {
+                printk(KERN_ERR
+                        "x38: mmio space beyond accessible range (0x%llx)\n",
+                        (unsigned long long)u.mchbar);
+                return NULL;
+        }
+        window = ioremap_nocache(u.mchbar, X38_MMR_WINDOW_SIZE);
+        if (!window)
+                printk(KERN_ERR "x38: cannot map mmio space at 0x%llx\n",
+                        (unsigned long long)u.mchbar);
+        return window;
+}
+static void x38_get_drbs(void __iomem *window,
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL])
+{
+        int i;
+        for (i = 0; i < X38_RANKS_PER_CHANNEL; i++) {
+                drbs[0][i] = readw(window + X38_C0DRB + 2*i) & X38_DRB_MASK;
+                drbs[1][i] = readw(window + X38_C1DRB + 2*i) & X38_DRB_MASK;
+        }
+}
+static bool x38_is_stacked(struct pci_dev *pdev,
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL])
+{
+        u16 tom;
+        pci_read_config_word(pdev, X38_TOM, &tom);
+        tom &= X38_TOM_MASK;
+        return drbs[X38_CHANNELS - 1][X38_RANKS_PER_CHANNEL - 1] == tom;
+}
+static unsigned long drb_to_nr_pages(
+                        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL],
+                        bool stacked, int channel, int rank)
+{
+        int n;
+        n = drbs[channel][rank];
+        if (rank > 0)
+                n -= drbs[channel][rank - 1];
+        if (stacked && (channel == 1) && drbs[channel][rank] ==
+                                drbs[channel][X38_RANKS_PER_CHANNEL - 1]) {
+                n -= drbs[0][X38_RANKS_PER_CHANNEL - 1];
+        }
+        n <<= (X38_DRB_SHIFT - PAGE_SHIFT);
+        return n;
+}
+static int x38_probe1(struct pci_dev *pdev, int dev_idx)
+{
+        int rc;
+        int i;
+        struct mem_ctl_info *mci = NULL;
+        unsigned long last_page;
+        u16 drbs[X38_CHANNELS][X38_RANKS_PER_CHANNEL];
+        bool stacked;
+        void __iomem *window;
+        debugf0("MC: %s()\n", __func__);
+        window = x38_map_mchbar(pdev);
+        if (!window)
+                return -ENODEV;
+        x38_get_drbs(window, drbs);
+        how_many_channel(pdev);
+        /* FIXME: unconventional pvt_info usage */
+        mci = edac_mc_alloc(0, X38_RANKS, x38_channel_num, 0);
+        if (!mci)
+                return -ENOMEM;
+        debugf3("MC: %s(): init mci\n", __func__);
+        mci->dev = &pdev->dev;
+        mci->mtype_cap = MEM_FLAG_DDR2;
+        mci->edac_ctl_cap = EDAC_FLAG_SECDED;
+        mci->edac_cap = EDAC_FLAG_SECDED;
+        mci->mod_name = EDAC_MOD_STR;
+        mci->mod_ver = X38_REVISION;
+        mci->ctl_name = x38_devs[dev_idx].ctl_name;
+        mci->dev_name = pci_name(pdev);
+        mci->edac_check = x38_check;
+        mci->ctl_page_to_phys = NULL;
+        mci->pvt_info = window;
+        stacked = x38_is_stacked(pdev, drbs);
+        /*
+         * The dram rank boundary (DRB) reg values are boundary addresses
+         * for each DRAM rank with a granularity of 64MB.  DRB regs are
+         * cumulative; the last one will contain the total memory
+         * contained in all ranks.
+         */
+        last_page = -1UL;
+        for (i = 0; i < mci->nr_csrows; i++) {
+                unsigned long nr_pages;
+                struct csrow_info *csrow = &mci->csrows[i];
+                nr_pages = drb_to_nr_pages(drbs, stacked,
+                        i / X38_RANKS_PER_CHANNEL,
+                        i % X38_RANKS_PER_CHANNEL);
+                if (nr_pages == 0) {
+                        csrow->mtype = MEM_EMPTY;
+                        continue;
+                }
+                csrow->first_page = last_page + 1;
+                last_page += nr_pages;
+                csrow->last_page = last_page;
+                csrow->nr_pages = nr_pages;
+                csrow->grain = nr_pages << PAGE_SHIFT;
+                csrow->mtype = MEM_DDR2;
+                csrow->dtype = DEV_UNKNOWN;
+                csrow->edac_mode = EDAC_UNKNOWN;
+        }
+        x38_clear_error_info(mci);
+        rc = -ENODEV;
+        if (edac_mc_add_mc(mci)) {
+                debugf3("MC: %s(): failed edac_mc_add_mc()\n", __func__);
+                goto fail;
+        }
+        /* get this far and it's successful */
+        debugf3("MC: %s(): success\n", __func__);
+        return 0;
+fail:
+        iounmap(window);
+        if (mci)
+                edac_mc_free(mci);
+        return rc;
+}
+static int __devinit x38_init_one(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        int rc;
+        debugf0("MC: %s()\n", __func__);
+        if (pci_enable_device(pdev) < 0)
+                return -EIO;
+        rc = x38_probe1(pdev, ent->driver_data);
+        if (!mci_pdev)
+                mci_pdev = pci_dev_get(pdev);
+        return rc;
+}
+static void __devexit x38_remove_one(struct pci_dev *pdev)
+{
+        struct mem_ctl_info *mci;
+        debugf0("%s()\n", __func__);
+        mci = edac_mc_del_mc(&pdev->dev);
+        if (!mci)
+                return;
+        iounmap(mci->pvt_info);
+        edac_mc_free(mci);
+}
+static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
+        {
+         PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+         X38},
+        {
+         0,
+         }                      /* 0 terminated list. */
+};
+MODULE_DEVICE_TABLE(pci, x38_pci_tbl);
+static struct pci_driver x38_driver = {
+        .name = EDAC_MOD_STR,
+        .probe = x38_init_one,
+        .remove = __devexit_p(x38_remove_one),
+        .id_table = x38_pci_tbl,
+};
+static int __init x38_init(void)
+{
+        int pci_rc;
+        debugf3("MC: %s()\n", __func__);
+        /* Ensure that the OPSTATE is set correctly for POLL or NMI */
+        opstate_init();
+        pci_rc = pci_register_driver(&x38_driver);
+        if (pci_rc < 0)
+                goto fail0;
+        if (!mci_pdev) {
+                x38_registered = 0;
+                mci_pdev = pci_get_device(PCI_VENDOR_ID_INTEL,
+                                        PCI_DEVICE_ID_INTEL_X38_HB, NULL);
+                if (!mci_pdev) {
+                        debugf0("x38 pci_get_device fail\n");
+                        pci_rc = -ENODEV;
+                        goto fail1;
+                }
+                pci_rc = x38_init_one(mci_pdev, x38_pci_tbl);
+                if (pci_rc < 0) {
+                        debugf0("x38 init fail\n");
+                        pci_rc = -ENODEV;
+                        goto fail1;
+                }
+        }
+        return 0;
+fail1:
+        pci_unregister_driver(&x38_driver);
+fail0:
+        if (mci_pdev)
+                pci_dev_put(mci_pdev);
+        return pci_rc;
+}
+static void __exit x38_exit(void)
+{
+        debugf3("MC: %s()\n", __func__);
+        pci_unregister_driver(&x38_driver);
+        if (!x38_registered) {
+                x38_remove_one(mci_pdev);
+                pci_dev_put(mci_pdev);
+        }
+}
+module_init(x38_init);
+module_exit(x38_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Cluster Computing, Inc. Hitoshi Mitake");
+MODULE_DESCRIPTION("MC support for Intel X38 memory hub controllers");
+module_param(edac_op_state, int, 0444);
+MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI");
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 0d46627663b1..78eeed5caaff 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -406,8 +406,6 @@ int drm_release(struct inode *inode, struct file *filp)
        if (dev->driver->driver_features & DRIVER_GEM)
                drm_gem_release(dev, file_priv);
-        drm_fasync(-1, filp, 0);
        mutex_lock(&dev->ctxlist_mutex);
        if (!list_empty(&dev->ctxlist)) {
                struct drm_ctx_list *pos, *n;
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 743e6f8cb202..1903e7515650 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1263,6 +1263,7 @@ static const struct hid_device_id hid_blacklist[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c
index 1a0d0dfc62fc..f5474300b83a 100644
--- a/drivers/hid/hid-dell.c
+++ b/drivers/hid/hid-dell.c
@@ -48,6 +48,7 @@ err_free:
 static const struct hid_device_id dell_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) },
        { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, dell_devices);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index a0d6a6cb1842..5cc404291736 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -163,6 +163,9 @@
 #define USB_VENDOR_ID_GENERAL_TOUCH     0x0dfc
+#define USB_VENDOR_ID_GENERIC_13BA      0x13ba
+#define USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE    0x0017
 #define USB_VENDOR_ID_GLAB              0x06c2
 #define USB_DEVICE_ID_4_PHIDGETSERVO_30 0x0038
 #define USB_DEVICE_ID_1_PHIDGETSERVO_30 0x0039
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 42bdd83444c1..18e5ddd722cd 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -20,6 +20,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/mm.h>
+#include <linux/mutex.h>
 #include <linux/smp_lock.h>
 #include <linux/spinlock.h>
 #include <asm/unaligned.h>
@@ -776,21 +777,10 @@ static int usbhid_start(struct hid_device *hid)
        struct usb_interface *intf = to_usb_interface(hid->dev.parent);
        struct usb_host_interface *interface = intf->cur_altsetting;
        struct usb_device *dev = interface_to_usbdev(intf);
-        struct usbhid_device *usbhid;
+        struct usbhid_device *usbhid = hid->driver_data;
        unsigned int n, insize = 0;
        int ret;
-        WARN_ON(hid->driver_data);
-        usbhid = kzalloc(sizeof(struct usbhid_device), GFP_KERNEL);
-        if (usbhid == NULL) {
-                ret = -ENOMEM;
-                goto err;
-        }
-        hid->driver_data = usbhid;
-        usbhid->hid = hid;
        usbhid->bufsize = HID_MIN_BUFFER_SIZE;
        hid_find_max_report(hid, HID_INPUT_REPORT, &usbhid->bufsize);
        hid_find_max_report(hid, HID_OUTPUT_REPORT, &usbhid->bufsize);
@@ -804,6 +794,7 @@ static int usbhid_start(struct hid_device *hid)
        if (insize > HID_MAX_BUFFER_SIZE)
                insize = HID_MAX_BUFFER_SIZE;
+        mutex_lock(&usbhid->setup);
        if (hid_alloc_buffers(dev, hid)) {
                ret = -ENOMEM;
                goto fail;
@@ -888,6 +879,9 @@ static int usbhid_start(struct hid_device *hid)
        usbhid_init_reports(hid);
        hid_dump_device(hid);
+        set_bit(HID_STARTED, &usbhid->iofl);
+        mutex_unlock(&usbhid->setup);
        return 0;
 fail:
@@ -895,8 +889,7 @@ fail:
        usb_free_urb(usbhid->urbout);
        usb_free_urb(usbhid->urbctrl);
        hid_free_buffers(dev, hid);
-        kfree(usbhid);
+        mutex_unlock(&usbhid->setup);
-err:
        return ret;
 }
@@ -907,6 +900,8 @@ static void usbhid_stop(struct hid_device *hid)
        if (WARN_ON(!usbhid))
                return;
+        mutex_lock(&usbhid->setup);
+        clear_bit(HID_STARTED, &usbhid->iofl);
        spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
        set_bit(HID_DISCONNECTED, &usbhid->iofl);
        spin_unlock_irq(&usbhid->inlock);
@@ -931,8 +926,7 @@ static void usbhid_stop(struct hid_device *hid)
        usb_free_urb(usbhid->urbout);
        hid_free_buffers(hid_to_usb_dev(hid), hid);
-        kfree(usbhid);
+        mutex_unlock(&usbhid->setup);
-        hid->driver_data = NULL;
 }
 static struct hid_ll_driver usb_hid_driver = {
@@ -947,6 +941,7 @@ static struct hid_ll_driver usb_hid_driver = {
 static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
        struct usb_device *dev = interface_to_usbdev(intf);
+        struct usbhid_device *usbhid;
        struct hid_device *hid;
        size_t len;
        int ret;
@@ -1000,14 +995,26 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
        if (usb_string(dev, dev->descriptor.iSerialNumber, hid->uniq, 64) <= 0)
                hid->uniq[0] = 0;
+        usbhid = kzalloc(sizeof(*usbhid), GFP_KERNEL);
+        if (usbhid == NULL) {
+                ret = -ENOMEM;
+                goto err;
+        }
+        hid->driver_data = usbhid;
+        usbhid->hid = hid;
+        mutex_init(&usbhid->setup); /* needed on suspend/resume */
        ret = hid_add_device(hid);
        if (ret) {
                if (ret != -ENODEV)
                        dev_err(&intf->dev, "can't add hid device: %d\n", ret);
-                goto err;
+                goto err_free;
        }
        return 0;
+err_free:
+        kfree(usbhid);
 err:
        hid_destroy_device(hid);
        return ret;
@@ -1016,11 +1023,14 @@ err:
 static void hid_disconnect(struct usb_interface *intf)
 {
        struct hid_device *hid = usb_get_intfdata(intf);
+        struct usbhid_device *usbhid;
        if (WARN_ON(!hid))
                return;
+        usbhid = hid->driver_data;
        hid_destroy_device(hid);
+        kfree(usbhid);
 }
 static int hid_suspend(struct usb_interface *intf, pm_message_t message)
@@ -1028,11 +1038,18 @@ static int hid_suspend(struct usb_interface *intf, pm_message_t message)
        struct hid_device *hid = usb_get_intfdata (intf);
        struct usbhid_device *usbhid = hid->driver_data;
+        mutex_lock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
+                mutex_unlock(&usbhid->setup);
+                return 0;
+        }
        spin_lock_irq(&usbhid->inlock); /* Sync with error handler */
        set_bit(HID_SUSPENDED, &usbhid->iofl);
        spin_unlock_irq(&usbhid->inlock);
-        del_timer(&usbhid->io_retry);
+        del_timer_sync(&usbhid->io_retry);
        usb_kill_urb(usbhid->urbin);
+        mutex_unlock(&usbhid->setup);
        dev_dbg(&intf->dev, "suspend\n");
        return 0;
 }
@@ -1043,9 +1060,16 @@ static int hid_resume(struct usb_interface *intf)
        struct usbhid_device *usbhid = hid->driver_data;
        int status;
+        mutex_lock(&usbhid->setup);
+        if (!test_bit(HID_STARTED, &usbhid->iofl)) {
+                mutex_unlock(&usbhid->setup);
+                return 0;
+        }
        clear_bit(HID_SUSPENDED, &usbhid->iofl);
        usbhid->retry_delay = 0;
        status = hid_start_in(hid);
+        mutex_unlock(&usbhid->setup);
        dev_dbg(&intf->dev, "resume status %d\n", status);
        return status;
 }
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 3ac320785fc5..83e851a5ed30 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -242,8 +242,6 @@ static int hiddev_release(struct inode * inode, struct file * file)
        struct hiddev_list *list = file->private_data;
        unsigned long flags;
-        hiddev_fasync(-1, file, 0);
        spin_lock_irqsave(&list->hiddev->list_lock, flags);
        list_del(&list->node);
        spin_unlock_irqrestore(&list->hiddev->list_lock, flags);
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index abedb13c623e..55973ff54008 100644
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -27,6 +27,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/list.h>
+#include <linux/mutex.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
@@ -73,6 +74,7 @@ struct usbhid_device {
        dma_addr_t outbuf_dma;                                          /* Output buffer dma */
        spinlock_t outlock;                                             /* Output fifo spinlock */
+        struct mutex setup;
        unsigned long iofl;                                             /* I/O flags (CTRL_RUNNING, OUT_RUNNING) */
        struct timer_list io_retry;                                     /* Retry timer */
        unsigned long stop_retry;                                       /* Time to give up, in jiffies */
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 4ad9c47ee4fd..fdebd930408e 100644
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -507,7 +507,7 @@ static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
        unsigned long timeout;
        int ret;
-        if (!readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)
+        if (!(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN))
                return -EIO;
        ret = s3c24xx_i2c_set_master(i2c);
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index c3022a023449..e4c98539c517 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -81,6 +81,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = {
 static struct i2c_adapter scx200_i2c_ops = {
        .owner             = THIS_MODULE,
+        .class             = I2C_CLASS_HWMON | I2C_CLASS_SPD,
        .id                = I2C_HW_B_SCX200,
        .algo_data         = &scx200_i2c_data,
        .name   = "NatSemi SCx200 I2C",
diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
index daf9dce39e52..e56c7b72f9e2 100644
--- a/drivers/ide/alim15x3.c
+++ b/drivers/ide/alim15x3.c
@@ -5,7 +5,7 @@
 *
 *  Copyright (C) 1998-2000 Andre Hedrick (andre@linux-ide.org)
 *  May be copied or modified under the terms of the GNU General Public License
- *  Copyright (C) 2002 Alan Cox <alan@redhat.com>
+ *  Copyright (C) 2002 Alan Cox
 *  ALi (now ULi M5228) support by Clear Zhang <Clear.Zhang@ali.com.tw>
 *  Copyright (C) 2007 MontaVista Software, Inc. <source@mvista.com>
 *  Copyright (C) 2007 Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
index a7909e9c720e..f5afd46ed51c 100644
--- a/drivers/ide/hpt366.c
+++ b/drivers/ide/hpt366.c
@@ -52,7 +52,7 @@
 * different clocks on read/write. This requires overloading rw_disk and
 * other deeply crazy things. Thanks to <http://www.hoerstreich.de> for
 * keeping me sane. 
- *              Alan Cox <alan@redhat.com>
+ *              Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 * - fix the clock turnaround code: it was writing to the wrong ports when
 *   called for the secondary channel, caching the current clock mode per-
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 48b5eda3ab41..42ab6d8715f2 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1250,7 +1250,8 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
                 * separate masks.
                 */
                alignment = queue_dma_alignment(q) | q->dma_pad_mask;
-                if ((unsigned long)buf & alignment || rq->data_len & alignment
+                if ((unsigned long)buf & alignment
+                    || rq->data_len & q->dma_pad_mask
                    || object_is_on_stack(buf))
                        drive->dma = 0;
        }
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index e5adebe8ac2c..eb9fac4d0f0c 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -2,7 +2,7 @@
 *  Copyright (C) 1994-1998        Linus Torvalds & authors (see below)
 *  Copyright (C) 1998-2002        Linux ATA Development
 *                                    Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003             Red Hat <alan@redhat.com>
+ *  Copyright (C) 2003             Red Hat
 *  Copyright (C) 2003-2005, 2007  Bartlomiej Zolnierkiewicz
 */
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 7b6662854374..b8078b3231f7 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -281,7 +281,12 @@ static int ide_gd_media_changed(struct gendisk *disk)
 static int ide_gd_revalidate_disk(struct gendisk *disk)
 {
        struct ide_disk_obj *idkp = ide_drv_g(disk, ide_disk_obj);
-        set_capacity(disk, ide_gd_capacity(idkp->drive));
+        ide_drive_t *drive = idkp->drive;
+        if (ide_gd_media_changed(disk))
+                drive->disk_ops->get_capacity(drive);
+        set_capacity(disk, ide_gd_capacity(drive));
        return 0;
 }
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index bb7a1ed8094e..5d6ba14e211d 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -1,6 +1,6 @@
 /*
 *  Copyright (C) 2000-2002     Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003          Red Hat <alan@redhat.com>
+ *  Copyright (C) 2003          Red Hat
 *
 */
diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
index 474f96a7c076..bddae2b329a0 100644
--- a/drivers/ide/ide-pci-generic.c
+++ b/drivers/ide/ide-pci-generic.c
@@ -1,6 +1,6 @@
 /*
 *  Copyright (C) 2001-2002     Andre Hedrick <andre@linux-ide.org>
- *  Portions (C) Copyright 2002  Red Hat Inc <alan@redhat.com>
+ *  Portions (C) Copyright 2002  Red Hat Inc
 *
 * 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
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index c31d0dd7a532..f3cddd1b2f8f 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -1,6 +1,6 @@
 /*
 *  Copyright (C) 1997-1998     Mark Lord
- *  Copyright (C) 2003          Red Hat <alan@redhat.com>
+ *  Copyright (C) 2003          Red Hat
 *
 *  Some code was moved here from ide.c, see it for original copyrights.
 */
diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
index 995e18bb3139..ef004089761b 100644
--- a/drivers/ide/it821x.c
+++ b/drivers/ide/it821x.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004           Red Hat <alan@redhat.com>
+ * Copyright (C) 2004           Red Hat
 * Copyright (C) 2007           Bartlomiej Zolnierkiewicz
 *
 *  May be copied or modified under the terms of the GNU General Public License
diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
index 9a68433cf46d..bf2be6431b20 100644
--- a/drivers/ide/jmicron.c
+++ b/drivers/ide/jmicron.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2006           Red Hat <alan@redhat.com>
+ * Copyright (C) 2006           Red Hat
 *
 *  May be copied or modified under the terms of the GNU General Public License
 */
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
index d63f9fdca76b..61d2d920a5cd 100644
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -1,7 +1,7 @@
 /*
 *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer
 *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
- *  Copyright (C) 2003 Red Hat Inc <alan@redhat.com>
+ *  Copyright (C) 2003 Red Hat
 *  Copyright (C) 2006-2007 MontaVista Software, Inc. <source@mvista.com>
 *
 *  May be copied or modified under the terms of the GNU General Public License
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index f26aa5d54efb..0f48f9dacfa5 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -5,7 +5,7 @@
 *
 * This code is based on drivers/ide/pci/siimage.c:
 * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
- * Copyright (C) 2003           Red Hat <alan@redhat.com>
+ * Copyright (C) 2003           Red Hat
 *
 * 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/ide/siimage.c b/drivers/ide/siimage.c
index c3107df7773d..7d622d20bc4c 100644
--- a/drivers/ide/siimage.c
+++ b/drivers/ide/siimage.c
@@ -1,6 +1,6 @@
 /*
 * Copyright (C) 2001-2002      Andre Hedrick <andre@linux-ide.org>
- * Copyright (C) 2003           Red Hat <alan@redhat.com>
+ * Copyright (C) 2003           Red Hat
 * Copyright (C) 2007-2008      MontaVista Software, Inc.
 * Copyright (C) 2007-2008      Bartlomiej Zolnierkiewicz
 *
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index fa660f931a11..9120063e8f87 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -26,12 +26,13 @@ static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
        unsigned int sp = (cr >> 4) & 3;
        unsigned int clock = gbus_clock / (4 - sp);
        unsigned int cycle = 1000000000 / clock;
-        unsigned int wt, shwt;
+        unsigned int shwt;
+        int wt;
        /* Minimum DIOx- active time */
        wt = DIV_ROUND_UP(t->act8b, cycle) - 2;
        /* IORDY setup time: 35ns */
-        wt = max(wt, DIV_ROUND_UP(35, cycle));
+        wt = max_t(int, wt, DIV_ROUND_UP(35, cycle));
        /* actual wait-cycle is max(wt & ~1, 1) */
        if (wt > 2 && (wt & 1))
                wt++;
@@ -39,10 +40,17 @@ static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
        /* Address-valid to DIOR/DIOW setup */
        shwt = DIV_ROUND_UP(t->setup, cycle);
+        /* -DIOx recovery time (SHWT * 4) and cycle time requirement */
+        while ((shwt * 4 + wt + (wt ? 2 : 3)) * cycle < t->cycle)
+                shwt++;
+        if (shwt > 7) {
+                pr_warning("tx4938ide: SHWT violation (%d)\n", shwt);
+                shwt = 7;
+        }
        pr_debug("tx4938ide: ebus %d, bus cycle %dns, WT %d, SHWT %d\n",
                 ebus_ch, cycle, wt, shwt);
-        __raw_writeq((cr & ~(0x3f007ull)) | (wt << 12) | shwt,
+        __raw_writeq((cr & ~0x3f007ull) | (wt << 12) | shwt,
                     &tx4938_ebuscptr->cr[ebus_ch]);
 }
@@ -228,7 +236,7 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
        struct resource *res;
        struct tx4938ide_platform_info *pdata = pdev->dev.platform_data;
        int irq, ret, i;
-        unsigned long mapbase;
+        unsigned long mapbase, mapctl;
        struct ide_port_info d = tx4938ide_port_info;
        irq = platform_get_irq(pdev, 0);
@@ -242,38 +250,43 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
                                     res->end - res->start + 1, "tx4938ide"))
                return -EBUSY;
        mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start,
-                                              res->end - res->start + 1);
+                                              8 << pdata->ioport_shift);
-        if (!mapbase)
+        mapctl = (unsigned long)devm_ioremap(&pdev->dev,
+                                             res->start + 0x10000 +
+                                             (6 << pdata->ioport_shift),
+                                             1 << pdata->ioport_shift);
+        if (!mapbase || !mapctl)
                return -EBUSY;
        memset(&hw, 0, sizeof(hw));
        if (pdata->ioport_shift) {
                unsigned long port = mapbase;
+                unsigned long ctl = mapctl;
                hw.io_ports_array[0] = port;
 #ifdef __BIG_ENDIAN
                port++;
+                ctl++;
 #endif
                for (i = 1; i <= 7; i++)
                        hw.io_ports_array[i] =
                                port + (i << pdata->ioport_shift);
-                hw.io_ports.ctl_addr =
+                hw.io_ports.ctl_addr = ctl;
-                        port + 0x10000 + (6 << pdata->ioport_shift);
        } else
-                ide_std_init_ports(&hw, mapbase, mapbase + 0x10006);
+                ide_std_init_ports(&hw, mapbase, mapctl);
        hw.irq = irq;
        hw.dev = &pdev->dev;
-        pr_info("TX4938 IDE interface (base %#lx, irq %d)\n", mapbase, hw.irq);
+        pr_info("TX4938 IDE interface (base %#lx, ctl %#lx, irq %d)\n",
+                mapbase, mapctl, hw.irq);
        if (pdata->gbus_clock)
                tx4938ide_tune_ebusc(pdata->ebus_ch, pdata->gbus_clock, 0);
        else
                d.port_ops = NULL;
        ret = ide_host_add(&d, hws, &host);
-        if (ret)
+        if (!ret)
-                return ret;
+                platform_set_drvdata(pdev, host);
-        platform_set_drvdata(pdev, host);
+        return ret;
-        return 0;
 }
 static int __exit tx4938ide_remove(struct platform_device *pdev)
diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
index 2f83543a9dfc..965cfdb84ebc 100644
--- a/drivers/ieee1394/dv1394.c
+++ b/drivers/ieee1394/dv1394.c
@@ -1828,9 +1828,6 @@ static int dv1394_release(struct inode *inode, struct file *file)
        /* OK to free the DMA buffer, no more mappings can exist */
        do_dv1394_shutdown(video, 1);
-        /* clean up async I/O users */
-        dv1394_fasync(-1, file, 0);
        /* give someone else a turn */
        clear_bit(0, &video->open);
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index d85af1b67027..eb36a81dd09b 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -358,8 +358,6 @@ static int ib_uverbs_event_close(struct inode *inode, struct file *filp)
        }
        spin_unlock_irq(&file->lock);
-        ib_uverbs_event_fasync(-1, filp, 0);
        if (file->is_async) {
                ib_unregister_event_handler(&file->uverbs_file->event_handler);
                kref_put(&file->uverbs_file->ref, ib_uverbs_release_file);
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 3524bef62be6..1070db330d35 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -235,7 +235,6 @@ static int evdev_release(struct inode *inode, struct file *file)
                evdev_ungrab(evdev, client);
        mutex_unlock(&evdev->mutex);
-        evdev_fasync(-1, file, 0);
        evdev_detach_client(evdev, client);
        kfree(client);
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 65d7077a75a1..a85b1485e774 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -244,7 +244,6 @@ static int joydev_release(struct inode *inode, struct file *file)
        struct joydev_client *client = file->private_data;
        struct joydev *joydev = client->joydev;
-        joydev_fasync(-1, file, 0);
        joydev_detach_client(joydev, client);
        kfree(client);
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index 82ec6b1b6467..216a559f55ea 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -71,7 +71,6 @@ static int hp_sdc_rtc_ioctl(struct inode *inode, struct file *file,
 static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait);
 static int hp_sdc_rtc_open(struct inode *inode, struct file *file);
-static int hp_sdc_rtc_release(struct inode *inode, struct file *file);
 static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on);
 static int hp_sdc_rtc_read_proc(char *page, char **start, off_t off,
@@ -414,17 +413,6 @@ static int hp_sdc_rtc_open(struct inode *inode, struct file *file)
        return 0;
 }
-static int hp_sdc_rtc_release(struct inode *inode, struct file *file)
-{
-        /* Turn off interrupts? */
-        if (file->f_flags & FASYNC) {
-                hp_sdc_rtc_fasync (-1, file, 0);
-        }
-        return 0;
-}
 static int hp_sdc_rtc_fasync (int fd, struct file *filp, int on)
 {
        return fasync_helper (fd, filp, on, &hp_sdc_rtc_async_queue);
@@ -680,7 +668,6 @@ static const struct file_operations hp_sdc_rtc_fops = {
        .poll =         hp_sdc_rtc_poll,
        .ioctl =        hp_sdc_rtc_ioctl,
        .open =         hp_sdc_rtc_open,
-        .release =      hp_sdc_rtc_release,
        .fasync =       hp_sdc_rtc_fasync,
 };
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 8137e50ded87..d8c056fe7e98 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -519,7 +519,6 @@ static int mousedev_release(struct inode *inode, struct file *file)
        struct mousedev_client *client = file->private_data;
        struct mousedev *mousedev = client->mousedev;
-        mousedev_fasync(-1, file, 0);
        mousedev_detach_client(mousedev, client);
        kfree(client);
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index 470770c09260..06bbd0e74c6f 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -135,7 +135,6 @@ static int serio_raw_release(struct inode *inode, struct file *file)
        mutex_lock(&serio_raw_mutex);
-        serio_raw_fasync(-1, file, 0);
        serio_raw_cleanup(serio_raw);
        mutex_unlock(&serio_raw_mutex);
diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c
index 2768c69257f6..1f3cc512eff8 100644
--- a/drivers/leds/leds-da903x.c
+++ b/drivers/leds/leds-da903x.c
@@ -58,7 +58,7 @@ static void da903x_led_work(struct work_struct *work)
                offset = DA9030_LED_OFFSET(led->id);
                val = led->flags & ~0x87;
                val |= (led->new_brightness) ? 0x80 : 0; /* EN bit */
-                val |= (led->new_brightness >> 5) & 0x7; /* PWM<2:0> */
+                val |= (0x7 - (led->new_brightness >> 5)) & 0x7; /* PWM<2:0> */
                da903x_write(led->master, DA9030_LED1_CONTROL + offset, val);
                break;
        case DA9030_ID_VIBRA:
diff --git a/drivers/leds/leds-hp-disk.c b/drivers/leds/leds-hp-disk.c
index 74645ab15660..44fa757d8254 100644
--- a/drivers/leds/leds-hp-disk.c
+++ b/drivers/leds/leds-hp-disk.c
@@ -27,7 +27,6 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/kthread.h>
-#include <linux/version.h>
 #include <linux/leds.h>
 #include <acpi/acpi_drivers.h>
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 92dcc06832a4..9d7b53ed75b2 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -656,9 +656,10 @@ static void do_failures(struct mirror_set *ms, struct bio_list *failures)
                return;
        if (!ms->log_failure) {
-                while ((bio = bio_list_pop(failures)))
+                while ((bio = bio_list_pop(failures))) {
                        ms->in_sync = 0;
                        dm_rh_mark_nosync(ms->rh, bio, bio->bi_size, 0);
+                }
                return;
        }
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index b2d9d1ac28ad..6c96db26b87c 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -229,19 +229,21 @@ static void __insert_origin(struct origin *o)
 */
 static int register_snapshot(struct dm_snapshot *snap)
 {
-        struct origin *o;
+        struct origin *o, *new_o;
        struct block_device *bdev = snap->origin->bdev;
+        new_o = kmalloc(sizeof(*new_o), GFP_KERNEL);
+        if (!new_o)
+                return -ENOMEM;
        down_write(&_origins_lock);
        o = __lookup_origin(bdev);
-        if (!o) {
+        if (o)
+                kfree(new_o);
+        else {
                /* New origin */
-                o = kmalloc(sizeof(*o), GFP_KERNEL);
+                o = new_o;
-                if (!o) {
-                        up_write(&_origins_lock);
-                        return -ENOMEM;
-                }
                /* Initialise the struct */
                INIT_LIST_HEAD(&o->snapshots);
@@ -368,6 +370,7 @@ static struct dm_snap_pending_exception *alloc_pending_exception(struct dm_snaps
        struct dm_snap_pending_exception *pe = mempool_alloc(s->pending_pool,
                                                             GFP_NOIO);
+        atomic_inc(&s->pending_exceptions_count);
        pe->snap = s;
        return pe;
@@ -375,7 +378,11 @@ static struct dm_snap_pending_exception *alloc_pending_exception(struct dm_snaps
 static void free_pending_exception(struct dm_snap_pending_exception *pe)
 {
-        mempool_free(pe, pe->snap->pending_pool);
+        struct dm_snapshot *s = pe->snap;
+        mempool_free(pe, s->pending_pool);
+        smp_mb__before_atomic_dec();
+        atomic_dec(&s->pending_exceptions_count);
 }
 static void insert_completed_exception(struct dm_snapshot *s,
@@ -600,6 +607,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
        s->valid = 1;
        s->active = 0;
+        atomic_set(&s->pending_exceptions_count, 0);
        init_rwsem(&s->lock);
        spin_lock_init(&s->pe_lock);
        s->ti = ti;
@@ -726,6 +734,14 @@ static void snapshot_dtr(struct dm_target *ti)
        /* After this returns there can be no new kcopyd jobs. */
        unregister_snapshot(s);
+        while (atomic_read(&s->pending_exceptions_count))
+                yield();
+        /*
+         * Ensure instructions in mempool_destroy aren't reordered
+         * before atomic_read.
+         */
+        smp_mb();
 #ifdef CONFIG_DM_DEBUG
        for (i = 0; i < DM_TRACKED_CHUNK_HASH_SIZE; i++)
                BUG_ON(!hlist_empty(&s->tracked_chunk_hash[i]));
diff --git a/drivers/md/dm-snap.h b/drivers/md/dm-snap.h
index f07315fe2362..99c0106ede2d 100644
--- a/drivers/md/dm-snap.h
+++ b/drivers/md/dm-snap.h
@@ -160,6 +160,8 @@ struct dm_snapshot {
        mempool_t *pending_pool;
+        atomic_t pending_exceptions_count;
        struct exception_table pending;
        struct exception_table complete;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index b4162f6f1b79..9abf6ed16535 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -3884,6 +3884,7 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
        if (mode == 0) {
                mdk_rdev_t *rdev;
                struct list_head *tmp;
+                struct block_device *bdev;
                printk(KERN_INFO "md: %s stopped.\n", mdname(mddev));
@@ -3940,6 +3941,12 @@ static int do_md_stop(mddev_t * mddev, int mode, int is_open)
                mddev->degraded = 0;
                mddev->barriers_work = 0;
                mddev->safemode = 0;
+                bdev = bdget_disk(mddev->gendisk, 0);
+                if (bdev) {
+                        blkdev_ioctl(bdev, 0, BLKRRPART, 0);
+                        bdput(bdev);
+                }
+                kobject_uevent(&disk_to_dev(mddev->gendisk)->kobj, KOBJ_CHANGE);
        } else if (mddev->pers)
                printk(KERN_INFO "md: %s switched to read-only mode.\n",
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index f5233f3d9eff..b89f476cd0a9 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -559,12 +559,6 @@ mptctl_fasync(int fd, struct file *filep, int mode)
        return ret;
 }
-static int
-mptctl_release(struct inode *inode, struct file *filep)
-{
-        return fasync_helper(-1, filep, 0, &async_queue);
-}
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
 *  MPT ioctl handler
@@ -2706,7 +2700,6 @@ mptctl_hp_targetinfo(unsigned long arg)
 static const struct file_operations mptctl_fops = {
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
-        .release =      mptctl_release,
        .fasync =       mptctl_fasync,
        .unlocked_ioctl = mptctl_ioctl,
 #ifdef CONFIG_COMPAT
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 11a617ab4243..84bdc2ee69e6 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -567,8 +567,8 @@ static void i2o_block_biosparam(unsigned long capacity, unsigned short *cyls,
 /**
 *      i2o_block_open - Open the block device
- *      @inode: inode for block device being opened
+ *      @bdev: block device being opened
- *      @file: file to open
+ *      @mode: file open mode
 *
 *      Power up the device, mount and lock the media. This function is called,
 *      if the block device is opened for access.
@@ -596,8 +596,8 @@ static int i2o_block_open(struct block_device *bdev, fmode_t mode)
 /**
 *      i2o_block_release - Release the I2O block device
- *      @inode: inode for block device being released
+ *      @disk: gendisk device being released
- *      @file: file to close
+ *      @mode: file open mode
 *
 *      Unlock and unmount the media, and power down the device. Gets called if
 *      the block device is closed.
@@ -643,8 +643,8 @@ static int i2o_block_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 /**
 *      i2o_block_ioctl - Issue device specific ioctl calls.
- *      @inode: inode for block device ioctl
+ *      @bdev: block device being opened
- *      @file: file for ioctl
+ *      @mode: file open mode
 *      @cmd: ioctl command
 *      @arg: arg
 *
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index a3fabdbe6ca6..f3384c32b9a1 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -1097,28 +1097,17 @@ static int cfg_fasync(int fd, struct file *fp, int on)
 static int cfg_release(struct inode *inode, struct file *file)
 {
        ulong id = (ulong) file->private_data;
-        struct i2o_cfg_info *p1, *p2;
+        struct i2o_cfg_info *p, **q;
        unsigned long flags;
        lock_kernel();
-        p1 = p2 = NULL;
        spin_lock_irqsave(&i2o_config_lock, flags);
-        for (p1 = open_files; p1;) {
+        for (q = &open_files; (p = *q) != NULL; q = &p->next) {
-                if (p1->q_id == id) {
+                if (p->q_id == id) {
+                        *q = p->next;
-                        if (p1->fasync)
+                        kfree(p);
-                                cfg_fasync(-1, file, 0);
-                        if (p2)
-                                p2->next = p1->next;
-                        else
-                                open_files = p1->next;
-                        kfree(p1);
                        break;
                }
-                p2 = p1;
-                p1 = p1->next;
        }
        spin_unlock_irqrestore(&i2o_config_lock, flags);
        unlock_kernel();
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index b550267c8d5e..257277394f8c 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -81,7 +81,7 @@ config MFD_TMIO
 config MFD_T7L66XB
        bool "Support Toshiba T7L66XB"
-        depends on ARM
+        depends on ARM && HAVE_CLK
        select MFD_CORE
        select MFD_TMIO
        help
@@ -89,7 +89,7 @@ config MFD_T7L66XB
 config MFD_TC6387XB
        bool "Support Toshiba TC6387XB"
-        depends on ARM
+        depends on ARM && HAVE_CLK
        select MFD_CORE
        select MFD_TMIO
        help
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
index 08e26beefe64..ce39fa54949b 100644
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ b/drivers/misc/hdpuftrs/hdpu_nexus.c
@@ -113,7 +113,6 @@ static int hdpu_nexus_probe(struct platform_device *pdev)
        if (!hdpu_chassis_id)
                printk(KERN_WARNING "sky_nexus: "
                       "Unable to create proc dir entry: sky_chassis_id\n");
-        }
        return 0;
 }
diff --git a/drivers/misc/panasonic-laptop.c b/drivers/misc/panasonic-laptop.c
index a2cb598d8ab5..4a1bc64485d5 100644
--- a/drivers/misc/panasonic-laptop.c
+++ b/drivers/misc/panasonic-laptop.c
@@ -116,7 +116,6 @@
 *
 */
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/misc/sgi-xp/Makefile b/drivers/misc/sgi-xp/Makefile
index 35ce28578075..4fc40d8e1bcc 100644
--- a/drivers/misc/sgi-xp/Makefile
+++ b/drivers/misc/sgi-xp/Makefile
@@ -5,14 +5,14 @@
 obj-$(CONFIG_SGI_XP)            += xp.o
 xp-y                            := xp_main.o
 xp-$(CONFIG_IA64_SGI_SN2)       += xp_sn2.o xp_nofault.o
-xp-$(CONFIG_IA64_GENERIC)       += xp_sn2.o xp_nofault.o xp_uv.o
+xp-$(CONFIG_IA64_GENERIC)       += xp_sn2.o xp_nofault.o
 xp-$(CONFIG_IA64_SGI_UV)        += xp_uv.o
 xp-$(CONFIG_X86_64)             += xp_uv.o
 obj-$(CONFIG_SGI_XP)            += xpc.o
 xpc-y                           := xpc_main.o xpc_channel.o xpc_partition.o
 xpc-$(CONFIG_IA64_SGI_SN2)      += xpc_sn2.o
-xpc-$(CONFIG_IA64_GENERIC)      += xpc_sn2.o xpc_uv.o
+xpc-$(CONFIG_IA64_GENERIC)      += xpc_sn2.o
 xpc-$(CONFIG_IA64_SGI_UV)       += xpc_uv.o
 xpc-$(CONFIG_X86_64)            += xpc_uv.o
diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
index 859a5281c61b..ed1722e50049 100644
--- a/drivers/misc/sgi-xp/xp.h
+++ b/drivers/misc/sgi-xp/xp.h
@@ -19,7 +19,11 @@
 #include <asm/system.h>
 #include <asm/sn/arch.h>        /* defines is_shub1() and is_shub2() */
 #define is_shub()       ia64_platform_is("sn2")
+#ifdef CONFIG_IA64_SGI_UV
 #define is_uv()         ia64_platform_is("uv")
+#else
+#define is_uv()         0
+#endif
 #endif
 #ifdef CONFIG_X86_64
 #include <asm/genapic.h>
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index 46325fc84811..e8d5cfbd32c2 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -1104,7 +1104,7 @@ xpc_do_exit(enum xp_retval reason)
        if (is_shub())
                xpc_exit_sn2();
-        else
+        else if (is_uv())
                xpc_exit_uv();
 }
@@ -1363,7 +1363,7 @@ out_2:
 out_1:
        if (is_shub())
                xpc_exit_sn2();
-        else
+        else if (is_uv())
                xpc_exit_uv();
        return ret;
 }
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 5a97d3a9d745..06f07e19dc70 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -1920,7 +1920,6 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
 static int sonypi_misc_release(struct inode *inode, struct file *file)
 {
-        sonypi_misc_fasync(-1, file, 0);
        atomic_dec(&sonypi_compat.open_count);
        return 0;
 }
@@ -2315,8 +2314,10 @@ end:
 */
 static int sony_pic_disable(struct acpi_device *device)
 {
-        if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
+        acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
-                        "_DIS", NULL, NULL)))
+                                               NULL);
+        if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
                return -ENXIO;
        dprintk("Device disabled\n");
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 696cf3647ceb..2fadf323c696 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -391,6 +391,7 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
 static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 {
        struct mmci_host *host = mmc_priv(mmc);
+        unsigned long flags;
        WARN_ON(host->mrq != NULL);
@@ -402,7 +403,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
                return;
        }
-        spin_lock_irq(&host->lock);
+        spin_lock_irqsave(&host->lock, flags);
        host->mrq = mrq;
@@ -411,7 +412,7 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
        mmci_start_command(host, mrq->cmd, 0);
-        spin_unlock_irq(&host->lock);
+        spin_unlock_irqrestore(&host->lock, flags);
 }
 static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 3a7bc524af33..c7a4f3bcc2bc 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -94,7 +94,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
-static char version[] __initdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
+static char version[] __devinitdata = DRV_NAME ".c:" DRV_VERSION " " DRV_RELDATE " becker@scyld.com\n";
 #ifdef EL3_DEBUG
 static int el3_debug = EL3_DEBUG;
@@ -186,7 +186,7 @@ static int max_interrupt_work = 10;
 static int nopnp;
 #endif
-static int __init el3_common_init(struct net_device *dev);
+static int __devinit el3_common_init(struct net_device *dev);
 static void el3_common_remove(struct net_device *dev);
 static ushort id_read_eeprom(int index);
 static ushort read_eeprom(int ioaddr, int index);
@@ -537,7 +537,7 @@ static struct mca_driver el3_mca_driver = {
 static int mca_registered;
 #endif /* CONFIG_MCA */
-static int __init el3_common_init(struct net_device *dev)
+static int __devinit el3_common_init(struct net_device *dev)
 {
        struct el3_private *lp = netdev_priv(dev);
        int err;
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index c54967f7942a..07a6697e3635 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -644,10 +644,6 @@ This function frees the  transmiter and receiver descriptor rings.
 */
 static void amd8111e_free_ring(struct amd8111e_priv* lp)
 {
-        /* Free transmit and receive skbs */
-        amd8111e_free_skbs(lp->amd8111e_net_dev);
        /* Free transmit and receive descriptor rings */
        if(lp->rx_ring){
                pci_free_consistent(lp->pci_dev,
@@ -833,12 +829,14 @@ static int amd8111e_rx_poll(struct napi_struct *napi, int budget)
        } while(intr0 & RINT0);
-        /* Receive descriptor is empty now */
+        if (rx_pkt_limit > 0) {
-        spin_lock_irqsave(&lp->lock, flags);
+                /* Receive descriptor is empty now */
-        __netif_rx_complete(dev, napi);
+                spin_lock_irqsave(&lp->lock, flags);
-        writel(VAL0|RINTEN0, mmio + INTEN0);
+                __netif_rx_complete(dev, napi);
-        writel(VAL2 | RDMD0, mmio + CMD0);
+                writel(VAL0|RINTEN0, mmio + INTEN0);
-        spin_unlock_irqrestore(&lp->lock, flags);
+                writel(VAL2 | RDMD0, mmio + CMD0);
+                spin_unlock_irqrestore(&lp->lock, flags);
+        }
 rx_not_empty:
        return num_rx_pkt;
@@ -1231,7 +1229,9 @@ static int amd8111e_close(struct net_device * dev)
        amd8111e_disable_interrupt(lp);
        amd8111e_stop_chip(lp);
-        amd8111e_free_ring(lp);
+        /* Free transmit and receive skbs */
+        amd8111e_free_skbs(lp->amd8111e_net_dev);
        netif_carrier_off(lp->amd8111e_net_dev);
@@ -1241,6 +1241,7 @@ static int amd8111e_close(struct net_device * dev)
        spin_unlock_irq(&lp->lock);
        free_irq(dev->irq, dev);
+        amd8111e_free_ring(lp);
        /* Update the statistics before closing */
        amd8111e_get_stats(dev);
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 0fa53464efb2..6f431a887e7e 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -1080,7 +1080,8 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
                init_timer(&lp->check_timer);
                lp->check_timer.data = (unsigned long)dev;
                lp->check_timer.function = at91ether_check_link;
-        }
+        } else if (lp->board_data.phy_irq_pin >= 32)
+                gpio_request(lp->board_data.phy_irq_pin, "ethernet_phy");
        /* Display ethernet banner */
        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n",
@@ -1167,6 +1168,9 @@ static int __devexit at91ether_remove(struct platform_device *pdev)
        struct net_device *dev = platform_get_drvdata(pdev);
        struct at91_private *lp = netdev_priv(dev);
+        if (lp->board_data.phy_irq_pin >= 32)
+                gpio_free(lp->board_data.phy_irq_pin);
        unregister_netdev(dev);
        free_irq(dev->irq, dev);
        dma_free_coherent(NULL, sizeof(struct recv_desc_bufs), lp->dlist, (dma_addr_t)lp->dlist_phys);
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
index 3cf59a7f5a1c..246d92b42636 100644
--- a/drivers/net/atlx/atl1.c
+++ b/drivers/net/atlx/atl1.c
@@ -2310,7 +2310,8 @@ static void atl1_tx_queue(struct atl1_adapter *adapter, u16 count,
                if (tpd != ptpd)
                        memcpy(tpd, ptpd, sizeof(struct tx_packet_desc));
                tpd->buffer_addr = cpu_to_le64(buffer_info->dma);
-                tpd->word2 = (cpu_to_le16(buffer_info->length) &
+                tpd->word2 &= ~(TPD_BUFLEN_MASK << TPD_BUFLEN_SHIFT);
+                tpd->word2 |= (cpu_to_le16(buffer_info->length) &
                        TPD_BUFLEN_MASK) << TPD_BUFLEN_SHIFT;
                /*
@@ -2409,8 +2410,8 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
                vlan_tag = (vlan_tag << 4) | (vlan_tag >> 13) |
                        ((vlan_tag >> 9) & 0x8);
                ptpd->word3 |= 1 << TPD_INS_VL_TAG_SHIFT;
-                ptpd->word3 |= (vlan_tag & TPD_VL_TAGGED_MASK) <<
+                ptpd->word2 |= (vlan_tag & TPD_VLANTAG_MASK) <<
-                        TPD_VL_TAGGED_SHIFT;
+                        TPD_VLANTAG_SHIFT;
        }
        tso = atl1_tso(adapter, skb, ptpd);
diff --git a/drivers/net/atlx/atl1.h b/drivers/net/atlx/atl1.h
index a5015b14a429..ffa73fc8d95e 100644
--- a/drivers/net/atlx/atl1.h
+++ b/drivers/net/atlx/atl1.h
@@ -504,7 +504,7 @@ struct rx_free_desc {
 #define TPD_PKTNT_MASK          0x0001
 #define TPD_PKTINT_SHIFT        15
 #define TPD_VLANTAG_MASK        0xFFFF
-#define TPD_VLAN_SHIFT          16
+#define TPD_VLANTAG_SHIFT       16
 /* tpd word 3 bits 0:13 */
 #define TPD_EOP_MASK            0x0001
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index ade5f3f6693b..87437c788476 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -169,11 +169,14 @@ static void tlb_clear_slave(struct bonding *bond, struct slave *slave, int save_
        /* clear slave from tx_hashtbl */
        tx_hash_table = BOND_ALB_INFO(bond).tx_hashtbl;
-        index = SLAVE_TLB_INFO(slave).head;
+        /* skip this if we've already freed the tx hash table */
-        while (index != TLB_NULL_INDEX) {
+        if (tx_hash_table) {
-                u32 next_index = tx_hash_table[index].next;
+                index = SLAVE_TLB_INFO(slave).head;
-                tlb_init_table_entry(&tx_hash_table[index], save_load);
+                while (index != TLB_NULL_INDEX) {
-                index = next_index;
+                        u32 next_index = tx_hash_table[index].next;
+                        tlb_init_table_entry(&tx_hash_table[index], save_load);
+                        index = next_index;
+                }
        }
        tlb_init_slave(slave);
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 832739f38db4..a3efba59eee9 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1979,6 +1979,20 @@ void bond_destroy(struct bonding *bond)
        unregister_netdevice(bond->dev);
 }
+static void bond_destructor(struct net_device *bond_dev)
+{
+        struct bonding *bond = bond_dev->priv;
+        if (bond->wq)
+                destroy_workqueue(bond->wq);
+        netif_addr_lock_bh(bond_dev);
+        bond_mc_list_destroy(bond);
+        netif_addr_unlock_bh(bond_dev);
+        free_netdev(bond_dev);
+}
 /*
 * First release a slave and than destroy the bond if no more slaves iare left.
 * Must be under rtnl_lock when this function is called.
@@ -2376,6 +2390,9 @@ static void bond_miimon_commit(struct bonding *bond)
                        continue;
                case BOND_LINK_DOWN:
+                        if (slave->link_failure_count < UINT_MAX)
+                                slave->link_failure_count++;
                        slave->link = BOND_LINK_DOWN;
                        if (bond->params.mode == BOND_MODE_ACTIVEBACKUP ||
@@ -4550,7 +4567,7 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
        bond_set_mode_ops(bond, bond->params.mode);
-        bond_dev->destructor = free_netdev;
+        bond_dev->destructor = bond_destructor;
        /* Initialize the device options */
        bond_dev->tx_queue_len = 0;
@@ -4589,20 +4606,6 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
        return 0;
 }
-/* De-initialize device specific data.
- * Caller must hold rtnl_lock.
- */
-static void bond_deinit(struct net_device *bond_dev)
-{
-        struct bonding *bond = bond_dev->priv;
-        list_del(&bond->bond_list);
-#ifdef CONFIG_PROC_FS
-        bond_remove_proc_entry(bond);
-#endif
-}
 static void bond_work_cancel_all(struct bonding *bond)
 {
        write_lock_bh(&bond->lock);
@@ -4624,6 +4627,22 @@ static void bond_work_cancel_all(struct bonding *bond)
                cancel_delayed_work(&bond->ad_work);
 }
+/* De-initialize device specific data.
+ * Caller must hold rtnl_lock.
+ */
+static void bond_deinit(struct net_device *bond_dev)
+{
+        struct bonding *bond = bond_dev->priv;
+        list_del(&bond->bond_list);
+        bond_work_cancel_all(bond);
+#ifdef CONFIG_PROC_FS
+        bond_remove_proc_entry(bond);
+#endif
+}
 /* Unregister and free all bond devices.
 * Caller must hold rtnl_lock.
 */
@@ -4635,9 +4654,6 @@ static void bond_free_all(void)
                struct net_device *bond_dev = bond->dev;
                bond_work_cancel_all(bond);
-                netif_addr_lock_bh(bond_dev);
-                bond_mc_list_destroy(bond);
-                netif_addr_unlock_bh(bond_dev);
                /* Release the bonded slaves */
                bond_release_all(bond_dev);
                bond_destroy(bond);
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 65d0a9103297..7e8a63106bdf 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -32,14 +32,14 @@
 #include <linux/skbuff.h>
 #include <linux/ethtool.h>
-#include <asm/arch/svinto.h>/* DMA and register descriptions */
+#include <arch/svinto.h>/* DMA and register descriptions */
 #include <asm/io.h>         /* CRIS_LED_* I/O functions */
 #include <asm/irq.h>
 #include <asm/dma.h>
 #include <asm/system.h>
 #include <asm/ethernet.h>
 #include <asm/cache.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 //#define ETHDEBUG
 #define D(x)
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 82dd1a891ce7..002d918fb4c7 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
 #include <asm/io.h>
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0094"
+#define DRV_VERSION     "EHEA_0095"
 /* eHEA capability flags */
 #define DLPAR_PORT_ADD_REM 1
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c
index 9b61dc9865d1..9d006878f045 100644
--- a/drivers/net/ehea/ehea_qmr.c
+++ b/drivers/net/ehea/ehea_qmr.c
@@ -632,10 +632,13 @@ static void ehea_rebuild_busmap(void)
        }
 }
-static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)
+static int ehea_update_busmap(unsigned long pfn, unsigned long nr_pages, int add)
 {
        unsigned long i, start_section, end_section;
+        if (!nr_pages)
+                return 0;
        if (!ehea_bmap) {
                ehea_bmap = kzalloc(sizeof(struct ehea_bmap), GFP_KERNEL);
                if (!ehea_bmap)
@@ -643,7 +646,7 @@ static int ehea_update_busmap(unsigned long pfn, unsigned long pgnum, int add)
        }
        start_section = (pfn * PAGE_SIZE) / EHEA_SECTSIZE;
-        end_section = start_section + ((pgnum * PAGE_SIZE) / EHEA_SECTSIZE);
+        end_section = start_section + ((nr_pages * PAGE_SIZE) / EHEA_SECTSIZE);
        /* Mark entries as valid or invalid only; address is assigned later */
        for (i = start_section; i < end_section; i++) {
                u64 flag;
@@ -692,10 +695,54 @@ int ehea_rem_sect_bmap(unsigned long pfn, unsigned long nr_pages)
        return ret;
 }
-static int ehea_create_busmap_callback(unsigned long pfn,
+static int ehea_is_hugepage(unsigned long pfn)
-                                       unsigned long nr_pages, void *arg)
+{
+        int page_order;
+        if (pfn & EHEA_HUGEPAGE_PFN_MASK)
+                return 0;
+        page_order = compound_order(pfn_to_page(pfn));
+        if (page_order + PAGE_SHIFT != EHEA_HUGEPAGESHIFT)
+                return 0;
+        return 1;
+}
+static int ehea_create_busmap_callback(unsigned long initial_pfn,
+                                       unsigned long total_nr_pages, void *arg)
 {
-        return ehea_update_busmap(pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
+        int ret;
+        unsigned long pfn, start_pfn, end_pfn, nr_pages;
+        if ((total_nr_pages * PAGE_SIZE) < EHEA_HUGEPAGE_SIZE)
+                return ehea_update_busmap(initial_pfn, total_nr_pages,
+                                          EHEA_BUSMAP_ADD_SECT);
+        /* Given chunk is >= 16GB -> check for hugepages */
+        start_pfn = initial_pfn;
+        end_pfn = initial_pfn + total_nr_pages;
+        pfn = start_pfn;
+        while (pfn < end_pfn) {
+                if (ehea_is_hugepage(pfn)) {
+                        /* Add mem found in front of the hugepage */
+                        nr_pages = pfn - start_pfn;
+                        ret = ehea_update_busmap(start_pfn, nr_pages,
+                                                 EHEA_BUSMAP_ADD_SECT);
+                        if (ret)
+                                return ret;
+                        /* Skip the hugepage */
+                        pfn += (EHEA_HUGEPAGE_SIZE / PAGE_SIZE);
+                        start_pfn = pfn;
+                } else
+                        pfn += (EHEA_SECTSIZE / PAGE_SIZE);
+        }
+        /* Add mem found behind the hugepage(s)  */
+        nr_pages = pfn - start_pfn;
+        return ehea_update_busmap(start_pfn, nr_pages, EHEA_BUSMAP_ADD_SECT);
 }
 int ehea_create_busmap(void)
diff --git a/drivers/net/ehea/ehea_qmr.h b/drivers/net/ehea/ehea_qmr.h
index 1e58dc06b7d2..0817c1e74a19 100644
--- a/drivers/net/ehea/ehea_qmr.h
+++ b/drivers/net/ehea/ehea_qmr.h
@@ -40,6 +40,9 @@
 #define EHEA_PAGESIZE          (1UL << EHEA_PAGESHIFT)
 #define EHEA_SECTSIZE          (1UL << 24)
 #define EHEA_PAGES_PER_SECTION (EHEA_SECTSIZE >> EHEA_PAGESHIFT)
+#define EHEA_HUGEPAGESHIFT     34
+#define EHEA_HUGEPAGE_SIZE     (1UL << EHEA_HUGEPAGESHIFT)
+#define EHEA_HUGEPAGE_PFN_MASK ((EHEA_HUGEPAGE_SIZE - 1) >> PAGE_SHIFT)
 #if ((1UL << SECTION_SIZE_BITS) < EHEA_SECTSIZE)
 #error eHEA module cannot work if kernel sectionsize < ehea sectionsize
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 64b201134fdb..83a5cb6aa23b 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -586,6 +586,18 @@ static void gfar_configure_serdes(struct net_device *dev)
        struct gfar_mii __iomem *regs =
                        (void __iomem *)&priv->regs->gfar_mii_regs;
        int tbipa = gfar_read(&priv->regs->tbipa);
+        struct mii_bus *bus = gfar_get_miibus(priv);
+        if (bus)
+                mutex_lock(&bus->mdio_lock);
+        /* If the link is already up, we must already be ok, and don't need to
+         * configure and reset the TBI<->SerDes link.  Maybe U-Boot configured
+         * everything for us?  Resetting it takes the link down and requires
+         * several seconds for it to come back.
+         */
+        if (gfar_local_mdio_read(regs, tbipa, MII_BMSR) & BMSR_LSTATUS)
+                goto done;
        /* Single clk mode, mii mode off(for serdes communication) */
        gfar_local_mdio_write(regs, tbipa, MII_TBICON, TBICON_CLK_SELECT);
@@ -596,6 +608,10 @@ static void gfar_configure_serdes(struct net_device *dev)
        gfar_local_mdio_write(regs, tbipa, MII_BMCR, BMCR_ANENABLE |
                        BMCR_ANRESTART | BMCR_FULLDPLX | BMCR_SPEED1000);
+        done:
+        if (bus)
+                mutex_unlock(&bus->mdio_lock);
 }
 static void init_registers(struct net_device *dev)
diff --git a/drivers/net/gianfar_mii.c b/drivers/net/gianfar_mii.c
index bf73eea98010..0e2595d24933 100644
--- a/drivers/net/gianfar_mii.c
+++ b/drivers/net/gianfar_mii.c
@@ -269,6 +269,27 @@ static struct device_driver gianfar_mdio_driver = {
        .remove = gfar_mdio_remove,
 };
+static int match_mdio_bus(struct device *dev, void *data)
+{
+        const struct gfar_private *priv = data;
+        const struct platform_device *pdev = to_platform_device(dev);
+        return !strcmp(pdev->name, gianfar_mdio_driver.name) &&
+                pdev->id == priv->einfo->mdio_bus;
+}
+/* Given a gfar_priv structure, find the mii_bus controlled by this device (not
+ * necessarily the same as the bus the gfar's PHY is on), if one exists.
+ * Normally only the first gianfar controls a mii_bus.  */
+struct mii_bus *gfar_get_miibus(const struct gfar_private *priv)
+{
+        /*const*/ struct device *d;
+        d = bus_find_device(gianfar_mdio_driver.bus, NULL, (void *)priv,
+                            match_mdio_bus);
+        return d ? dev_get_drvdata(d) : NULL;
+}
 int __init gfar_mdio_init(void)
 {
        return driver_register(&gianfar_mdio_driver);
diff --git a/drivers/net/gianfar_mii.h b/drivers/net/gianfar_mii.h
index 2af28b16a0e2..02dc970ca1ff 100644
--- a/drivers/net/gianfar_mii.h
+++ b/drivers/net/gianfar_mii.h
@@ -18,6 +18,8 @@
 #ifndef __GIANFAR_MII_H
 #define __GIANFAR_MII_H
+struct gfar_private; /* forward ref */
 #define MIIMIND_BUSY            0x00000001
 #define MIIMIND_NOTVALID        0x00000004
@@ -44,6 +46,7 @@ int gfar_mdio_write(struct mii_bus *bus, int mii_id, int regnum, u16 value);
 int gfar_local_mdio_write(struct gfar_mii __iomem *regs, int mii_id,
                          int regnum, u16 value);
 int gfar_local_mdio_read(struct gfar_mii __iomem *regs, int mii_id, int regnum);
+struct mii_bus *gfar_get_miibus(const struct gfar_private *priv);
 int __init gfar_mdio_init(void);
 void gfar_mdio_exit(void);
 #endif /* GIANFAR_PHY_H */
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 2ee2622258f5..901212aa37cb 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2605,7 +2605,7 @@ static int __devinit emac_init_config(struct emac_instance *dev)
                    of_device_is_compatible(np, "ibm,emac-440gr"))
                        dev->features |= EMAC_FTR_440EP_PHY_CLK_FIX;
                if (of_device_is_compatible(np, "ibm,emac-405ez")) {
-#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CONTROL
+#ifdef CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL
                        dev->features |= EMAC_FTR_NO_FLOW_CONTROL_40x;
 #else
                        printk(KERN_ERR "%s: Flow control not disabled!\n",
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c
index 2482d61662a2..2e67ae015d91 100644
--- a/drivers/net/irda/ks959-sir.c
+++ b/drivers/net/irda/ks959-sir.c
@@ -118,7 +118,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
diff --git a/drivers/net/irda/ksdazzle-sir.c b/drivers/net/irda/ksdazzle-sir.c
index 1e0de93fd618..3843b5faba8b 100644
--- a/drivers/net/irda/ksdazzle-sir.c
+++ b/drivers/net/irda/ksdazzle-sir.c
@@ -82,7 +82,6 @@
 #include <linux/errno.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/kref.h>
 #include <linux/usb.h>
 #include <linux/device.h>
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 3b43bfd85a0f..b1ac63ab8c16 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -76,15 +76,6 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev)
        skb->protocol = eth_type_trans(skb,dev);
-#ifdef LOOPBACK_TSO
-        if (skb_is_gso(skb)) {
-                BUG_ON(skb->protocol != htons(ETH_P_IP));
-                BUG_ON(ip_hdr(skb)->protocol != IPPROTO_TCP);
-                emulate_large_send_offload(skb);
-                return 0;
-        }
-#endif
        dev->last_rx = jiffies;
        /* it's OK to use per_cpu_ptr() because BHs are off */
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c
index 1b0eebf84f76..4b9794e97a79 100644
--- a/drivers/net/mlx4/en_main.c
+++ b/drivers/net/mlx4/en_main.c
@@ -35,7 +35,6 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
-#include <linux/cpumask.h>
 #include <linux/mlx4/driver.h>
 #include <linux/mlx4/device.h>
diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c
index be09fdb79cb8..cee199ceba2f 100644
--- a/drivers/net/mlx4/fw.c
+++ b/drivers/net/mlx4/fw.c
@@ -360,9 +360,9 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap)
 #define QUERY_PORT_ETH_MTU_OFFSET               0x02
 #define QUERY_PORT_WIDTH_OFFSET                 0x06
 #define QUERY_PORT_MAX_GID_PKEY_OFFSET          0x07
-#define QUERY_PORT_MAC_OFFSET                   0x08
 #define QUERY_PORT_MAX_MACVLAN_OFFSET           0x0a
 #define QUERY_PORT_MAX_VL_OFFSET                0x0b
+#define QUERY_PORT_MAC_OFFSET                   0x10
                for (i = 1; i <= dev_cap->num_ports; ++i) {
                        err = mlx4_cmd_box(dev, 0, mailbox->dma, i, 0, MLX4_CMD_QUERY_PORT,
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index b1556b2e404c..a5f428bcc0eb 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -75,7 +75,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.4.3-1.371"
+#define MYRI10GE_VERSION_STR "1.4.3-1.375"
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -1393,6 +1393,7 @@ myri10ge_tx_done(struct myri10ge_slice_state *ss, int mcp_index)
                if (tx->req == tx->done) {
                        tx->queue_active = 0;
                        put_be32(htonl(1), tx->send_stop);
+                        mmiowb();
                }
                __netif_tx_unlock(dev_queue);
        }
@@ -2864,6 +2865,7 @@ again:
        if ((mgp->dev->real_num_tx_queues > 1) && tx->queue_active == 0) {
                tx->queue_active = 1;
                put_be32(htonl(1), tx->send_go);
+                mmiowb();
        }
        tx->pkt_start++;
        if ((avail - count) < MXGEFW_MAX_SEND_DESC) {
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index fc6f4b8c64b3..b646e92134dc 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -399,11 +399,11 @@ static int pppoe_rcv(struct sk_buff *skb,
        if (skb->len < len)
                goto drop;
-        po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
+        if (pskb_trim_rcsum(skb, len))
-        if (!po)
                goto drop;
-        if (pskb_trim_rcsum(skb, len))
+        po = get_item(ph->sid, eth_hdr(skb)->h_source, dev->ifindex);
+        if (!po)
                goto drop;
        return sk_receive_skb(sk_pppox(po), skb, 0);
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index c70870e0fd61..6f9895d4e5bd 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2060,7 +2060,6 @@ static int smc_request_attrib(struct platform_device *pdev,
                              struct net_device *ndev)
 {
        struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib");
-        struct smc_local *lp = netdev_priv(ndev);
        if (!res)
                return 0;
@@ -2075,7 +2074,6 @@ static void smc_release_attrib(struct platform_device *pdev,
                               struct net_device *ndev)
 {
        struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib");
-        struct smc_local *lp = netdev_priv(ndev);
        if (res)
                release_mem_region(res->start, ATTRIB_SIZE);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index 8e46a513a252..c91852f49a48 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -420,9 +420,13 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        /* Allocate Tx/Rx descriptor memory */
        db->desc_pool_ptr = pci_alloc_consistent(pdev, sizeof(struct tx_desc) *
                        DESC_ALL_CNT + 0x20, &db->desc_pool_dma_ptr);
+        if (!db->desc_pool_ptr)
+                goto err_out_res;
        db->buf_pool_ptr = pci_alloc_consistent(pdev, TX_BUF_ALLOC *
                        TX_DESC_CNT + 4, &db->buf_pool_dma_ptr);
+        if (!db->buf_pool_ptr)
+                goto err_out_free_desc;
        db->first_tx_desc = (struct tx_desc *) db->desc_pool_ptr;
        db->first_tx_desc_dma = db->desc_pool_dma_ptr;
@@ -469,7 +473,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        err = register_netdev (dev);
        if (err)
-                goto err_out_res;
+                goto err_out_free_buf;
        printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
               "%s, irq %d.\n",
@@ -483,6 +487,12 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        return 0;
+err_out_free_buf:
+        pci_free_consistent(pdev, TX_BUF_ALLOC * TX_DESC_CNT + 4,
+                            db->buf_pool_ptr, db->buf_pool_dma_ptr);
+err_out_free_desc:
+        pci_free_consistent(pdev, sizeof(struct tx_desc) * DESC_ALL_CNT + 0x20,
+                            db->desc_pool_ptr, db->desc_pool_dma_ptr);
 err_out_res:
        pci_release_regions(pdev);
 err_out_disable:
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 6daea0c91862..33b6d1b122fb 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1070,8 +1070,6 @@ static int tun_chr_close(struct inode *inode, struct file *file)
        DBG(KERN_INFO "%s: tun_chr_close\n", tun->dev->name);
-        tun_chr_fasync(-1, file, 0);
        rtnl_lock();
        /* Detach from net device */
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c
index 78df2be8a728..db3377dae9d5 100644
--- a/drivers/net/usb/dm9601.c
+++ b/drivers/net/usb/dm9601.c
@@ -396,6 +396,20 @@ static void dm9601_set_multicast(struct net_device *net)
        dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
 }
+static int dm9601_set_mac_address(struct net_device *net, void *p)
+{
+        struct sockaddr *addr = p;
+        struct usbnet *dev = netdev_priv(net);
+        if (!is_valid_ether_addr(addr->sa_data))
+                return -EINVAL;
+        memcpy(net->dev_addr, addr->sa_data, net->addr_len);
+        dm_write_async(dev, DM_PHY_ADDR, net->addr_len, net->dev_addr);
+        return 0;
+}
 static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
 {
        int ret;
@@ -406,6 +420,7 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
        dev->net->do_ioctl = dm9601_ioctl;
        dev->net->set_multicast_list = dm9601_set_multicast;
+        dev->net->set_mac_address = dm9601_set_mac_address;
        dev->net->ethtool_ops = &dm9601_ethtool_ops;
        dev->net->hard_header_len += DM_TX_OVERHEAD;
        dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c
index 2dced383bcfb..3590ea5a902d 100644
--- a/drivers/net/via-velocity.c
+++ b/drivers/net/via-velocity.c
@@ -521,7 +521,7 @@ static void __devexit velocity_remove1(struct pci_dev *pdev)
 *      we don't duplicate code for each option.
 */
-static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max, int def, char *name, char *devname)
+static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max, int def, char *name, const char *devname)
 {
        if (val == -1)
                *opt = def;
@@ -550,7 +550,7 @@ static void __devinit velocity_set_int_opt(int *opt, int val, int min, int max,
 *      we don't duplicate code for each option.
 */
-static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 flag, char *name, char *devname)
+static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 flag, char *name, const char *devname)
 {
        (*opt) &= (~flag);
        if (val == -1)
@@ -576,7 +576,7 @@ static void __devinit velocity_set_bool_opt(u32 * opt, int val, int def, u32 fla
 *      for the current device
 */
-static void __devinit velocity_get_options(struct velocity_opt *opts, int index, char *devname)
+static void __devinit velocity_get_options(struct velocity_opt *opts, int index, const char *devname)
 {
        velocity_set_int_opt(&opts->rx_thresh, rx_thresh[index], RX_THRESH_MIN, RX_THRESH_MAX, RX_THRESH_DEF, "rx_thresh", devname);
@@ -863,6 +863,7 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
        static int first = 1;
        struct net_device *dev;
        int i;
+        const char *drv_string;
        const struct velocity_info_tbl *info = &chip_info_table[ent->driver_data];
        struct velocity_info *vptr;
        struct mac_regs __iomem * regs;
@@ -935,7 +936,9 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
                dev->dev_addr[i] = readb(&regs->PAR[i]);
-        velocity_get_options(&vptr->options, velocity_nics, dev->name);
+        drv_string = dev_driver_string(&pdev->dev);
+        velocity_get_options(&vptr->options, velocity_nics, drv_string);
        /*
         *      Mask out the options cannot be set to the chip
diff --git a/drivers/net/wan/syncppp.c b/drivers/net/wan/syncppp.c
index 327d58589e12..6e92f7b44b1a 100644
--- a/drivers/net/wan/syncppp.c
+++ b/drivers/net/wan/syncppp.c
@@ -756,10 +756,11 @@ static void sppp_cisco_input (struct sppp *sp, struct sk_buff *skb)
        case CISCO_ADDR_REQ:
                /* Stolen from net/ipv4/devinet.c -- SIOCGIFADDR ioctl */
                {
-                struct in_device *in_dev;
-                struct in_ifaddr *ifa;
                __be32 addr = 0, mask = htonl(~0U); /* FIXME: is the mask correct? */
 #ifdef CONFIG_INET
+                struct in_device *in_dev;
+                struct in_ifaddr *ifa;
                rcu_read_lock();
                if ((in_dev = __in_dev_get_rcu(dev)) != NULL)
                {
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index ccd9cd35ecbe..5bf7e01ef0e9 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -695,7 +695,6 @@ EXPORT_SYMBOL(z8530_nop);
 *      z8530_interrupt - Handle an interrupt from a Z8530
 *      @irq:   Interrupt number
 *      @dev_id: The Z8530 device that is interrupting.
- *      @regs: unused
 *
 *      A Z85[2]30 device has stuck its hand in the air for attention.
 *      We scan both the channels on the chip for events and then call
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 0f1d6bdd51a2..9e47d727e220 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -661,8 +661,7 @@ ath5k_pci_resume(struct pci_dev *pdev)
 {
        struct ieee80211_hw *hw = pci_get_drvdata(pdev);
        struct ath5k_softc *sc = hw->priv;
-        struct ath5k_hw *ah = sc->ah;
+        int err;
-        int i, err;
        pci_restore_state(pdev);
@@ -688,16 +687,6 @@ ath5k_pci_resume(struct pci_dev *pdev)
                goto err_irq;
        ath5k_led_enable(sc);
-        /*
-         * Reset the key cache since some parts do not
-         * reset the contents on initial power up or resume.
-         *
-         * FIXME: This may need to be revisited when mac80211 becomes
-         *        aware of suspend/resume.
-         */
-        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
-                ath5k_hw_reset_key(ah, i);
        return 0;
 err_irq:
        free_irq(pdev->irq, sc);
@@ -718,7 +707,6 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
        struct ath5k_softc *sc = hw->priv;
        struct ath5k_hw *ah = sc->ah;
        u8 mac[ETH_ALEN];
-        unsigned int i;
        int ret;
        ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "devid 0x%x\n", pdev->device);
@@ -737,13 +725,6 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
                __set_bit(ATH_STAT_MRRETRY, sc->status);
        /*
-         * Reset the key cache since some parts do not
-         * reset the contents on initial power up.
-         */
-        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
-                ath5k_hw_reset_key(ah, i);
-        /*
         * Collect the channel list.  The 802.11 layer
         * is resposible for filtering this list based
         * on settings like the phy mode and regulatory
@@ -2202,7 +2183,8 @@ ath5k_beacon_config(struct ath5k_softc *sc)
 static int
 ath5k_init(struct ath5k_softc *sc, bool is_resume)
 {
-        int ret;
+        struct ath5k_hw *ah = sc->ah;
+        int ret, i;
        mutex_lock(&sc->lock);
@@ -2235,10 +2217,17 @@ ath5k_init(struct ath5k_softc *sc, bool is_resume)
        if (ret)
                goto done;
+        /*
+         * Reset the key cache since some parts do not reset the
+         * contents on initial power up or resume from suspend.
+         */
+        for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)
+                ath5k_hw_reset_key(ah, i);
        __set_bit(ATH_STAT_STARTED, sc->status);
        /* Set ack to be sent at low bit-rates */
-        ath5k_hw_set_ack_bitrate_high(sc->ah, false);
+        ath5k_hw_set_ack_bitrate_high(ah, false);
        mod_timer(&sc->calib_tim, round_jiffies(jiffies +
                        msecs_to_jiffies(ath5k_calinterval * 1000)));
@@ -2953,10 +2942,8 @@ static void ath5k_configure_filter(struct ieee80211_hw *hw,
                sc->opmode != NL80211_IFTYPE_MESH_POINT &&
                test_bit(ATH_STAT_PROMISC, sc->status))
                rfilt |= AR5K_RX_FILTER_PROM;
-        if (sc->opmode == NL80211_IFTYPE_STATION ||
+        if (sc->opmode == NL80211_IFTYPE_ADHOC)
-                sc->opmode == NL80211_IFTYPE_ADHOC) {
                rfilt |= AR5K_RX_FILTER_BEACON;
-        }
        /* Set filters */
        ath5k_hw_set_rx_filter(ah,rfilt);
diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c
index 8f92d670f614..19980cbd5d5f 100644
--- a/drivers/net/wireless/ath5k/debug.c
+++ b/drivers/net/wireless/ath5k/debug.c
@@ -339,7 +339,7 @@ static struct {
        { ATH5K_DEBUG_BEACON,   "beacon",       "beacon handling" },
        { ATH5K_DEBUG_CALIBRATE, "calib",       "periodic calibration" },
        { ATH5K_DEBUG_TXPOWER,  "txpower",      "transmit power setting" },
-        { ATH5K_DEBUG_LED,      "led",          "LED mamagement" },
+        { ATH5K_DEBUG_LED,      "led",          "LED management" },
        { ATH5K_DEBUG_DUMP_RX,  "dumprx",       "print received skb content" },
        { ATH5K_DEBUG_DUMP_TX,  "dumptx",       "print transmit skb content" },
        { ATH5K_DEBUG_DUMPBANDS, "dumpbands",   "dump bands" },
diff --git a/drivers/net/wireless/ath5k/initvals.c b/drivers/net/wireless/ath5k/initvals.c
index ea2e1a20b499..ceaa6c475c06 100644
--- a/drivers/net/wireless/ath5k/initvals.c
+++ b/drivers/net/wireless/ath5k/initvals.c
@@ -806,6 +806,8 @@ static const struct ath5k_ini_mode ar5212_rf5111_ini_mode_end[] = {
                { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
        { AR5K_PHY(642),
                { 0xd03e6788, 0xd03e6788, 0xd03e6788, 0xd03e6788, 0xd03e6788 } },
+        { 0xa228,
+                { 0x000001b5, 0x000001b5, 0x000001b5, 0x000001b5, 0x000001b5 } },
        { 0xa23c,
                { 0x13c889af, 0x13c889af, 0x13c889af, 0x13c889af, 0x13c889af } },
 };
diff --git a/drivers/net/wireless/ath5k/reset.c b/drivers/net/wireless/ath5k/reset.c
index 8f1886834e61..1b6d45b6772d 100644
--- a/drivers/net/wireless/ath5k/reset.c
+++ b/drivers/net/wireless/ath5k/reset.c
@@ -537,9 +537,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                mdelay(1);
                /*
-                 * Write some more initial register settings
+                 * Write some more initial register settings for revised chips
                 */
-                if (ah->ah_version == AR5K_AR5212) {
+                if (ah->ah_version == AR5K_AR5212 &&
+                    ah->ah_phy_revision > 0x41) {
                        ath5k_hw_reg_write(ah, 0x0002a002, 0x982c);
                        if (channel->hw_value == CHANNEL_G)
@@ -558,19 +559,10 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
                        else
                                ath5k_hw_reg_write(ah, 0x00000000, 0x994c);
-                        /* Some bits are disabled here, we know nothing about
+                        /* Got this from legacy-hal */
-                         * register 0xa228 yet, most of the times this ends up
+                        AR5K_REG_DISABLE_BITS(ah, 0xa228, 0x200);
-                         * with a value 0x9b5 -haven't seen any dump with
-                         * a different value- */
+                        AR5K_REG_MASKED_BITS(ah, 0xa228, 0x800, 0xfffe03ff);
-                        /* Got this from decompiling binary HAL */
-                        data = ath5k_hw_reg_read(ah, 0xa228);
-                        data &= 0xfffffdff;
-                        ath5k_hw_reg_write(ah, data, 0xa228);
-                        data = ath5k_hw_reg_read(ah, 0xa228);
-                        data &= 0xfffe03ff;
-                        ath5k_hw_reg_write(ah, data, 0xa228);
-                        data = 0;
                        /* Just write 0x9b5 ? */
                        /* ath5k_hw_reg_write(ah, 0x000009b5, 0xa228); */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 24a1aeb6448f..321dbc8c034a 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2090,7 +2090,6 @@ static void iwl_alive_start(struct iwl_priv *priv)
                iwl4965_error_recovery(priv);
        iwl_power_update_mode(priv, 1);
-        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
        if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
                iwl4965_set_mode(priv, priv->iw_mode);
@@ -2342,6 +2341,7 @@ static void iwl_bg_alive_start(struct work_struct *data)
        mutex_lock(&priv->mutex);
        iwl_alive_start(priv);
        mutex_unlock(&priv->mutex);
+        ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
 }
 static void iwl4965_bg_rf_kill(struct work_struct *work)
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 297696de2da0..8265c7d25edc 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -605,9 +605,9 @@ int lbs_get_tx_power(struct lbs_private *priv, s16 *curlevel, s16 *minlevel,
        if (ret == 0) {
                *curlevel = le16_to_cpu(cmd.curlevel);
                if (minlevel)
-                        *minlevel = le16_to_cpu(cmd.minlevel);
+                        *minlevel = cmd.minlevel;
                if (maxlevel)
-                        *maxlevel = le16_to_cpu(cmd.maxlevel);
+                        *maxlevel = cmd.maxlevel;
        }
        lbs_deb_leave(LBS_DEB_CMD);
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 8f66903641b9..22c4c6110521 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -598,8 +598,8 @@ static int lbs_process_bss(struct bss_descriptor *bss,
                switch (elem->id) {
                case MFIE_TYPE_SSID:
-                        bss->ssid_len = elem->len;
+                        bss->ssid_len = min_t(int, 32, elem->len);
-                        memcpy(bss->ssid, elem->data, elem->len);
+                        memcpy(bss->ssid, elem->data, bss->ssid_len);
                        lbs_deb_scan("got SSID IE: '%s', len %u\n",
                                     escape_essid(bss->ssid, bss->ssid_len),
                                     bss->ssid_len);
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 2d022f83774c..827ca0384a4c 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -319,7 +319,7 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
        void *tmp;
        int err;
        u8 *end = (u8 *)eeprom + len;
-        u16 synth;
+        u16 synth = 0;
        DECLARE_MAC_BUF(mac);
        wrap = (struct eeprom_pda_wrap *) eeprom;
@@ -422,7 +422,8 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                entry = (void *)entry + (entry_len + 1)*2;
        }
-        if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) {
+        if (!synth || !priv->iq_autocal || !priv->output_limit ||
+            !priv->curve_data) {
                printk(KERN_ERR "p54: not all required entries found in eeprom!\n");
                err = -EINVAL;
                goto err;
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 1c2a02a741af..88b3cad8b65e 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -346,68 +346,6 @@ static void p54p_tx(struct ieee80211_hw *dev, struct p54_control_hdr *data,
                printk(KERN_INFO "%s: tx overflow.\n", wiphy_name(dev->wiphy));
 }
-static int p54p_open(struct ieee80211_hw *dev)
-{
-        struct p54p_priv *priv = dev->priv;
-        int err;
-        init_completion(&priv->boot_comp);
-        err = request_irq(priv->pdev->irq, &p54p_interrupt,
-                          IRQF_SHARED, "p54pci", dev);
-        if (err) {
-                printk(KERN_ERR "%s: failed to register IRQ handler\n",
-                       wiphy_name(dev->wiphy));
-                return err;
-        }
-        memset(priv->ring_control, 0, sizeof(*priv->ring_control));
-        err = p54p_upload_firmware(dev);
-        if (err) {
-                free_irq(priv->pdev->irq, dev);
-                return err;
-        }
-        priv->rx_idx_data = priv->tx_idx_data = 0;
-        priv->rx_idx_mgmt = priv->tx_idx_mgmt = 0;
-        p54p_refill_rx_ring(dev, 0, priv->ring_control->rx_data,
-                ARRAY_SIZE(priv->ring_control->rx_data), priv->rx_buf_data);
-        p54p_refill_rx_ring(dev, 2, priv->ring_control->rx_mgmt,
-                ARRAY_SIZE(priv->ring_control->rx_mgmt), priv->rx_buf_mgmt);
-        P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
-        P54P_READ(ring_control_base);
-        wmb();
-        udelay(10);
-        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
-        P54P_READ(int_enable);
-        wmb();
-        udelay(10);
-        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
-        P54P_READ(dev_int);
-        if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
-                printk(KERN_ERR "%s: Cannot boot firmware!\n",
-                       wiphy_name(dev->wiphy));
-                free_irq(priv->pdev->irq, dev);
-                return -ETIMEDOUT;
-        }
-        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
-        P54P_READ(int_enable);
-        wmb();
-        udelay(10);
-        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
-        P54P_READ(dev_int);
-        wmb();
-        udelay(10);
-        return 0;
-}
 static void p54p_stop(struct ieee80211_hw *dev)
 {
        struct p54p_priv *priv = dev->priv;
@@ -474,6 +412,68 @@ static void p54p_stop(struct ieee80211_hw *dev)
        memset(ring_control, 0, sizeof(*ring_control));
 }
+static int p54p_open(struct ieee80211_hw *dev)
+{
+        struct p54p_priv *priv = dev->priv;
+        int err;
+        init_completion(&priv->boot_comp);
+        err = request_irq(priv->pdev->irq, &p54p_interrupt,
+                          IRQF_SHARED, "p54pci", dev);
+        if (err) {
+                printk(KERN_ERR "%s: failed to register IRQ handler\n",
+                       wiphy_name(dev->wiphy));
+                return err;
+        }
+        memset(priv->ring_control, 0, sizeof(*priv->ring_control));
+        err = p54p_upload_firmware(dev);
+        if (err) {
+                free_irq(priv->pdev->irq, dev);
+                return err;
+        }
+        priv->rx_idx_data = priv->tx_idx_data = 0;
+        priv->rx_idx_mgmt = priv->tx_idx_mgmt = 0;
+        p54p_refill_rx_ring(dev, 0, priv->ring_control->rx_data,
+                ARRAY_SIZE(priv->ring_control->rx_data), priv->rx_buf_data);
+        p54p_refill_rx_ring(dev, 2, priv->ring_control->rx_mgmt,
+                ARRAY_SIZE(priv->ring_control->rx_mgmt), priv->rx_buf_mgmt);
+        P54P_WRITE(ring_control_base, cpu_to_le32(priv->ring_control_dma));
+        P54P_READ(ring_control_base);
+        wmb();
+        udelay(10);
+        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_INIT));
+        P54P_READ(int_enable);
+        wmb();
+        udelay(10);
+        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_RESET));
+        P54P_READ(dev_int);
+        if (!wait_for_completion_interruptible_timeout(&priv->boot_comp, HZ)) {
+                printk(KERN_ERR "%s: Cannot boot firmware!\n",
+                       wiphy_name(dev->wiphy));
+                p54p_stop(dev);
+                return -ETIMEDOUT;
+        }
+        P54P_WRITE(int_enable, cpu_to_le32(ISL38XX_INT_IDENT_UPDATE));
+        P54P_READ(int_enable);
+        wmb();
+        udelay(10);
+        P54P_WRITE(dev_int, cpu_to_le32(ISL38XX_DEV_INT_UPDATE));
+        P54P_READ(dev_int);
+        wmb();
+        udelay(10);
+        return 0;
+}
 static int __devinit p54p_probe(struct pci_dev *pdev,
                                const struct pci_device_id *id)
 {
@@ -556,11 +556,13 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
        spin_lock_init(&priv->lock);
        tasklet_init(&priv->rx_tasklet, p54p_rx_tasklet, (unsigned long)dev);
-        p54p_open(dev);
+        err = p54p_open(dev);
+        if (err)
+                goto err_free_common;
        err = p54_read_eeprom(dev);
        p54p_stop(dev);
        if (err)
-                goto err_free_desc;
+                goto err_free_common;
        err = ieee80211_register_hw(dev);
        if (err) {
@@ -573,8 +575,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
 err_free_common:
        p54_free_common(dev);
- err_free_desc:
        pci_free_consistent(pdev, sizeof(*priv->ring_control),
                            priv->ring_control, priv->ring_control_dma);
diff --git a/drivers/net/wireless/rt2x00/Kconfig b/drivers/net/wireless/rt2x00/Kconfig
index f839ce044afd..95511ac22470 100644
--- a/drivers/net/wireless/rt2x00/Kconfig
+++ b/drivers/net/wireless/rt2x00/Kconfig
@@ -1,5 +1,5 @@
 menuconfig RT2X00
-        bool "Ralink driver support"
+        tristate "Ralink driver support"
        depends on MAC80211 && WLAN_80211 && EXPERIMENTAL
        ---help---
          This will enable the experimental support for the Ralink drivers,
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 51e5214071da..224ae6bc67b6 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -105,7 +105,16 @@ EXPORT_SYMBOL(of_release_dev);
 int of_device_register(struct of_device *ofdev)
 {
        BUG_ON(ofdev->node == NULL);
-        return device_register(&ofdev->dev);
+        device_initialize(&ofdev->dev);
+        /* device_add will assume that this device is on the same node as
+         * the parent. If there is no parent defined, set the node
+         * explicitly */
+        if (!ofdev->dev.parent)
+                set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->node));
+        return device_add(&ofdev->dev);
 }
 EXPORT_SYMBOL(of_device_register);
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index b1899e9c1f65..0cd5fbc7f2c2 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -112,7 +112,7 @@ static int parport_probe(struct pcmcia_device *link)
    link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
    link->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
    link->irq.IRQInfo1 = IRQ_LEVEL_ID;
    link->conf.Attributes = CONF_ENABLE_IRQ;
    link->conf.IntType = INT_MEMORY_AND_IO;
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 96cf8ecd04ce..bbf66ea8fd87 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -43,20 +43,6 @@ static void __devinit quirk_mellanox_tavor(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR,quirk_mellanox_tavor);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_MELLANOX,PCI_DEVICE_ID_MELLANOX_TAVOR_BRIDGE,quirk_mellanox_tavor);
-/* Many VIA bridges seem to corrupt data for DAC. Disable it here */
-int forbid_dac __read_mostly;
-EXPORT_SYMBOL(forbid_dac);
-static __devinit void via_no_dac(struct pci_dev *dev)
-{
-        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI && forbid_dac == 0) {
-                dev_info(&dev->dev,
-                        "VIA PCI bridge detected. Disabling DAC.\n");
-                forbid_dac = 1;
-        }
-}
-DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_ANY_ID, via_no_dac);
 /* Deal with broken BIOS'es that neglect to enable passive release,
   which can cause problems in combination with the 82441FX/PPro MTRRs */
 static void quirk_passive_release(struct pci_dev *dev)
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
index f57eeae3830a..222904411a13 100644
--- a/drivers/pcmcia/Kconfig
+++ b/drivers/pcmcia/Kconfig
@@ -188,10 +188,6 @@ config PCMCIA_M8XX
          This driver is also available as a module called m8xx_pcmcia.
-config HD64465_PCMCIA
-        tristate "HD64465 host bridge support"
-        depends on HD64465 && PCMCIA
 config PCMCIA_AU1X00
        tristate "Au1x00 pcmcia support"
        depends on SOC_AU1X00 && PCMCIA
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile
index 23e492bf75cf..238629ad7f7c 100644
--- a/drivers/pcmcia/Makefile
+++ b/drivers/pcmcia/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_I82365)				+= i82365.o
 obj-$(CONFIG_I82092)                            += i82092.o
 obj-$(CONFIG_TCIC)                              += tcic.o
 obj-$(CONFIG_PCMCIA_M8XX)                       += m8xx_pcmcia.o
-obj-$(CONFIG_HD64465_PCMCIA)                    += hd64465_ss.o
 obj-$(CONFIG_PCMCIA_SA1100)                     += sa11xx_core.o sa1100_cs.o
 obj-$(CONFIG_PCMCIA_SA1111)                     += sa11xx_core.o sa1111_cs.o
 obj-$(CONFIG_M32R_PCC)                          += m32r_pcc.o
diff --git a/drivers/pcmcia/hd64465_ss.c b/drivers/pcmcia/hd64465_ss.c
deleted file mode 100644
index 9ef69cdb3183..000000000000
--- a/drivers/pcmcia/hd64465_ss.c
+++ /dev/null
@@ -1,939 +0,0 @@
-/*
- * Device driver for the PCMCIA controller module of the
- * Hitachi HD64465 handheld companion chip.
- *
- * Note that the HD64465 provides a very thin PCMCIA host bridge
- * layer, requiring a lot of the work of supporting cards to be
- * performed by the processor.  For example: mapping of card
- * interrupts to processor IRQs is done by IRQ demuxing software;
- * IO and memory mappings are fixed; setting voltages according
- * to card Voltage Select pins etc is done in software.
- *
- * Note also that this driver uses only the simple, fixed,
- * 16MB, 16-bit wide mappings to PCMCIA spaces defined by the
- * HD64465.  Larger mappings, smaller mappings, or mappings of
- * different width to the same socket, are all possible only by
- * involving the SH7750's MMU, which is considered unnecessary here.
- * The downside is that it may be possible for some drivers to
- * break because they need or expect 8-bit mappings.
- *
- * This driver currently supports only the following configuration:
- * SH7750 CPU, HD64465, TPS2206 voltage control chip.
- *
- * by Greg Banks <gbanks@pocketpenguins.com>
- * (c) 2000 PocketPenguins Inc
- */
-#include <linux/types.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/string.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-#include <asm/errno.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <asm/io.h>
-#include <asm/hd64465/hd64465.h>
-#include <asm/hd64465/io.h>
-#include <pcmcia/cs_types.h>
-#include <pcmcia/cs.h>
-#include <pcmcia/cistpl.h>
-#include <pcmcia/ds.h>
-#include <pcmcia/ss.h>
-#define MODNAME "hd64465_ss"
-/* #define HD64465_DEBUG 1 */
-#if HD64465_DEBUG
-#define DPRINTK(args...)        printk(MODNAME ": " args)
-#else
-#define DPRINTK(args...)
-#endif
-extern int hd64465_io_debug;
-extern void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags);
-extern void p3_iounmap(void *addr);
-/*============================================================*/
-#define HS_IO_MAP_SIZE  (64*1024)
-typedef struct hs_socket_t
-{
-    unsigned int        number;
-    u_int               irq;
-    u_long              mem_base;
-    void                *io_base;
-    u_long              mem_length;
-    u_int               ctrl_base;
-    socket_state_t      state;
-    pccard_io_map       io_maps[MAX_IO_WIN];
-    pccard_mem_map      mem_maps[MAX_WIN];
-    struct pcmcia_socket        socket;
-} hs_socket_t;
-#define HS_MAX_SOCKETS 2
-static hs_socket_t hs_sockets[HS_MAX_SOCKETS];
-#define hs_in(sp, r)        inb((sp)->ctrl_base + (r))
-#define hs_out(sp, v, r)    outb(v, (sp)->ctrl_base + (r))
-/* translate a boolean value to a bit in a register */
-#define bool_to_regbit(sp, r, bi, bo)           \
-    do {                                        \
-        unsigned short v = hs_in(sp, r);        \
-        if (bo)                                 \
-            v |= (bi);                          \
-        else                                    \
-            v &= ~(bi);                         \
-        hs_out(sp, v, r);                       \
-    } while(0)
-    
-/* register offsets from HD64465_REG_PCC[01]ISR */
-#define ISR     0x0
-#define GCR     0x2
-#define CSCR    0x4
-#define CSCIER  0x6
-#define SCR     0x8
-/* Mask and values for CSCIER register */
-#define IER_MASK    0x80
-#define IER_ON      0x3f        /* interrupts on */
-#define IER_OFF     0x00        /* interrupts off */
-/*============================================================*/
-#if HD64465_DEBUG > 10
-static void cis_hex_dump(const unsigned char *x, int len)
-{
-        int i;
-        
-        for (i=0 ; i<len ; i++)
-        {
-            if (!(i & 0xf))
-                printk("\n%08x", (unsigned)(x + i));
-            printk(" %02x", *(volatile unsigned short*)x);
-            x += 2;
-        }
-        printk("\n");
-}
-#endif
-/*============================================================*/
-/*
- * This code helps create the illusion that the IREQ line from
- * the PC card is mapped to one of the CPU's IRQ lines by the
- * host bridge hardware (which is how every host bridge *except*
- * the HD64465 works).  In particular, it supports enabling
- * and disabling the IREQ line by code which knows nothing
- * about the host bridge (e.g. device drivers, IDE code) using
- * the request_irq(), free_irq(), probe_irq_on() and probe_irq_off()
- * functions.  Also, it supports sharing the mapped IRQ with
- * real hardware IRQs from the -IRL0-3 lines.
- */
-#define HS_NUM_MAPPED_IRQS  16  /* Limitation of the PCMCIA code */
-static struct
-{
-    /* index is mapped irq number */
-    hs_socket_t *sock;
-    hw_irq_controller *old_handler;
-} hs_mapped_irq[HS_NUM_MAPPED_IRQS];
-static void hs_socket_enable_ireq(hs_socket_t *sp)
-{
-        unsigned short cscier;
-        
-        DPRINTK("hs_socket_enable_ireq(sock=%d)\n", sp->number);
-        cscier = hs_in(sp, CSCIER);
-        cscier &= ~HD64465_PCCCSCIER_PIREQE_MASK;
-        cscier |= HD64465_PCCCSCIER_PIREQE_LEVEL;
-        hs_out(sp, cscier, CSCIER);
-}
-static void hs_socket_disable_ireq(hs_socket_t *sp)
-{
-        unsigned short cscier;
-        
-        DPRINTK("hs_socket_disable_ireq(sock=%d)\n", sp->number);
-        
-        cscier = hs_in(sp, CSCIER);
-        cscier &= ~HD64465_PCCCSCIER_PIREQE_MASK;
-        hs_out(sp, cscier, CSCIER);
-}
-static unsigned int hs_startup_irq(unsigned int irq)
-{
-        hs_socket_enable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->startup(irq);
-        return 0;
-}
-static void hs_shutdown_irq(unsigned int irq)
-{
-        hs_socket_disable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->shutdown(irq);
-}
-static void hs_enable_irq(unsigned int irq)
-{
-        hs_socket_enable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->enable(irq);
-}
-static void hs_disable_irq(unsigned int irq)
-{
-        hs_socket_disable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->disable(irq);
-}
-extern struct hw_interrupt_type no_irq_type;
-static void hs_mask_and_ack_irq(unsigned int irq)
-{
-        hs_socket_disable_ireq(hs_mapped_irq[irq].sock);
-        /* ack_none() spuriously complains about an unexpected IRQ */
-        if (hs_mapped_irq[irq].old_handler != &no_irq_type)
-            hs_mapped_irq[irq].old_handler->ack(irq);
-}
-static void hs_end_irq(unsigned int irq)
-{
-        hs_socket_enable_ireq(hs_mapped_irq[irq].sock);
-        hs_mapped_irq[irq].old_handler->end(irq);
-}
-static struct hw_interrupt_type hd64465_ss_irq_type = {
-        .typename       = "PCMCIA-IRQ",
-        .startup        = hs_startup_irq,
-        .shutdown       = hs_shutdown_irq,
-        .enable         = hs_enable_irq,
-        .disable        = hs_disable_irq,
-        .ack            = hs_mask_and_ack_irq,
-        .end            = hs_end_irq
-};
-/* 
- * This function should only ever be called with interrupts disabled.
- */
-static void hs_map_irq(hs_socket_t *sp, unsigned int irq)
-{
-        struct irq_desc *desc;
-        DPRINTK("hs_map_irq(sock=%d irq=%d)\n", sp->number, irq);
-        
-        if (irq >= HS_NUM_MAPPED_IRQS)
-            return;
-        desc = irq_to_desc(irq);
-        hs_mapped_irq[irq].sock = sp;
-        /* insert ourselves as the irq controller */
-        hs_mapped_irq[irq].old_handler = desc->chip;
-        desc->chip = &hd64465_ss_irq_type;
-}
-/* 
- * This function should only ever be called with interrupts disabled.
- */
-static void hs_unmap_irq(hs_socket_t *sp, unsigned int irq)
-{
-        struct irq_desc *desc;
-        DPRINTK("hs_unmap_irq(sock=%d irq=%d)\n", sp->number, irq);
-        
-        if (irq >= HS_NUM_MAPPED_IRQS)
-            return;
-                
-        desc = irq_to_desc(irq);
-        /* restore the original irq controller */
-        desc->chip = hs_mapped_irq[irq].old_handler;
-}
-/*============================================================*/
-/*
- * Set Vpp and Vcc (in tenths of a Volt).  Does not
- * support the hi-Z state.
- *
- * Note, this assumes the board uses a TPS2206 chip to control
- * the Vcc and Vpp voltages to the hs_sockets.  If your board
- * uses the MIC2563 (also supported by the HD64465) then you
- * will have to modify this function.
- */
-                                         /* 0V   3.3V  5.5V */
-static const u_char hs_tps2206_avcc[3] = { 0x00, 0x04, 0x08 };
-static const u_char hs_tps2206_bvcc[3] = { 0x00, 0x80, 0x40 };
-static int hs_set_voltages(hs_socket_t *sp, int Vcc, int Vpp)
-{
-        u_int psr;
-        u_int vcci = 0;
-        u_int sock = sp->number;
-        
-        DPRINTK("hs_set_voltage(%d, %d, %d)\n", sock, Vcc, Vpp);
-        switch (Vcc)
-        {
-        case 0:  vcci = 0; break;
-        case 33: vcci = 1; break;
-        case 50: vcci = 2; break;
-        default: return 0;
-        }
-        /* Note: Vpp = 120 not supported -- Greg Banks */
-        if (Vpp != 0 && Vpp != Vcc)
-            return 0;
-        
-        /* The PSR register holds 8 of the 9 bits which control
-         * the TPS2206 via its serial interface.
-         */
-        psr = inw(HD64465_REG_PCCPSR);
-        switch (sock)
-        {
-        case 0:
-            psr &= 0x0f;
-            psr |= hs_tps2206_avcc[vcci];
-            psr |= (Vpp == 0 ? 0x00 : 0x02);
-            break;
-        case 1:
-            psr &= 0xf0;
-            psr |= hs_tps2206_bvcc[vcci];
-            psr |= (Vpp == 0 ? 0x00 : 0x20);
-            break;
-        };
-        outw(psr, HD64465_REG_PCCPSR);
-        
-        return 1;
-}
-/*============================================================*/
-/*
- * Drive the RESET line to the card.
- */
-static void hs_reset_socket(hs_socket_t *sp, int on)
-{
-        unsigned short v;
-        
-        v = hs_in(sp, GCR);
-        if (on)
-            v |= HD64465_PCCGCR_PCCR;
-        else
-            v &= ~HD64465_PCCGCR_PCCR;
-        hs_out(sp, v, GCR);
-}
-/*============================================================*/
-static int hs_init(struct pcmcia_socket *s)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        
-        DPRINTK("hs_init(%d)\n", sp->number);
-        return 0;
-}
-/*============================================================*/
-static int hs_get_status(struct pcmcia_socket *s, u_int *value)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        unsigned int isr;
-        u_int status = 0;
-        
-        
-        isr = hs_in(sp, ISR);
-        /* Card is seated and powered when *both* CD pins are low */
-        if ((isr & HD64465_PCCISR_PCD_MASK) == 0)
-        {
-            status |= SS_DETECT;    /* card present */
-            switch (isr & HD64465_PCCISR_PBVD_MASK)
-            {
-            case HD64465_PCCISR_PBVD_BATGOOD:   
-                break;
-            case HD64465_PCCISR_PBVD_BATWARN:
-                status |= SS_BATWARN;
-                break;
-            default:
-                status |= SS_BATDEAD;
-                break;
-            }
-            if (isr & HD64465_PCCISR_PREADY)
-                status |= SS_READY;
-            if (isr & HD64465_PCCISR_PMWP)
-                status |= SS_WRPROT;
-                
-            /* Voltage Select pins interpreted as per Table 4-5 of the std.
-             * Assuming we have the TPS2206, the socket is a "Low Voltage
-             * key, 3.3V and 5V available, no X.XV available".
-             */
-            switch (isr & (HD64465_PCCISR_PVS2|HD64465_PCCISR_PVS1))
-            {
-            case HD64465_PCCISR_PVS1:
-                printk(KERN_NOTICE MODNAME ": cannot handle X.XV card, ignored\n");
-                status = 0;
-                break;
-            case 0:
-            case HD64465_PCCISR_PVS2:
-                /* 3.3V */
-                status |= SS_3VCARD;
-                break;
-            case HD64465_PCCISR_PVS2|HD64465_PCCISR_PVS1:
-                /* 5V */
-                break;
-            }
-                
-            /* TODO: SS_POWERON */
-            /* TODO: SS_STSCHG */
-        }       
-        
-        DPRINTK("hs_get_status(%d) = %x\n", sock, status);
-        
-        *value = status;
-        return 0;
-}
-/*============================================================*/
-static int hs_set_socket(struct pcmcia_socket *s, socket_state_t *state)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        u_long flags;
-        u_int changed;
-        unsigned short cscier;
-        DPRINTK("hs_set_socket(sock=%d, flags=%x, csc_mask=%x, Vcc=%d, Vpp=%d, io_irq=%d)\n",
-            sock, state->flags, state->csc_mask, state->Vcc, state->Vpp, state->io_irq);
-        
-        local_irq_save(flags);  /* Don't want interrupts happening here */
-        if (state->Vpp != sp->state.Vpp ||
-            state->Vcc != sp->state.Vcc) {
-            if (!hs_set_voltages(sp, state->Vcc, state->Vpp)) {
-                local_irq_restore(flags);
-                return -EINVAL;
-            }
-        }
-/*      hd64465_io_debug = 1; */
-        /*
-         * Handle changes in the Card Status Change mask,
-         * by propagating to the CSCR register
-         */     
-        changed = sp->state.csc_mask ^ state->csc_mask;
-        cscier = hs_in(sp, CSCIER);
-            
-        if (changed & SS_DETECT) {
-            if (state->csc_mask & SS_DETECT)
-                cscier |= HD64465_PCCCSCIER_PCDE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PCDE;
-        }
-        if (changed & SS_READY) {
-            if (state->csc_mask & SS_READY)
-                cscier |= HD64465_PCCCSCIER_PRE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PRE;
-        }
-        if (changed & SS_BATDEAD) {
-            if (state->csc_mask & SS_BATDEAD)
-                cscier |= HD64465_PCCCSCIER_PBDE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PBDE;
-        }
-        if (changed & SS_BATWARN) {
-            if (state->csc_mask & SS_BATWARN)
-                cscier |= HD64465_PCCCSCIER_PBWE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PBWE;
-        }
-        if (changed & SS_STSCHG) {
-            if (state->csc_mask & SS_STSCHG)
-                cscier |= HD64465_PCCCSCIER_PSCE;
-            else
-                cscier &= ~HD64465_PCCCSCIER_PSCE;
-        }
-        hs_out(sp, cscier, CSCIER);
-        if (sp->state.io_irq && !state->io_irq)
-            hs_unmap_irq(sp, sp->state.io_irq);
-        else if (!sp->state.io_irq && state->io_irq)
-            hs_map_irq(sp, state->io_irq);
-        /*
-         * Handle changes in the flags field,
-         * by propagating to config registers.
-         */     
-        changed = sp->state.flags ^ state->flags;
-        if (changed & SS_IOCARD) {
-            DPRINTK("card type: %s\n",
-                    (state->flags & SS_IOCARD ? "i/o" : "memory" ));
-            bool_to_regbit(sp, GCR, HD64465_PCCGCR_PCCT,
-                state->flags & SS_IOCARD);
-        }
-        if (changed & SS_RESET) {
-            DPRINTK("%s reset card\n",
-                (state->flags & SS_RESET ? "start" : "stop"));
-            bool_to_regbit(sp, GCR, HD64465_PCCGCR_PCCR,
-                state->flags & SS_RESET);
-        }
-        if (changed & SS_OUTPUT_ENA) {
-            DPRINTK("%sabling card output\n",
-                (state->flags & SS_OUTPUT_ENA ? "en" : "dis"));
-            bool_to_regbit(sp, GCR, HD64465_PCCGCR_PDRV,
-                state->flags & SS_OUTPUT_ENA);
-        }
-        /* TODO: SS_SPKR_ENA */
-            
-/*      hd64465_io_debug = 0; */
-        sp->state = *state;
-            
-        local_irq_restore(flags);
-#if HD64465_DEBUG > 10
-        if (state->flags & SS_OUTPUT_ENA)   
-            cis_hex_dump((const unsigned char*)sp->mem_base, 0x100);
-#endif
-        return 0;
-}
-/*============================================================*/
-static int hs_set_io_map(struct pcmcia_socket *s, struct pccard_io_map *io)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        int map = io->map;
-        int sock = sp->number;
-        struct pccard_io_map *sio;
-        pgprot_t prot;
-        DPRINTK("hs_set_io_map(sock=%d, map=%d, flags=0x%x, speed=%dns, start=%#lx, stop=%#lx)\n",
-            sock, map, io->flags, io->speed, io->start, io->stop);
-        if (map >= MAX_IO_WIN)
-            return -EINVAL;
-        sio = &sp->io_maps[map];
-        /* check for null changes */    
-        if (io->flags == sio->flags &&
-            io->start == sio->start &&
-            io->stop == sio->stop)
-            return 0;
-        
-        if (io->flags & MAP_AUTOSZ)
-            prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IODYN);
-        else if (io->flags & MAP_16BIT)
-            prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IO16);
-        else
-            prot = PAGE_KERNEL_PCC(sock, _PAGE_PCC_IO8);
-        /* TODO: handle MAP_USE_WAIT */
-        if (io->flags & MAP_USE_WAIT)
-            printk(KERN_INFO MODNAME ": MAP_USE_WAIT unimplemented\n");
-        /* TODO: handle MAP_PREFETCH */
-        if (io->flags & MAP_PREFETCH)
-            printk(KERN_INFO MODNAME ": MAP_PREFETCH unimplemented\n");
-        /* TODO: handle MAP_WRPROT */
-        if (io->flags & MAP_WRPROT)
-            printk(KERN_INFO MODNAME ": MAP_WRPROT unimplemented\n");
-        /* TODO: handle MAP_0WS */
-        if (io->flags & MAP_0WS)
-            printk(KERN_INFO MODNAME ": MAP_0WS unimplemented\n");
-        if (io->flags & MAP_ACTIVE) {
-            unsigned long pstart, psize, paddrbase;
-            
-            paddrbase = virt_to_phys((void*)(sp->mem_base + 2 * HD64465_PCC_WINDOW));
-            pstart = io->start & PAGE_MASK;
-            psize = ((io->stop + PAGE_SIZE) & PAGE_MASK) - pstart;
-            /*
-             * Change PTEs in only that portion of the mapping requested
-             * by the caller.  This means that most of the time, most of
-             * the PTEs in the io_vma will be unmapped and only the bottom
-             * page will be mapped.  But the code allows for weird cards
-             * that might want IO ports > 4K.
-             */
-            sp->io_base = p3_ioremap(paddrbase + pstart, psize, pgprot_val(prot));
-            
-            /*
-             * Change the mapping used by inb() outb() etc
-             */
-            hd64465_port_map(io->start,
-                io->stop - io->start + 1,
-                (unsigned long)sp->io_base + io->start, 0);
-        } else {
-            hd64465_port_unmap(sio->start, sio->stop - sio->start + 1);
-            p3_iounmap(sp->io_base);
-        }
-        
-        *sio = *io;
-        return 0;
-}
-/*============================================================*/
-static int hs_set_mem_map(struct pcmcia_socket *s, struct pccard_mem_map *mem)
-{
-        hs_socket_t *sp = container_of(s, struct hs_socket_t, socket);
-        struct pccard_mem_map *smem;
-        int map = mem->map;
-        unsigned long paddr;
-#if 0
-        DPRINTK("hs_set_mem_map(sock=%d, map=%d, flags=0x%x, card_start=0x%08x)\n",
-            sock, map, mem->flags, mem->card_start);
-#endif
-        if (map >= MAX_WIN)
-            return -EINVAL;
-        smem = &sp->mem_maps[map];
-        
-        paddr = sp->mem_base;               /* base of Attribute mapping */
-        if (!(mem->flags & MAP_ATTRIB))
-            paddr += HD64465_PCC_WINDOW;    /* base of Common mapping */
-        paddr += mem->card_start;
-        /* Because we specified SS_CAP_STATIC_MAP, we are obliged
-         * at this time to report the system address corresponding
-         * to the card address requested.  This is how Socket Services
-         * queries our fixed mapping.  I wish this fact had been
-         * documented - Greg Banks.
-         */
-        mem->static_start = paddr;
-        
-        *smem = *mem;
-        
-        return 0;
-}
-/* TODO: do we need to use the MMU to access Common memory ??? */
-/*============================================================*/
-/*
- * This function is registered with the HD64465 glue code to do a
- * secondary demux step on the PCMCIA interrupts.  It handles 
- * mapping the IREQ request from the card to a standard Linux
- * IRQ, as requested by SocketServices.
- */
-static int hs_irq_demux(int irq, void *dev)
-{
-        hs_socket_t *sp = dev;
-        u_int cscr;
-        
-        DPRINTK("hs_irq_demux(irq=%d)\n", irq);
-        if (sp->state.io_irq &&
-            (cscr = hs_in(sp, CSCR)) & HD64465_PCCCSCR_PIREQ) {
-            cscr &= ~HD64465_PCCCSCR_PIREQ;
-            hs_out(sp, cscr, CSCR);
-            return sp->state.io_irq;
-        }
-            
-        return irq;
-}
-/*============================================================*/
-/*
- * Interrupt handling routine.
- */
- 
-static irqreturn_t hs_interrupt(int irq, void *dev)
-{
-        hs_socket_t *sp = dev;
-        u_int events = 0;
-        u_int cscr;
-        cscr = hs_in(sp, CSCR);
-        
-        DPRINTK("hs_interrupt, cscr=%04x\n", cscr);
-        /* check for bus-related changes to be reported to Socket Services */
-        if (cscr & HD64465_PCCCSCR_PCDC) {
-            /* double-check for a 16-bit card, as we don't support CardBus */
-            if ((hs_in(sp, ISR) & HD64465_PCCISR_PCD_MASK) != 0) {
-                printk(KERN_NOTICE MODNAME
-                    ": socket %d, card not a supported card type or not inserted correctly\n",
-                    sp->number);
-                /* Don't do the rest unless a card is present */
-                cscr &= ~(HD64465_PCCCSCR_PCDC|
-                          HD64465_PCCCSCR_PRC|
-                          HD64465_PCCCSCR_PBW|
-                          HD64465_PCCCSCR_PBD|
-                          HD64465_PCCCSCR_PSC);
-            } else {
-                cscr &= ~HD64465_PCCCSCR_PCDC;
-                events |= SS_DETECT;            /* card insertion or removal */
-            }
-        }
-        if (cscr & HD64465_PCCCSCR_PRC) {
-            cscr &= ~HD64465_PCCCSCR_PRC;
-            events |= SS_READY;         /* ready signal changed */
-        }
-        if (cscr & HD64465_PCCCSCR_PBW) {
-            cscr &= ~HD64465_PCCCSCR_PSC;
-            events |= SS_BATWARN;       /* battery warning */
-        }
-        if (cscr & HD64465_PCCCSCR_PBD) {
-            cscr &= ~HD64465_PCCCSCR_PSC;
-            events |= SS_BATDEAD;       /* battery dead */
-        }
-        if (cscr & HD64465_PCCCSCR_PSC) {
-            cscr &= ~HD64465_PCCCSCR_PSC;
-            events |= SS_STSCHG;        /* STSCHG (status changed) signal */
-        }
-        
-        if (cscr & HD64465_PCCCSCR_PIREQ) {
-            cscr &= ~HD64465_PCCCSCR_PIREQ;
-            /* This should have been dealt with during irq demux */         
-            printk(KERN_NOTICE MODNAME ": unexpected IREQ from card\n");
-        }
-        hs_out(sp, cscr, CSCR);
-        if (events)
-                pcmcia_parse_events(&sp->socket, events);
-        return IRQ_HANDLED;
-}
-/*============================================================*/
-static struct pccard_operations hs_operations = {
-        .init                   = hs_init,
-        .get_status             = hs_get_status,
-        .set_socket             = hs_set_socket,
-        .set_io_map             = hs_set_io_map,
-        .set_mem_map            = hs_set_mem_map,
-};
-static int hs_init_socket(hs_socket_t *sp, int irq, unsigned long mem_base,
-            unsigned int ctrl_base)
-{
-        unsigned short v;
-        int i, err;
-        memset(sp, 0, sizeof(*sp));
-        sp->irq = irq;
-        sp->mem_base = mem_base;
-        sp->mem_length = 4*HD64465_PCC_WINDOW;  /* 16MB */
-        sp->ctrl_base = ctrl_base;
-        
-        for (i=0 ; i<MAX_IO_WIN ; i++)
-            sp->io_maps[i].map = i;
-        for (i=0 ; i<MAX_WIN ; i++)
-            sp->mem_maps[i].map = i;
-        
-        hd64465_register_irq_demux(sp->irq, hs_irq_demux, sp);
-        
-        if ((err = request_irq(sp->irq, hs_interrupt, IRQF_DISABLED, MODNAME, sp)) < 0)
-            return err;
-        if (request_mem_region(sp->mem_base, sp->mem_length, MODNAME) == 0) {
-            sp->mem_base = 0;
-            return -ENOMEM;
-        }
-        /* According to section 3.2 of the PCMCIA standard, low-voltage
-         * capable cards must implement cold insertion, i.e. Vpp and
-         * Vcc set to 0 before card is inserted.
-         */
-        /*hs_set_voltages(sp, 0, 0);*/
-        
-        /* hi-Z the outputs to the card and set 16MB map mode */
-        v = hs_in(sp, GCR);
-        v &= ~HD64465_PCCGCR_PCCT;      /* memory-only card */
-        hs_out(sp, v, GCR);
-        v = hs_in(sp, GCR);
-        v |= HD64465_PCCGCR_PDRV;       /* enable outputs to card */
-        hs_out(sp, v, GCR);
-        v = hs_in(sp, GCR);
-        v |= HD64465_PCCGCR_PMMOD;      /* 16MB mapping mode */
-        hs_out(sp, v, GCR);
-        v = hs_in(sp, GCR);
-        /* lowest 16MB of Common */
-        v &= ~(HD64465_PCCGCR_PPA25|HD64465_PCCGCR_PPA24); 
-        hs_out(sp, v, GCR);
-        
-        hs_reset_socket(sp, 1);
-        printk(KERN_INFO "HD64465 PCMCIA bridge socket %d at 0x%08lx irq %d\n",
-                i, sp->mem_base, sp->irq);
-        return 0;
-}
-static void hs_exit_socket(hs_socket_t *sp)
-{
-        unsigned short cscier, gcr;
-        unsigned long flags;
-        
-        local_irq_save(flags);
-        /* turn off interrupts in hardware */
-        cscier = hs_in(sp, CSCIER);
-        cscier = (cscier & IER_MASK) | IER_OFF;
-        hs_out(sp, cscier, CSCIER);
-        
-        /* hi-Z the outputs to the card */
-        gcr = hs_in(sp, GCR);
-        gcr &= HD64465_PCCGCR_PDRV;
-        hs_out(sp, gcr, GCR);
-        /* power the card down */
-        hs_set_voltages(sp, 0, 0);
-        if (sp->mem_base != 0)
-            release_mem_region(sp->mem_base, sp->mem_length);
-        if (sp->irq != 0) {
-            free_irq(sp->irq, hs_interrupt);
-            hd64465_unregister_irq_demux(sp->irq);
-        }
-        local_irq_restore(flags);
-}
-static struct device_driver hd64465_driver = {
-        .name = "hd64465-pcmcia",
-        .bus = &platform_bus_type,
-        .suspend = pcmcia_socket_dev_suspend,
-        .resume = pcmcia_socket_dev_resume,
-};
-static struct platform_device hd64465_device = {
-        .name = "hd64465-pcmcia",
-        .id = 0,
-};
-static int __init init_hs(void)
-{
-        int i;
-        unsigned short v;
-/*      hd64465_io_debug = 1; */
-        if (driver_register(&hd64465_driver))
-                return -EINVAL;
-        
-        /* Wake both sockets out of STANDBY mode */
-        /* TODO: wait 15ms */
-        v = inw(HD64465_REG_SMSCR);
-        v &= ~(HD64465_SMSCR_PC0ST|HD64465_SMSCR_PC1ST);
-        outw(v, HD64465_REG_SMSCR);
-        /* keep power controller out of shutdown mode */
-        v = inb(HD64465_REG_PCC0SCR);
-        v |= HD64465_PCCSCR_SHDN;
-        outb(v, HD64465_REG_PCC0SCR);
-        /* use serial (TPS2206) power controller */
-        v = inb(HD64465_REG_PCC0CSCR);
-        v |= HD64465_PCCCSCR_PSWSEL;
-        outb(v, HD64465_REG_PCC0CSCR);
-        /*
-         * Setup hs_sockets[] structures and request system resources.
-         * TODO: on memory allocation failure, power down the socket
-         *       before quitting.
-         */
-        for (i=0; i<HS_MAX_SOCKETS; i++) {
-                hs_set_voltages(&hs_sockets[i], 0, 0);
-                hs_sockets[i].socket.features |=  SS_CAP_PCCARD | SS_CAP_STATIC_MAP;      /* mappings are fixed in host memory */
-                hs_sockets[i].socket.resource_ops = &pccard_static_ops;
-                hs_sockets[i].socket.irq_mask =  0xffde;/*0xffff*/          /* IRQs mapped in s/w so can do any, really */
-                hs_sockets[i].socket.map_size = HD64465_PCC_WINDOW;     /* 16MB fixed window size */
-                hs_sockets[i].socket.owner = THIS_MODULE;
-                hs_sockets[i].socket.ss_entry = &hs_operations;
-        }
-        i = hs_init_socket(&hs_sockets[0],
-            HD64465_IRQ_PCMCIA0,
-            HD64465_PCC0_BASE,
-            HD64465_REG_PCC0ISR);
-        if (i < 0) {
-                unregister_driver(&hd64465_driver);
-                return i;
-        }
-        i = hs_init_socket(&hs_sockets[1],
-            HD64465_IRQ_PCMCIA1,
-            HD64465_PCC1_BASE,
-            HD64465_REG_PCC1ISR);
-        if (i < 0) {
-                unregister_driver(&hd64465_driver);
-                return i;
-        }
-/*      hd64465_io_debug = 0; */
-        platform_device_register(&hd64465_device);
-        for (i=0; i<HS_MAX_SOCKETS; i++) {
-                unsigned int ret;
-                hs_sockets[i].socket.dev.parent = &hd64465_device.dev;
-                hs_sockets[i].number = i;
-                ret = pcmcia_register_socket(&hs_sockets[i].socket);
-                if (ret && i)
-                        pcmcia_unregister_socket(&hs_sockets[0].socket);
-        }
-        return 0;
-}
-static void __exit exit_hs(void)
-{
-        int i;
-        for (i=0 ; i<HS_MAX_SOCKETS ; i++) {
-                pcmcia_unregister_socket(&hs_sockets[i].socket);
-                hs_exit_socket(&hs_sockets[i]);
-        }
-        platform_device_unregister(&hd64465_device);
-        unregister_driver(&hd64465_driver);
-}
-module_init(init_hs);
-module_exit(exit_hs);
-/*============================================================*/
-/*END*/
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index afea2b2558b5..76d4a98f0955 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -693,8 +693,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
        type = 0;
        if (s->functions > 1)           /* All of this ought to be handled higher up */
                type = IRQF_SHARED;
-        if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
+        else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
                type = IRQF_SHARED;
+        else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
 #ifdef CONFIG_PCMCIA_PROBE
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 3688e339db87..773b29cec8be 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -79,6 +79,11 @@ struct da903x_regulator_info {
        int     enable_bit;
 };
+static inline struct device *to_da903x_dev(struct regulator_dev *rdev)
+{
+        return rdev_get_dev(rdev)->parent->parent;
+}
 static inline int check_range(struct da903x_regulator_info *info,
                                int min_uV, int max_uV)
 {
@@ -93,7 +98,7 @@ static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
                                  int min_uV, int max_uV)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
        uint8_t val, mask;
        if (check_range(info, min_uV, max_uV)) {
@@ -111,7 +116,7 @@ static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
 static int da903x_get_voltage(struct regulator_dev *rdev)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
        uint8_t val, mask;
        int ret;
@@ -128,7 +133,7 @@ static int da903x_get_voltage(struct regulator_dev *rdev)
 static int da903x_enable(struct regulator_dev *rdev)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
        return da903x_set_bits(da9034_dev, info->enable_reg,
                                        1 << info->enable_bit);
@@ -137,7 +142,7 @@ static int da903x_enable(struct regulator_dev *rdev)
 static int da903x_disable(struct regulator_dev *rdev)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
        return da903x_clr_bits(da9034_dev, info->enable_reg,
                                        1 << info->enable_bit);
@@ -146,7 +151,7 @@ static int da903x_disable(struct regulator_dev *rdev)
 static int da903x_is_enabled(struct regulator_dev *rdev)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
        uint8_t reg_val;
        int ret;
@@ -162,7 +167,7 @@ static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
                                       int min_uV, int max_uV)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
        uint8_t val, mask;
        int ret;
@@ -189,7 +194,7 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
                                  int min_uV, int max_uV)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
        uint8_t val, mask;
        int thresh;
@@ -215,7 +220,7 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,
 static int da9030_get_ldo14_voltage(struct regulator_dev *rdev)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da903x_dev = rdev_get_dev(rdev)->parent;
+        struct device *da903x_dev = to_da903x_dev(rdev);
        uint8_t val, mask;
        int ret;
@@ -238,7 +243,7 @@ static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
                                  int min_uV, int max_uV)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
        uint8_t val, mask;
        int ret;
@@ -264,7 +269,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
                                    int min_uV, int max_uV)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
        uint8_t val, mask;
        if (check_range(info, min_uV, max_uV)) {
@@ -283,7 +288,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
 static int da9034_get_ldo12_voltage(struct regulator_dev *rdev)
 {
        struct da903x_regulator_info *info = rdev_get_drvdata(rdev);
-        struct device *da9034_dev = rdev_get_dev(rdev)->parent;
+        struct device *da9034_dev = to_da903x_dev(rdev);
        uint8_t val, mask;
        int ret;
@@ -466,7 +471,7 @@ static int __devinit da903x_regulator_probe(struct platform_device *pdev)
        if (ri->desc.id == DA9030_ID_LDO1 || ri->desc.id == DA9030_ID_LDO15)
                ri->desc.ops = &da9030_regulator_ldo1_15_ops;
-        rdev = regulator_register(&ri->desc, pdev->dev.parent, ri);
+        rdev = regulator_register(&ri->desc, &pdev->dev, ri);
        if (IS_ERR(rdev)) {
                dev_err(&pdev->dev, "failed to register regulator %s\n",
                                ri->desc.name);
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 079e9ed907e0..ecdea44ae4e5 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -446,9 +446,6 @@ static int rtc_dev_release(struct inode *inode, struct file *file)
        if (rtc->ops->release)
                rtc->ops->release(rtc->dev.parent);
-        if (file->f_flags & FASYNC)
-                rtc_dev_fasync(-1, file, 0);
        clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
        return 0;
 }
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
index 37d131d03f33..45e5b106af73 100644
--- a/drivers/rtc/rtc-ds3234.c
+++ b/drivers/rtc/rtc-ds3234.c
@@ -189,7 +189,7 @@ static const struct rtc_class_ops ds3234_rtc_ops = {
        .set_time       = ds3234_set_time,
 };
-static int ds3234_probe(struct spi_device *spi)
+static int __devinit ds3234_probe(struct spi_device *spi)
 {
        struct rtc_device *rtc;
        unsigned char tmp;
@@ -249,7 +249,7 @@ static int ds3234_probe(struct spi_device *spi)
        return 0;
 }
-static int __exit ds3234_remove(struct spi_device *spi)
+static int __devexit ds3234_remove(struct spi_device *spi)
 {
        struct ds3234 *chip = platform_get_drvdata(spi);
        struct rtc_device *rtc = chip->rtc;
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 04b63dab6932..43afb7ab5289 100644
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -87,6 +87,10 @@ static int m48t59_rtc_read_time(struct device *dev, struct rtc_time *tm)
                dev_dbg(dev, "Century bit is enabled\n");
                tm->tm_year += 100;     /* one century */
        }
+#ifdef CONFIG_SPARC
+        /* Sun SPARC machines count years since 1968 */
+        tm->tm_year += 68;
+#endif
        tm->tm_wday     = bcd2bin(val & 0x07);
        tm->tm_hour     = bcd2bin(M48T59_READ(M48T59_HOUR) & 0x3F);
@@ -110,11 +114,20 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm)
        struct m48t59_private *m48t59 = platform_get_drvdata(pdev);
        unsigned long flags;
        u8 val = 0;
+        int year = tm->tm_year;
+#ifdef CONFIG_SPARC
+        /* Sun SPARC machines count years since 1968 */
+        year -= 68;
+#endif
        dev_dbg(dev, "RTC set time %04d-%02d-%02d %02d/%02d/%02d\n",
-                tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
+                year + 1900, tm->tm_mon, tm->tm_mday,
                tm->tm_hour, tm->tm_min, tm->tm_sec);
+        if (year < 0)
+                return -EINVAL;
        spin_lock_irqsave(&m48t59->lock, flags);
        /* Issue the WRITE command */
        M48T59_SET_BITS(M48T59_CNTL_WRITE, M48T59_CNTL);
@@ -125,9 +138,9 @@ static int m48t59_rtc_set_time(struct device *dev, struct rtc_time *tm)
        M48T59_WRITE((bin2bcd(tm->tm_mday) & 0x3F), M48T59_MDAY);
        /* tm_mon is 0-11 */
        M48T59_WRITE((bin2bcd(tm->tm_mon + 1) & 0x1F), M48T59_MONTH);
-        M48T59_WRITE(bin2bcd(tm->tm_year % 100), M48T59_YEAR);
+        M48T59_WRITE(bin2bcd(year % 100), M48T59_YEAR);
-        if (pdata->type == M48T59RTC_TYPE_M48T59 && (tm->tm_year / 100))
+        if (pdata->type == M48T59RTC_TYPE_M48T59 && (year / 100))
                val = (M48T59_WDAY_CEB | M48T59_WDAY_CB);
        val |= (bin2bcd(tm->tm_wday) & 0x07);
        M48T59_WRITE(val, M48T59_WDAY);
@@ -159,6 +172,10 @@ static int m48t59_rtc_readalarm(struct device *dev, struct rtc_wkalrm *alrm)
        M48T59_SET_BITS(M48T59_CNTL_READ, M48T59_CNTL);
        tm->tm_year = bcd2bin(M48T59_READ(M48T59_YEAR));
+#ifdef CONFIG_SPARC
+        /* Sun SPARC machines count years since 1968 */
+        tm->tm_year += 68;
+#endif
        /* tm_mon is 0-11 */
        tm->tm_mon = bcd2bin(M48T59_READ(M48T59_MONTH)) - 1;
@@ -192,11 +209,20 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
        struct rtc_time *tm = &alrm->time;
        u8 mday, hour, min, sec;
        unsigned long flags;
+        int year = tm->tm_year;
+#ifdef CONFIG_SPARC
+        /* Sun SPARC machines count years since 1968 */
+        year -= 68;
+#endif
        /* If no irq, we don't support ALARM */
        if (m48t59->irq == NO_IRQ)
                return -EIO;
+        if (year < 0)
+                return -EINVAL;
        /*
         * 0xff means "always match"
         */
@@ -228,7 +254,7 @@ static int m48t59_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
        spin_unlock_irqrestore(&m48t59->lock, flags);
        dev_dbg(dev, "RTC set alarm time %04d-%02d-%02d %02d/%02d/%02d\n",
-                tm->tm_year + 1900, tm->tm_mon, tm->tm_mday,
+                year + 1900, tm->tm_mon, tm->tm_mday,
                tm->tm_hour, tm->tm_min, tm->tm_sec);
        return 0;
 }
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 0273ebc4cf36..7a568beba3f0 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -455,6 +455,8 @@ static int __devinit s3c_rtc_probe(struct platform_device *pdev)
        s3c_rtc_setfreq(&pdev->dev, 1);
+        device_init_wakeup(&pdev->dev, 1);
        /* register RTC and exit */
        rtc = rtc_device_register("s3c", &pdev->dev, &s3c_rtcops,
@@ -507,7 +509,7 @@ static int s3c_rtc_resume(struct platform_device *pdev)
 #define s3c_rtc_resume  NULL
 #endif
-static struct platform_driver s3c2410_rtcdrv = {
+static struct platform_driver s3c2410_rtc_driver = {
        .probe          = s3c_rtc_probe,
        .remove         = __devexit_p(s3c_rtc_remove),
        .suspend        = s3c_rtc_suspend,
@@ -523,12 +525,12 @@ static char __initdata banner[] = "S3C24XX RTC, (c) 2004,2006 Simtec Electronics
 static int __init s3c_rtc_init(void)
 {
        printk(banner);
-        return platform_driver_register(&s3c2410_rtcdrv);
+        return platform_driver_register(&s3c2410_rtc_driver);
 }
 static void __exit s3c_rtc_exit(void)
 {
-        platform_driver_unregister(&s3c2410_rtcdrv);
+        platform_driver_unregister(&s3c2410_rtc_driver);
 }
 module_init(s3c_rtc_init);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 7de410d5be4a..52d26592c72c 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3025,7 +3025,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
        struct qdio_buffer *buffer, int is_tso, int *next_element_to_fill,
        int offset)
 {
-        int length = skb->len - offset;
+        int length = skb->len;
        int length_here;
        int element;
        char *data;
@@ -3037,6 +3037,7 @@ static inline void __qeth_fill_buffer(struct sk_buff *skb,
        if (offset >= 0) {
                data = skb->data + offset;
+                length -= offset;
                first_lap = 0;
        }
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 955ba7a31b90..1b1e80336d2c 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -373,8 +373,6 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode)
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
        qeth_set_allowed_threads(card, 0, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
-                return -ERESTARTSYS;
        if (card->read.state == CH_STATE_UP &&
            card->write.state == CH_STATE_UP &&
            (card->state == CARD_STATE_UP)) {
@@ -451,12 +449,15 @@ static void qeth_l2_process_inbound_buffer(struct qeth_card *card,
                        netif_rx(skb);
                        break;
                case QETH_HEADER_TYPE_OSN:
-                        skb_push(skb, sizeof(struct qeth_hdr));
+                        if (card->info.type == QETH_CARD_TYPE_OSN) {
-                        skb_copy_to_linear_data(skb, hdr,
+                                skb_push(skb, sizeof(struct qeth_hdr));
+                                skb_copy_to_linear_data(skb, hdr,
                                                sizeof(struct qeth_hdr));
-                        len = skb->len;
+                                len = skb->len;
-                        card->osn_info.data_cb(skb);
+                                card->osn_info.data_cb(skb);
-                        break;
+                                break;
+                        }
+                        /* else unknown */
                default:
                        dev_kfree_skb_any(skb);
                        QETH_DBF_TEXT(TRACE, 3, "inbunkno");
@@ -975,12 +976,6 @@ static int __qeth_l2_set_online(struct ccwgroup_device *gdev, int recovery_mode)
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
        qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
-                PRINT_WARN("set_online of card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
        recover_flag = card->state;
        rc = ccw_device_set_online(CARD_RDEV(card));
        if (rc) {
@@ -1091,11 +1086,7 @@ static int __qeth_l2_set_offline(struct ccwgroup_device *cgdev,
        if (card->dev && netif_carrier_ok(card->dev))
                netif_carrier_off(card->dev);
        recover_flag = card->state;
-        if (qeth_l2_stop_card(card, recovery_mode) == -ERESTARTSYS) {
+        qeth_l2_stop_card(card, recovery_mode);
-                PRINT_WARN("Stopping card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
        rc  = ccw_device_set_offline(CARD_DDEV(card));
        rc2 = ccw_device_set_offline(CARD_WDEV(card));
        rc3 = ccw_device_set_offline(CARD_RDEV(card));
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 99547dea44de..ed59fedd5922 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -2064,8 +2064,6 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode)
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
        qeth_set_allowed_threads(card, 0, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD))
-                return -ERESTARTSYS;
        if (card->read.state == CH_STATE_UP &&
            card->write.state == CH_STATE_UP &&
            (card->state == CARD_STATE_UP)) {
@@ -3049,11 +3047,6 @@ static int __qeth_l3_set_online(struct ccwgroup_device *gdev, int recovery_mode)
        QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *));
        qeth_set_allowed_threads(card, QETH_RECOVER_THREAD, 1);
-        if (qeth_wait_for_threads(card, ~QETH_RECOVER_THREAD)) {
-                PRINT_WARN("set_online of card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
        recover_flag = card->state;
        rc = ccw_device_set_online(CARD_RDEV(card));
@@ -3170,11 +3163,7 @@ static int __qeth_l3_set_offline(struct ccwgroup_device *cgdev,
        if (card->dev && netif_carrier_ok(card->dev))
                netif_carrier_off(card->dev);
        recover_flag = card->state;
-        if (qeth_l3_stop_card(card, recovery_mode) == -ERESTARTSYS) {
+        qeth_l3_stop_card(card, recovery_mode);
-                PRINT_WARN("Stopping card %s interrupted by user!\n",
-                           CARD_BUS_ID(card));
-                return -ERESTARTSYS;
-        }
        rc  = ccw_device_set_offline(CARD_DDEV(card));
        rc2 = ccw_device_set_offline(CARD_WDEV(card));
        rc3 = ccw_device_set_offline(CARD_RDEV(card));
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index 210ddb639748..c144b9924d52 100644
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -121,9 +121,6 @@ static ssize_t qeth_l3_dev_route6_show(struct device *dev,
        if (!card)
                return -EINVAL;
-        if (!qeth_is_supported(card, IPA_IPV6))
-                return sprintf(buf, "%s\n", "n/a");
        return qeth_l3_dev_route_show(card, &card->options.route6, buf);
 }
@@ -135,10 +132,6 @@ static ssize_t qeth_l3_dev_route6_store(struct device *dev,
        if (!card)
                return -EINVAL;
-        if (!qeth_is_supported(card, IPA_IPV6)) {
-                return -EOPNOTSUPP;
-        }
        return qeth_l3_dev_route_store(card, &card->options.route6,
                                QETH_PROT_IPV6, buf, count);
 }
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c
index c33bcb284df7..56f4e6bffc21 100644
--- a/drivers/scsi/fdomain.c
+++ b/drivers/scsi/fdomain.c
@@ -290,9 +290,11 @@
 #include <scsi/scsi_ioctl.h>
 #include "fdomain.h"
+#ifndef PCMCIA
 MODULE_AUTHOR("Rickard E. Faith");
 MODULE_DESCRIPTION("Future domain SCSI driver");
 MODULE_LICENSE("GPL");
+#endif
  
 #define VERSION          "$Revision: 5.51 $"
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index afe1de998763..a454f94623d7 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -2988,17 +2988,6 @@ static int megasas_mgmt_open(struct inode *inode, struct file *filep)
 }
 /**
- * megasas_mgmt_release - char node "release" entry point
- */
-static int megasas_mgmt_release(struct inode *inode, struct file *filep)
-{
-        filep->private_data = NULL;
-        fasync_helper(-1, filep, 0, &megasas_async_queue);
-        return 0;
-}
-/**
 * megasas_mgmt_fasync -        Async notifier registration from applications
 *
 * This function adds the calling process to a driver global queue. When an
@@ -3345,7 +3334,6 @@ megasas_mgmt_compat_ioctl(struct file *file, unsigned int cmd,
 static const struct file_operations megasas_mgmt_fops = {
        .owner = THIS_MODULE,
        .open = megasas_mgmt_open,
-        .release = megasas_mgmt_release,
        .fasync = megasas_mgmt_fasync,
        .unlocked_ioctl = megasas_mgmt_ioctl,
 #ifdef CONFIG_COMPAT
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 9adf35bd8b56..5103855242ae 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -327,7 +327,6 @@ sg_release(struct inode *inode, struct file *filp)
        if ((!(sfp = (Sg_fd *) filp->private_data)) || (!(sdp = sfp->parentdp)))
                return -ENXIO;
        SCSI_LOG_TIMEOUT(3, printk("sg_release: %s\n", sdp->disk->disk_name));
-        sg_fasync(-1, filp, 0); /* remove filp from async notification list */
        if (0 == sg_remove_sfp(sdp, sfp)) {     /* Returns 1 when sdp gone */
                if (!sdp->detached) {
                        scsi_device_put(sdp->device);
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index c94d3c4b7521..579d63a81aa2 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1276,7 +1276,7 @@ config SERIAL_SGI_IOC3
          say Y or M.  Otherwise, say N.
 config SERIAL_NETX
-        bool "NetX serial port support"
+        tristate "NetX serial port support"
        depends on ARM && ARCH_NETX
        select SERIAL_CORE
        help
@@ -1288,7 +1288,7 @@ config SERIAL_NETX
 config SERIAL_NETX_CONSOLE
        bool "Console on NetX serial port"
-        depends on SERIAL_NETX
+        depends on SERIAL_NETX=y
        select SERIAL_CORE_CONSOLE
        help
          If you have enabled the serial port on the Hilscher NetX SoC
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c
index 211c21797ce0..8b2c619a09f2 100644
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -34,14 +34,14 @@ static char *serial_version = "$Revision: 1.25 $";
 #include <asm/system.h>
 #include <linux/delay.h>
-#include <asm/arch/svinto.h>
+#include <arch/svinto.h>
 /* non-arch dependent serial structures are in linux/serial.h */
 #include <linux/serial.h>
 /* while we keep our own stuff (struct e100_serial) in a local .h file */
 #include "crisv10.h"
 #include <asm/fasttimer.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 #ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
 #ifndef CONFIG_ETRAX_FAST_TIMER
diff --git a/drivers/serial/crisv10.h b/drivers/serial/crisv10.h
index e3c5c8c3c09b..f36a729280bc 100644
--- a/drivers/serial/crisv10.h
+++ b/drivers/serial/crisv10.h
@@ -10,7 +10,7 @@
 #include <linux/circ_buf.h>
 #include <asm/termios.h>
 #include <asm/dma.h>
-#include <asm/arch/io_interface_mux.h>
+#include <arch/io_interface_mux.h>
 /* Software state per channel */
diff --git a/drivers/serial/netx-serial.c b/drivers/serial/netx-serial.c
index 3f489329e8d3..3e5dda8518b7 100644
--- a/drivers/serial/netx-serial.c
+++ b/drivers/serial/netx-serial.c
@@ -42,8 +42,6 @@
 #define SERIAL_NX_MAJOR 204
 #define MINOR_START     170
-#ifdef CONFIG_SERIAL_NETX_CONSOLE
 enum uart_regs {
        UART_DR              = 0x00,
        UART_SR              = 0x04,
@@ -528,6 +526,8 @@ static struct netx_port netx_ports[] = {
        }
 };
+#ifdef CONFIG_SERIAL_NETX_CONSOLE
 static void netx_console_putchar(struct uart_port *port, int ch)
 {
        while (readl(port->membase + UART_FR) & FR_BUSY);
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index f0658d2c45b2..5c0f32c7fbf6 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -250,8 +250,7 @@ static inline void h8300_sci_disable(struct uart_port *port)
 }
 #endif
-#if defined(SCI_ONLY) || defined(SCI_AND_SCIF) && \
+#if defined(__H8300H__) || defined(__H8300S__)
-    defined(__H8300H__) || defined(__H8300S__)
 static void sci_init_pins_sci(struct uart_port* port, unsigned int cflag)
 {
        int ch = (port->mapbase - SMR0) >> 3;
@@ -285,11 +284,6 @@ static void sci_init_pins_irda(struct uart_port *port, unsigned int cflag)
 #define sci_init_pins_irda NULL
 #endif
-#ifdef SCI_ONLY
-#define sci_init_pins_scif NULL
-#endif
-#if defined(SCIF_ONLY) || defined(SCI_AND_SCIF)
 #if defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
 static void sci_init_pins_scif(struct uart_port* port, unsigned int cflag)
 {
@@ -449,7 +443,6 @@ static inline int scif_rxroom(struct uart_port *port)
        return sci_in(port, SCFDR) & SCIF_RFDC_MASK;
 }
 #endif
-#endif /* SCIF_ONLY || SCI_AND_SCIF */
 static inline int sci_txroom(struct uart_port *port)
 {
@@ -485,11 +478,9 @@ static void sci_transmit_chars(struct uart_port *port)
                return;
        }
-#ifndef SCI_ONLY
        if (port->type == PORT_SCIF)
                count = scif_txroom(port);
        else
-#endif
                count = sci_txroom(port);
        do {
@@ -519,12 +510,10 @@ static void sci_transmit_chars(struct uart_port *port)
        } else {
                ctrl = sci_in(port, SCSCR);
-#if !defined(SCI_ONLY)
                if (port->type == PORT_SCIF) {
                        sci_in(port, SCxSR); /* Dummy read */
                        sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
                }
-#endif
                ctrl |= SCI_CTRL_FLAGS_TIE;
                sci_out(port, SCSCR, ctrl);
@@ -547,11 +536,9 @@ static inline void sci_receive_chars(struct uart_port *port)
                return;
        while (1) {
-#if !defined(SCI_ONLY)
                if (port->type == PORT_SCIF)
                        count = scif_rxroom(port);
                else
-#endif
                        count = sci_rxroom(port);
                /* Don't copy more bytes than there is room for in the buffer */
@@ -810,26 +797,27 @@ static irqreturn_t sci_br_interrupt(int irq, void *ptr)
 static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
 {
-        unsigned short ssr_status, scr_status;
+        unsigned short ssr_status, scr_status;
-        struct uart_port *port = ptr;
+        struct uart_port *port = ptr;
+        irqreturn_t ret = IRQ_NONE;
        ssr_status = sci_in(port,SCxSR);
        scr_status = sci_in(port,SCSCR);
        /* Tx Interrupt */
-        if ((ssr_status & 0x0020) && (scr_status & 0x0080))
+        if ((ssr_status & 0x0020) && (scr_status & SCI_CTRL_FLAGS_TIE))
-                sci_tx_interrupt(irq, ptr);
+                ret = sci_tx_interrupt(irq, ptr);
        /* Rx Interrupt */
-        if ((ssr_status & 0x0002) && (scr_status & 0x0040))
+        if ((ssr_status & 0x0002) && (scr_status & SCI_CTRL_FLAGS_RIE))
-                sci_rx_interrupt(irq, ptr);
+                ret = sci_rx_interrupt(irq, ptr);
        /* Error Interrupt */
-        if ((ssr_status & 0x0080) && (scr_status & 0x0400))
+        if ((ssr_status & 0x0080) && (scr_status & SCI_CTRL_FLAGS_REIE))
-                sci_er_interrupt(irq, ptr);
+                ret = sci_er_interrupt(irq, ptr);
        /* Break Interrupt */
-        if ((ssr_status & 0x0010) && (scr_status & 0x0200))
+        if ((ssr_status & 0x0010) && (scr_status & SCI_CTRL_FLAGS_REIE))
-                sci_br_interrupt(irq, ptr);
+                ret = sci_br_interrupt(irq, ptr);
-        return IRQ_HANDLED;
+        return ret;
 }
 #if defined(CONFIG_CPU_FREQ) && defined(CONFIG_HAVE_CLK)
@@ -1054,10 +1042,8 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
        sci_out(port, SCSCR, 0x00);     /* TE=0, RE=0, CKE1=0 */
-#if !defined(SCI_ONLY)
        if (port->type == PORT_SCIF)
                sci_out(port, SCFCR, SCFCR_RFRST | SCFCR_TFRST);
-#endif
        smr_val = sci_in(port, SCSMR) & 3;
        if ((termios->c_cflag & CSIZE) == CS7)
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 7cd28b226800..6163a45f968f 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -16,7 +16,6 @@
 # define SCPCR  0xA4000116 /* 16 bit SCI and SCIF */
 # define SCPDR  0xA4000136 /* 8  bit SCI and SCIF */
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCI_AND_SCIF
 #elif defined(CONFIG_CPU_SUBTYPE_SH7705)
 # define SCIF0          0xA4400000
 # define SCIF2          0xA4410000
@@ -30,17 +29,15 @@
 * SCIF0 (0xA4400000) -> Internal clock, SCK pin as serial clock output
 */
 # define SCSCR_INIT(port) (port->mapbase == SCIF2) ? 0xF3 : 0xF0
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7720) || \
      defined(CONFIG_CPU_SUBTYPE_SH7721)
 # define SCSCR_INIT(port)  0x0030 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCIF_ONLY
 #define SCIF_ORER    0x0200   /* overrun error bit */
 #elif defined(CONFIG_SH_RTS7751R2D)
+# define SCSPTR1 0xFFE0001C /* 8 bit SCIF */
 # define SCSPTR2 0xFFE80020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define SCSCR_INIT(port) 0x3a /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7750)  || \
      defined(CONFIG_CPU_SUBTYPE_SH7750R) || \
      defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
@@ -53,28 +50,24 @@
 # define SCSCR_INIT(port) (((port)->type == PORT_SCI) ? \
        0x30 /* TIE=0,RIE=0,TE=1,RE=1 */ : \
        0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */ )
-# define SCI_AND_SCIF
 #elif defined(CONFIG_CPU_SUBTYPE_SH7760)
 # define SCSPTR0 0xfe600024 /* 16 bit SCIF */
 # define SCSPTR1 0xfe610024 /* 16 bit SCIF */
 # define SCSPTR2 0xfe620024 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)          0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
 # define SCSPTR0 0xA4400000       /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define PACR 0xa4050100
 # define PBCR 0xa4050102
 # define SCSCR_INIT(port)          0x3B
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7343)
 # define SCSPTR0 0xffe00010     /* 16 bit SCIF */
 # define SCSPTR1 0xffe10010     /* 16 bit SCIF */
 # define SCSPTR2 0xffe20010     /* 16 bit SCIF */
 # define SCSPTR3 0xffe30010     /* 16 bit SCIF */
 # define SCSCR_INIT(port) 0x32  /* TIE=0,RIE=0,TE=1,RE=1,REIE=0,CKE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7722)
 # define PADR                   0xA4050120
 # define PSDR                   0xA405013e
@@ -82,7 +75,6 @@
 # define PSCR                   0xA405011E
 # define SCIF_ORER              0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x0038  /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7366)
 # define SCPDR0                 0xA405013E      /* 16 bit SCIF0 PSDR */
 # define SCSPTR0                SCPDR0
@@ -97,12 +89,10 @@
 # define SCSPTR5                0xa4050128
 # define SCIF_ORER              0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x0038  /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
 # define SCSPTR2 0xffe80020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001   /* overrun error bit */
 # define SCSCR_INIT(port) 0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
 # define SCIF_BASE_ADDR    0x01030000
 # define SCIF_ADDR_SH5     PHYS_PERIPHERAL_BLOCK+SCIF_BASE_ADDR
@@ -111,14 +101,11 @@
 # define SCSPTR2           ((port->mapbase)+SCIF_PTR2_OFFS) /* 16 bit SCIF */
 # define SCLSR2            ((port->mapbase)+SCIF_LSR2_OFFS) /* 16 bit SCIF */
 # define SCSCR_INIT(port)  0x38         /* TIE=0,RIE=0, TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_H83007) || defined(CONFIG_H83068)
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCI_ONLY
 # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
 #elif defined(CONFIG_H8S2678)
 # define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define SCI_ONLY
 # define H8300_SCI_DR(ch) *(volatile char *)(P1DR + h8300_sci_pins[ch].port)
 #elif defined(CONFIG_CPU_SUBTYPE_SH7763)
 # define SCSPTR0 0xffe00024 /* 16 bit SCIF */
@@ -126,20 +113,17 @@
 # define SCSPTR2 0xffe10020 /* 16 bit SCIF/IRDA */
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x38    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7770)
 # define SCSPTR0 0xff923020 /* 16 bit SCIF */
 # define SCSPTR1 0xff924020 /* 16 bit SCIF */
 # define SCSPTR2 0xff925020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x3c /* TIE=0,RIE=0,TE=1,RE=1,REIE=1,cke=2 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7780)
 # define SCSPTR0        0xffe00024      /* 16 bit SCIF */
 # define SCSPTR1        0xffe10024      /* 16 bit SCIF */
 # define SCIF_ORER      0x0001          /* Overrun error bit */
 # define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7785)
 # define SCSPTR0        0xffea0024      /* 16 bit SCIF */
 # define SCSPTR1        0xffeb0024      /* 16 bit SCIF */
@@ -149,7 +133,6 @@
 # define SCSPTR5        0xffef0024      /* 16 bit SCIF */
 # define SCIF_OPER      0x0001          /* Overrun error bit */
 # define SCSCR_INIT(port)       0x3a    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7203) || \
      defined(CONFIG_CPU_SUBTYPE_SH7206) || \
      defined(CONFIG_CPU_SUBTYPE_SH7263)
@@ -158,14 +141,12 @@
 # define SCSPTR2 0xfffe9020 /* 16 bit SCIF */
 # define SCSPTR3 0xfffe9820 /* 16 bit SCIF */
 # define SCSCR_INIT(port)       0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SH7619)
 # define SCSPTR0 0xf8400020 /* 16 bit SCIF */
 # define SCSPTR1 0xf8410020 /* 16 bit SCIF */
 # define SCSPTR2 0xf8420020 /* 16 bit SCIF */
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port)       0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #elif defined(CONFIG_CPU_SUBTYPE_SHX3)
 # define SCSPTR0 0xffc30020             /* 16 bit SCIF */
 # define SCSPTR1 0xffc40020             /* 16 bit SCIF */
@@ -173,7 +154,6 @@
 # define SCSPTR3 0xffc60020             /* 16 bit SCIF */
 # define SCIF_ORER 0x0001               /* Overrun error bit */
 # define SCSCR_INIT(port)       0x38    /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-# define SCIF_ONLY
 #else
 # error CPU subtype not defined
 #endif
@@ -186,6 +166,7 @@
 #if defined(CONFIG_CPU_SUBTYPE_SH7750)  || \
    defined(CONFIG_CPU_SUBTYPE_SH7091)  || \
    defined(CONFIG_CPU_SUBTYPE_SH7750R) || \
+    defined(CONFIG_CPU_SUBTYPE_SH7722)  || \
    defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
    defined(CONFIG_CPU_SUBTYPE_SH7751)  || \
    defined(CONFIG_CPU_SUBTYPE_SH7751R) || \
@@ -244,55 +225,28 @@
 # define SCIF_TXROOM_MAX 16
 #endif
-#if defined(SCI_ONLY)
+#define SCxSR_TEND(port)        (((port)->type == PORT_SCI) ? SCI_TEND   : SCIF_TEND)
-# define SCxSR_TEND(port)               SCI_TEND
+#define SCxSR_ERRORS(port)      (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS)
-# define SCxSR_ERRORS(port)             SCI_ERRORS
+#define SCxSR_RDxF(port)        (((port)->type == PORT_SCI) ? SCI_RDRF   : SCIF_RDF)
-# define SCxSR_RDxF(port)               SCI_RDRF
+#define SCxSR_TDxE(port)        (((port)->type == PORT_SCI) ? SCI_TDRE   : SCIF_TDFE)
-# define SCxSR_TDxE(port)               SCI_TDRE
+#define SCxSR_FER(port)         (((port)->type == PORT_SCI) ? SCI_FER    : SCIF_FER)
-# define SCxSR_ORER(port)               SCI_ORER
+#define SCxSR_PER(port)         (((port)->type == PORT_SCI) ? SCI_PER    : SCIF_PER)
-# define SCxSR_FER(port)                SCI_FER
+#define SCxSR_BRK(port)         (((port)->type == PORT_SCI) ? 0x00       : SCIF_BRK)
-# define SCxSR_PER(port)                SCI_PER
-# define SCxSR_BRK(port)                0x00
-# define SCxSR_RDxF_CLEAR(port)         0xbc
-# define SCxSR_ERROR_CLEAR(port)        0xc4
-# define SCxSR_TDxE_CLEAR(port)         0x78
-# define SCxSR_BREAK_CLEAR(port)        0xc4
-#elif defined(SCIF_ONLY)
-# define SCxSR_TEND(port)               SCIF_TEND
-# define SCxSR_ERRORS(port)             SCIF_ERRORS
-# define SCxSR_RDxF(port)               SCIF_RDF
-# define SCxSR_TDxE(port)               SCIF_TDFE
 #if defined(CONFIG_CPU_SUBTYPE_SH7705)
-# define SCxSR_ORER(port)               SCIF_ORER
+# define SCxSR_ORER(port)       (((port)->type == PORT_SCI) ? SCI_ORER : SCIF_ORER)
 #else
-# define SCxSR_ORER(port)               0x0000
+# define SCxSR_ORER(port)       (((port)->type == PORT_SCI) ? SCI_ORER : 0x0000)
 #endif
-# define SCxSR_FER(port)                SCIF_FER
-# define SCxSR_PER(port)                SCIF_PER
-# define SCxSR_BRK(port)                SCIF_BRK
 #if defined(CONFIG_CPU_SUBTYPE_SH7705) || \
    defined(CONFIG_CPU_SUBTYPE_SH7720) || \
    defined(CONFIG_CPU_SUBTYPE_SH7721)
-# define SCxSR_RDxF_CLEAR(port)         (sci_in(port,SCxSR)&0xfffc)
+# define SCxSR_RDxF_CLEAR(port)  (sci_in(port, SCxSR) & 0xfffc)
-# define SCxSR_ERROR_CLEAR(port)        (sci_in(port,SCxSR)&0xfd73)
+# define SCxSR_ERROR_CLEAR(port) (sci_in(port, SCxSR) & 0xfd73)
-# define SCxSR_TDxE_CLEAR(port)         (sci_in(port,SCxSR)&0xffdf)
+# define SCxSR_TDxE_CLEAR(port)  (sci_in(port, SCxSR) & 0xffdf)
-# define SCxSR_BREAK_CLEAR(port)        (sci_in(port,SCxSR)&0xffe3)
+# define SCxSR_BREAK_CLEAR(port) (sci_in(port, SCxSR) & 0xffe3)
-#else
-/* SH7705 can also use this, clearing is same between 7705 and 7709 */
-# define SCxSR_RDxF_CLEAR(port)         0x00fc
-# define SCxSR_ERROR_CLEAR(port)        0x0073
-# define SCxSR_TDxE_CLEAR(port)         0x00df
-# define SCxSR_BREAK_CLEAR(port)        0x00e3
-#endif
 #else
-# define SCxSR_TEND(port)        (((port)->type == PORT_SCI) ? SCI_TEND   : SCIF_TEND)
-# define SCxSR_ERRORS(port)      (((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS)
-# define SCxSR_RDxF(port)        (((port)->type == PORT_SCI) ? SCI_RDRF   : SCIF_RDF)
-# define SCxSR_TDxE(port)        (((port)->type == PORT_SCI) ? SCI_TDRE   : SCIF_TDFE)
-# define SCxSR_ORER(port)        (((port)->type == PORT_SCI) ? SCI_ORER   : 0x0000)
-# define SCxSR_FER(port)         (((port)->type == PORT_SCI) ? SCI_FER    : SCIF_FER)
-# define SCxSR_PER(port)         (((port)->type == PORT_SCI) ? SCI_PER    : SCIF_PER)
-# define SCxSR_BRK(port)         (((port)->type == PORT_SCI) ? 0x00       : SCIF_BRK)
 # define SCxSR_RDxF_CLEAR(port)  (((port)->type == PORT_SCI) ? 0xbc : 0x00fc)
 # define SCxSR_ERROR_CLEAR(port) (((port)->type == PORT_SCI) ? 0xc4 : 0x0073)
 # define SCxSR_TDxE_CLEAR(port)  (((port)->type == PORT_SCI) ? 0x78 : 0x00df)
@@ -574,18 +528,20 @@ static inline int sci_rxd_in(struct uart_port *port)
      defined(CONFIG_CPU_SUBTYPE_SH7751R) || \
      defined(CONFIG_CPU_SUBTYPE_SH7750R) || \
      defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
-      defined(CONFIG_CPU_SUBTYPE_SH7091)  || \
+      defined(CONFIG_CPU_SUBTYPE_SH7091)
-      defined(CONFIG_CPU_SUBTYPE_SH4_202)
 static inline int sci_rxd_in(struct uart_port *port)
 {
-#ifndef SCIF_ONLY
        if (port->mapbase == 0xffe00000)
                return ctrl_inb(SCSPTR1)&0x01 ? 1 : 0; /* SCI */
-#endif
-#ifndef SCI_ONLY
        if (port->mapbase == 0xffe80000)
                return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
-#endif
+        return 1;
+}
+#elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
+static inline int sci_rxd_in(struct uart_port *port)
+{
+        if (port->mapbase == 0xffe80000)
+                return ctrl_inw(SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
        return 1;
 }
 #elif defined(CONFIG_CPU_SUBTYPE_SH7760)
@@ -651,7 +607,7 @@ static inline int sci_rxd_in(struct uart_port *port)
 #elif defined(CONFIG_CPU_SUBTYPE_SH5_101) || defined(CONFIG_CPU_SUBTYPE_SH5_103)
 static inline int sci_rxd_in(struct uart_port *port)
 {
-         return sci_in(port, SCSPTR)&0x0001 ? 1 : 0; /* SCIF */
+         return sci_in(port, SCSPTR2)&0x0001 ? 1 : 0; /* SCIF */
 }
 #elif defined(__H8300H__) || defined(__H8300S__)
 static inline int sci_rxd_in(struct uart_port *port)
diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c
index 0b33773bb4f6..cf8b01bcac8d 100644
--- a/drivers/staging/me4000/me4000.c
+++ b/drivers/staging/me4000/me4000.c
@@ -1633,9 +1633,6 @@ static int me4000_release(struct inode *inode_p, struct file *file_p)
                free_irq(ext_int_context->irq, ext_int_context);
-                /* Delete the fasync structure and free memory */
-                me4000_ext_int_fasync(0, file_p, 0);
                /* Mark as unused */
                ext_int_context->in_use = 0;
        } else {
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index 41b6530b8f25..a913efc69669 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -2328,7 +2328,6 @@ static int ixj_release(struct inode *inode, struct file *file_p)
        j->rec_codec = j->play_codec = 0;
        j->rec_frame_size = j->play_frame_size = 0;
        j->flags.cidsent = j->flags.cidring = 0;
-        ixj_fasync(-1, file_p, 0);      /* remove from list of async notification */
        if(j->cardtype == QTI_LINEJACK && !j->readers && !j->writers) {
                ixj_set_port(j, PORT_PSTN);
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index f9b4647255aa..2d2440cd57a9 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -367,9 +367,6 @@ static int uio_release(struct inode *inode, struct file *filep)
                ret = idev->info->release(idev->info, inode);
        module_put(idev->owner);
-        if (filep->f_flags & FASYNC)
-                ret = uio_fasync(-1, filep, 0);
        kfree(listener);
        return ret;
 }
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 543811f6e6e8..8e74657f106c 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -133,7 +133,7 @@ static int usbtmc_release(struct inode *inode, struct file *file)
 static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data)
 {
-        char *buffer;
+        u8 *buffer;
        struct device *dev;
        int rv;
        int n;
diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
index fc9018e72a09..e1b42626d04d 100644
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@@ -106,6 +106,9 @@ static DEFINE_SPINLOCK(hcd_root_hub_lock);
 /* used when updating an endpoint's URB list */
 static DEFINE_SPINLOCK(hcd_urb_list_lock);
+/* used to protect against unlinking URBs after the device is gone */
+static DEFINE_SPINLOCK(hcd_urb_unlink_lock);
 /* wait queue for synchronous unlinks */
 DECLARE_WAIT_QUEUE_HEAD(usb_kill_urb_queue);
@@ -1376,10 +1379,25 @@ static int unlink1(struct usb_hcd *hcd, struct urb *urb, int status)
 int usb_hcd_unlink_urb (struct urb *urb, int status)
 {
        struct usb_hcd          *hcd;
-        int                     retval;
+        int                     retval = -EIDRM;
+        unsigned long           flags;
-        hcd = bus_to_hcd(urb->dev->bus);
+        /* Prevent the device and bus from going away while
-        retval = unlink1(hcd, urb, status);
+         * the unlink is carried out.  If they are already gone
+         * then urb->use_count must be 0, since disconnected
+         * devices can't have any active URBs.
+         */
+        spin_lock_irqsave(&hcd_urb_unlink_lock, flags);
+        if (atomic_read(&urb->use_count) > 0) {
+                retval = 0;
+                usb_get_dev(urb->dev);
+        }
+        spin_unlock_irqrestore(&hcd_urb_unlink_lock, flags);
+        if (retval == 0) {
+                hcd = bus_to_hcd(urb->dev->bus);
+                retval = unlink1(hcd, urb, status);
+                usb_put_dev(urb->dev);
+        }
        if (retval == 0)
                retval = -EINPROGRESS;
@@ -1528,6 +1546,17 @@ void usb_hcd_disable_endpoint(struct usb_device *udev,
                hcd->driver->endpoint_disable(hcd, ep);
 }
+/* Protect against drivers that try to unlink URBs after the device
+ * is gone, by waiting until all unlinks for @udev are finished.
+ * Since we don't currently track URBs by device, simply wait until
+ * nothing is running in the locked region of usb_hcd_unlink_urb().
+ */
+void usb_hcd_synchronize_unlinks(struct usb_device *udev)
+{
+        spin_lock_irq(&hcd_urb_unlink_lock);
+        spin_unlock_irq(&hcd_urb_unlink_lock);
+}
 /*-------------------------------------------------------------------------*/
 /* called in any context */
diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
index 2dcde61c465e..9465e70f4dd0 100644
--- a/drivers/usb/core/hcd.h
+++ b/drivers/usb/core/hcd.h
@@ -232,6 +232,7 @@ extern void usb_hcd_flush_endpoint(struct usb_device *udev,
                struct usb_host_endpoint *ep);
 extern void usb_hcd_disable_endpoint(struct usb_device *udev,
                struct usb_host_endpoint *ep);
+extern void usb_hcd_synchronize_unlinks(struct usb_device *udev);
 extern int usb_hcd_get_frame_number(struct usb_device *udev);
 extern struct usb_hcd *usb_create_hcd(const struct hc_driver *driver,
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 9b3f16bd12cb..b19cbfcd51da 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -659,6 +659,9 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
                        PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func2);
                        schedule_delayed_work(&hub->init_work,
                                        msecs_to_jiffies(delay));
+                        /* Suppress autosuspend until init is done */
+                        to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
                        return;         /* Continues at init2: below */
                } else {
                        hub_power_on(hub, true);
@@ -1429,6 +1432,7 @@ void usb_disconnect(struct usb_device **pdev)
         */
        dev_dbg (&udev->dev, "unregistering device\n");
        usb_disable_device(udev, 0);
+        usb_hcd_synchronize_unlinks(udev);
        usb_unlock_device(udev);
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c
index f2638009a464..4342bd9c3bb6 100644
--- a/drivers/usb/core/urb.c
+++ b/drivers/usb/core/urb.c
@@ -474,6 +474,12 @@ EXPORT_SYMBOL_GPL(usb_submit_urb);
 * indicating that the request has been canceled (rather than any other
 * code).
 *
+ * Drivers should not call this routine or related routines, such as
+ * usb_kill_urb() or usb_unlink_anchored_urbs(), after their disconnect
+ * method has returned.  The disconnect function should synchronize with
+ * a driver's I/O routines to insure that all URB-related activity has
+ * completed before it returns.
+ *
 * This request is always asynchronous.  Success is indicated by
 * returning -EINPROGRESS, at which time the URB will probably not yet
 * have been given back to the device driver.  When it is eventually
@@ -550,6 +556,9 @@ EXPORT_SYMBOL_GPL(usb_unlink_urb);
 * This routine may not be used in an interrupt context (such as a bottom
 * half or a completion handler), or when holding a spinlock, or in other
 * situations where the caller can't schedule().
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
 */
 void usb_kill_urb(struct urb *urb)
 {
@@ -588,6 +597,9 @@ EXPORT_SYMBOL_GPL(usb_kill_urb);
 * This routine may not be used in an interrupt context (such as a bottom
 * half or a completion handler), or when holding a spinlock, or in other
 * situations where the caller can't schedule().
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
 */
 void usb_poison_urb(struct urb *urb)
 {
@@ -622,6 +634,9 @@ EXPORT_SYMBOL_GPL(usb_unpoison_urb);
 *
 * this allows all outstanding URBs to be killed starting
 * from the back of the queue
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
 */
 void usb_kill_anchored_urbs(struct usb_anchor *anchor)
 {
@@ -651,6 +666,9 @@ EXPORT_SYMBOL_GPL(usb_kill_anchored_urbs);
 * this allows all outstanding URBs to be poisoned starting
 * from the back of the queue. Newly added URBs will also be
 * poisoned
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
 */
 void usb_poison_anchored_urbs(struct usb_anchor *anchor)
 {
@@ -672,6 +690,7 @@ void usb_poison_anchored_urbs(struct usb_anchor *anchor)
        spin_unlock_irq(&anchor->lock);
 }
 EXPORT_SYMBOL_GPL(usb_poison_anchored_urbs);
 /**
 * usb_unlink_anchored_urbs - asynchronously cancel transfer requests en masse
 * @anchor: anchor the requests are bound to
@@ -680,6 +699,9 @@ EXPORT_SYMBOL_GPL(usb_poison_anchored_urbs);
 * from the back of the queue. This function is asynchronous.
 * The unlinking is just tiggered. It may happen after this
 * function has returned.
+ *
+ * This routine should not be called by a driver after its disconnect
+ * method has returned.
 */
 void usb_unlink_anchored_urbs(struct usb_anchor *anchor)
 {
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index f4585d3e90d7..eeb26c0f88e5 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1251,7 +1251,6 @@ dev_release (struct inode *inode, struct file *fd)
         * alternatively, all host requests will time out.
         */
-        fasync_helper (-1, fd, 0, &dev->fasync);
        kfree (dev->buf);
        dev->buf = NULL;
        put_dev (dev);
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 8be3f39891c7..794b5ffe4397 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -281,6 +281,7 @@ static void serial_close(struct tty_struct *tty, struct file *filp)
                        if (tty->driver_data)
                                tty->driver_data = NULL;
                        tty_port_tty_set(&port->port, NULL);
+                        tty_kref_put(tty);
                }
        }
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index a2b9ebbef38e..fb9e20e624c1 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -333,6 +333,13 @@ UNUSUAL_DEV(  0x0482, 0x0103, 0x0100, 0x0100,
                "Finecam S5",
                US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
+/* Patch submitted by Jens Taprogge <jens.taprogge@taprogge.org> */
+UNUSUAL_DEV(  0x0482, 0x0107, 0x0100, 0x0100,
+                "Kyocera",
+                "CONTAX SL300R T*",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE),
 /* Reported by Paul Stewart <stewart@wetlogic.net>
 * This entry is needed because the device reports Sub=ff */
 UNUSUAL_DEV(  0x04a4, 0x0004, 0x0001, 0x0001,
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
index 2afd47eefe74..f8a4bb20f41a 100644
--- a/drivers/video/backlight/corgi_lcd.c
+++ b/drivers/video/backlight/corgi_lcd.c
@@ -439,7 +439,7 @@ static int corgi_bl_update_status(struct backlight_device *bd)
        return corgi_bl_set_intensity(lcd, intensity);
 }
-void corgibl_limit_intensity(int limit)
+void corgi_lcd_limit_intensity(int limit)
 {
        if (limit)
                corgibl_flags |= CORGIBL_BATTLOW;
@@ -448,7 +448,7 @@ void corgibl_limit_intensity(int limit)
        backlight_update_status(the_corgi_lcd->bl_dev);
 }
-EXPORT_SYMBOL(corgibl_limit_intensity);
+EXPORT_SYMBOL(corgi_lcd_limit_intensity);
 static struct backlight_ops corgi_bl_ops = {
        .get_brightness = corgi_bl_get_intensity,
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 048b139f0e50..8a8760230bc7 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2049,7 +2049,7 @@ static void cirrusfb_pci_unmap(struct fb_info *info)
 #endif /* CONFIG_PCI */
 #ifdef CONFIG_ZORRO
-static void __devexit cirrusfb_zorro_unmap(struct fb_info *info)
+static void cirrusfb_zorro_unmap(struct fb_info *info)
 {
        struct cirrusfb_info *cinfo = info->par;
        struct zorro_dev *zdev = to_zorro_dev(info->device);
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 64b3d30027b8..b92947d62ad6 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2118,7 +2118,7 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
                   height, width);
 }
-static __inline__ void updatescrollmode(struct display *p,
+static void updatescrollmode(struct display *p,
                                        struct fb_info *info,
                                        struct vc_data *vc)
 {
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index cd5f20da738a..6048b55f2878 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1262,8 +1262,8 @@ fb_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
        case FBIOPUT_CON2FBMAP:
                arg = (unsigned long) compat_ptr(arg);
        case FBIOBLANK:
-                ret = fb_ioctl(file, cmd, arg);
+                mutex_unlock(&info->lock);
-                break;
+                return fb_ioctl(file, cmd, arg);
        case FBIOGET_FSCREENINFO:
                ret = fb_get_fscreeninfo(inode, file, cmd, arg);
diff --git a/drivers/video/via/global.h b/drivers/video/via/global.h
index 8e5263c5b812..7543d5f7e309 100644
--- a/drivers/video/via/global.h
+++ b/drivers/video/via/global.h
@@ -38,7 +38,6 @@
 #include "iface.h"
 #include "viafbdev.h"
 #include "chip.h"
-#include "debug.h"
 #include "accel.h"
 #include "share.h"
 #include "dvi.h"
@@ -48,12 +47,10 @@
 #include "lcd.h"
 #include "ioctl.h"
-#include "viamode.h"
 #include "via_utility.h"
 #include "vt1636.h"
 #include "tblDPASetting.h"
 #include "tbl1636.h"
-#include "viafbdev.h"
 /* External struct*/
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c
index 6e46a551395c..3e57aa4d643a 100644
--- a/drivers/watchdog/acquirewdt.c
+++ b/drivers/watchdog/acquirewdt.c
@@ -3,8 +3,8 @@
 *
 *      Based on wdt.c. Original copyright messages:
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
@@ -15,7 +15,7 @@
 *      warranty for any of this software. This material is provided
 *      "AS-IS" and at no charge.
 *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
 *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/advantechwdt.c b/drivers/watchdog/advantechwdt.c
index a5110f93a755..a1d7856ea6e0 100644
--- a/drivers/watchdog/advantechwdt.c
+++ b/drivers/watchdog/advantechwdt.c
@@ -6,8 +6,8 @@
 *      Based on acquirewdt.c which is based on wdt.c.
 *      Original copyright messages:
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
 *      warranty for any of this software. This material is provided
 *      "AS-IS" and at no charge.
 *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
 *          Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/bfin_wdt.c b/drivers/watchdog/bfin_wdt.c
index 31b42253054e..067a57cb3f82 100644
--- a/drivers/watchdog/bfin_wdt.c
+++ b/drivers/watchdog/bfin_wdt.c
@@ -5,7 +5,7 @@
 * Originally based on softdog.c
 * Copyright 2006-2007 Analog Devices Inc.
 * Copyright 2006-2007 Michele d'Amico
- * Copyright 1996 Alan Cox <alan@redhat.com>
+ * Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 * Enter bugs at http://blackfin.uclinux.org/
 *
diff --git a/drivers/watchdog/eurotechwdt.c b/drivers/watchdog/eurotechwdt.c
index bbd14e34319f..a171fc6ae1cb 100644
--- a/drivers/watchdog/eurotechwdt.c
+++ b/drivers/watchdog/eurotechwdt.c
@@ -8,8 +8,8 @@
 *      Based on wdt.c.
 *      Original copyright messages:
 *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index c13383f7fcb9..74f951c18b90 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -394,8 +394,7 @@ static unsigned char __init esb_getdevice(void)
                        goto err_disable;
                }
-                BASEADDR = ioremap(pci_resource_start(esb_pci, 0),
+                BASEADDR = pci_ioremap_bar(esb_pci, 0);
-                                   pci_resource_len(esb_pci, 0));
                if (BASEADDR == NULL) {
                        /* Something's wrong here, BASEADDR has to be set */
                        printk(KERN_ERR PFX "failed to get BASEADDR\n");
diff --git a/drivers/watchdog/ib700wdt.c b/drivers/watchdog/ib700wdt.c
index 8782ec1f5aa0..317ef2b16cff 100644
--- a/drivers/watchdog/ib700wdt.c
+++ b/drivers/watchdog/ib700wdt.c
@@ -11,8 +11,8 @@
 *      Based on acquirewdt.c which is based on wdt.c.
 *      Original copyright messages:
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
 *      warranty for any of this software. This material is provided
 *      "AS-IS" and at no charge.
 *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
 *           Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/indydog.c b/drivers/watchdog/indydog.c
index 73c9e7992feb..0f761db9a27c 100644
--- a/drivers/watchdog/indydog.c
+++ b/drivers/watchdog/indydog.c
@@ -9,7 +9,7 @@
 *      as published by the Free Software Foundation; either version
 *      2 of the License, or (at your option) any later version.
 *
- *      based on softdog.c by Alan Cox <alan@redhat.com>
+ *      based on softdog.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
 */
 #include <linux/module.h>
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c
index 2a9bfa81f9d6..1130ad697ce2 100644
--- a/drivers/watchdog/mpcore_wdt.c
+++ b/drivers/watchdog/mpcore_wdt.c
@@ -4,8 +4,8 @@
 *      (c) Copyright 2004 ARM Limited
 *
 *      Based on the SoftDog driver:
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 7bcbb7f4745f..2f2ce7429f5b 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -16,7 +16,7 @@
 * 20030527: George G. Davis <gdavis@mvista.com>
 *      Initially based on linux-2.4.19-rmk7-pxa1/drivers/char/sa1100_wdt.c
 *      (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
- *      Based on SoftDog driver by Alan Cox <alan@redhat.com>
+ *      Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 * Copyright (c) 2004 Texas Instruments.
 *      1. Modified to support OMAP1610 32-KHz watchdog timer
diff --git a/drivers/watchdog/pcwd_pci.c b/drivers/watchdog/pcwd_pci.c
index 90eb1d4271d7..5d76422c402c 100644
--- a/drivers/watchdog/pcwd_pci.c
+++ b/drivers/watchdog/pcwd_pci.c
@@ -6,7 +6,7 @@
 *      Based on source code of the following authors:
 *        Ken Hollis <kenji@bitgate.com>,
 *        Lindsay Harris <lindsay@bluegum.com>,
- *        Alan Cox <alan@redhat.com>,
+ *        Alan Cox <alan@lxorguk.ukuu.org.uk>,
 *        Matt Domsch <Matt_Domsch@dell.com>,
 *        Rob Radez <rob@osinvestor.com>
 *
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c
index c1685c942de6..afb089695da8 100644
--- a/drivers/watchdog/pcwd_usb.c
+++ b/drivers/watchdog/pcwd_usb.c
@@ -5,7 +5,7 @@
 *
 *      Based on source code of the following authors:
 *        Ken Hollis <kenji@bitgate.com>,
- *        Alan Cox <alan@redhat.com>,
+ *        Alan Cox <alan@lxorguk.ukuu.org.uk>,
 *        Matt Domsch <Matt_Domsch@dell.com>,
 *        Rob Radez <rob@osinvestor.com>,
 *        Greg Kroah-Hartman <greg@kroah.com>
diff --git a/drivers/watchdog/rc32434_wdt.c b/drivers/watchdog/rc32434_wdt.c
index c9c73b69c5e5..57027f4653ce 100644
--- a/drivers/watchdog/rc32434_wdt.c
+++ b/drivers/watchdog/rc32434_wdt.c
@@ -7,7 +7,8 @@
 *  based on
 *  SoftDog 0.05:       A Software Watchdog Device
 *
- *  (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *  (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                      All Rights Reserved.
 *
 *  This program is free software; you can redistribute it and/or
 *  modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 13a4b178b8cc..e31925ee8346 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -6,7 +6,7 @@
 * S3C2410 Watchdog Timer Support
 *
 * Based on, softdog.c by Alan Cox,
- *     (c) Copyright 1996 Alan Cox <alan@redhat.com>
+ *     (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 * 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/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c
index 31a48437dc3d..ed01e4c2beff 100644
--- a/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@ -2,7 +2,7 @@
 *      Watchdog driver for the SA11x0/PXA2xx
 *
 *      (c) Copyright 2000 Oleg Drokin <green@crimea.edu>
- *          Based on SoftDog driver by Alan Cox <alan@redhat.com>
+ *          Based on SoftDog driver by Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/sb_wdog.c b/drivers/watchdog/sb_wdog.c
index 27e526a07c9a..38f5831c9291 100644
--- a/drivers/watchdog/sb_wdog.c
+++ b/drivers/watchdog/sb_wdog.c
@@ -35,8 +35,8 @@
 * Based on various other watchdog drivers, which are probably all
 * loosely based on something Alan Cox wrote years ago.
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c
index fd83dd052d8c..ae74f6bcfa23 100644
--- a/drivers/watchdog/sbc8360.c
+++ b/drivers/watchdog/sbc8360.c
@@ -16,8 +16,8 @@
 *      Based on acquirewdt.c which is based on wdt.c.
 *      Original copyright messages:
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
@@ -28,7 +28,7 @@
 *      warranty for any of this software. This material is provided
 *      "AS-IS" and at no charge.
 *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
 *
 *      14-Dec-2001 Matt Domsch <Matt_Domsch@dell.com>
 *           Added nowayout module option to override CONFIG_WATCHDOG_NOWAYOUT
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index e5e470ca7759..06553debc7bc 100644
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -10,7 +10,7 @@
 *      as published by the Free Software Foundation; either version
 *      2 of the License, or (at your option) any later version.
 *
- *      based on softdog.c by Alan Cox <alan@redhat.com>
+ *      based on softdog.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
 */
 #include <linux/module.h>
diff --git a/drivers/watchdog/smsc37b787_wdt.c b/drivers/watchdog/smsc37b787_wdt.c
index 988ff1d5b4be..2e56cad77d19 100644
--- a/drivers/watchdog/smsc37b787_wdt.c
+++ b/drivers/watchdog/smsc37b787_wdt.c
@@ -1,7 +1,7 @@
 /*
 *      SMsC 37B787 Watchdog Timer driver for Linux 2.6.x.x
 *
- *      Based on acquirewdt.c by Alan Cox <alan@redhat.com>
+ *      Based on acquirewdt.c by Alan Cox <alan@lxorguk.ukuu.org.uk>
 *       and some other existing drivers
 *
 *      This program is free software; you can redistribute it and/or
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index c650464c5c63..7204f9662114 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -1,8 +1,7 @@
 /*
 *      SoftDog 0.07:   A Software Watchdog Device
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>, All Rights Reserved.
- *                              http://www.redhat.com
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index 69396adaa5c3..916890abffdd 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -11,8 +11,8 @@
 *
 *      (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
@@ -23,7 +23,7 @@
 *      warranty for any of this software. This material is provided
 *      "AS-IS" and at no charge.
 *
- *      (c) Copyright 1995    Alan Cox <alan@redhat.com>
+ *      (c) Copyright 1995    Alan Cox <alan@lxorguk.ukuu.org.uk>
 */
 #include <linux/module.h>
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index 445d30a01ed3..3c7aa412b1f3 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -12,8 +12,8 @@
 *
 *      (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wafer5823wdt.c b/drivers/watchdog/wafer5823wdt.c
index 68377ae171ff..42e940c23891 100644
--- a/drivers/watchdog/wafer5823wdt.c
+++ b/drivers/watchdog/wafer5823wdt.c
@@ -10,8 +10,8 @@
 *      Based on advantechwdt.c which is based on wdt.c.
 *      Original copyright messages:
 *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt.c b/drivers/watchdog/wdt.c
index deeebb2b13ea..eddb9187e7b6 100644
--- a/drivers/watchdog/wdt.c
+++ b/drivers/watchdog/wdt.c
@@ -1,8 +1,8 @@
 /*
 *      Industrial Computer Source WDT500/501 driver
 *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt285.c b/drivers/watchdog/wdt285.c
index 191ea6302107..f55135662d78 100644
--- a/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@ -6,7 +6,8 @@
 *
 *      SoftDog 0.05:   A Software Watchdog Device
 *
- *      (c) Copyright 1996 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996 Alan Cox <alan@lxorguk.ukuu.org.uk>,
+ *                                              All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License
diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index ed02bdb38c09..c45839a4a34d 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -1,8 +1,8 @@
 /*
 *      Industrial Computer Source PCI-WDT500/501 driver
 *
- *      (c) Copyright 1996-1997 Alan Cox <alan@redhat.com>, All Rights Reserved.
+ *      (c) Copyright 1996-1997 Alan Cox <alan@lxorguk.ukuu.org.uk>,
- *                              http://www.redhat.com
+ *                                               All Rights Reserved.
 *
 *      This program is free software; you can redistribute it and/or
 *      modify it under the terms of the GNU General Public License