203 files changed, 2731 insertions, 1148 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 26a3a4016115..161db4acfb91 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -37,6 +37,7 @@
 #include <linux/acpi.h>
 #include <linux/dmi.h>
 #include <linux/moduleparam.h>
+#include <linux/sched.h>        /* need_resched() */
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index aee50b453265..930427fc0c4b 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -158,7 +158,15 @@ int acpi_suspend(u32 acpi_state)
        return -EINVAL;
 }
+static int acpi_pm_state_valid(suspend_state_t pm_state)
+{
+        u32 acpi_state = acpi_suspend_states[pm_state];
+        return sleep_states[acpi_state];
+}
 static struct pm_ops acpi_pm_ops = {
+        .valid = acpi_pm_state_valid,
        .prepare = acpi_pm_prepare,
        .enter = acpi_pm_enter,
        .finish = acpi_pm_finish,
diff --git a/drivers/base/class.c b/drivers/base/class.c
index c3e569730afe..db65fd0babe9 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -17,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/kdev_t.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 #include "base.h"
 #define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 081c927b1ed8..a95844790f7b 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -16,6 +16,8 @@ struct sysdev_class cpu_sysdev_class = {
 };
 EXPORT_SYMBOL(cpu_sysdev_class);
+static struct sys_device *cpu_sys_devices[NR_CPUS];
 #ifdef CONFIG_HOTPLUG_CPU
 int __attribute__((weak)) smp_prepare_cpu (int cpu)
 {
@@ -64,6 +66,7 @@ static void __devinit register_cpu_control(struct cpu *cpu)
 }
 void unregister_cpu(struct cpu *cpu, struct node *root)
 {
+        int logical_cpu = cpu->sysdev.id;
        if (root)
                sysfs_remove_link(&root->sysdev.kobj,
@@ -71,7 +74,7 @@ void unregister_cpu(struct cpu *cpu, struct node *root)
        sysdev_remove_file(&cpu->sysdev, &attr_online);
        sysdev_unregister(&cpu->sysdev);
+        cpu_sys_devices[logical_cpu] = NULL;
        return;
 }
 #else /* ... !CONFIG_HOTPLUG_CPU */
@@ -103,10 +106,19 @@ int __devinit register_cpu(struct cpu *cpu, int num, struct node *root)
                                          kobject_name(&cpu->sysdev.kobj));
        if (!error && !cpu->no_control)
                register_cpu_control(cpu);
+        if (!error)
+                cpu_sys_devices[num] = &cpu->sysdev;
        return error;
 }
+struct sys_device *get_cpu_sysdev(int cpu)
+{
+        if (cpu < NR_CPUS)
+                return cpu_sys_devices[cpu];
+        else
+                return NULL;
+}
+EXPORT_SYMBOL_GPL(get_cpu_sysdev);
 int __init cpu_dev_init(void)
 {
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index 4acb2c5733c3..98f6c02d6790 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -62,14 +62,16 @@ firmware_timeout_show(struct class *class, char *buf)
 }
 /**
- * firmware_timeout_store:
+ * firmware_timeout_store - set number of seconds to wait for firmware
- * Description:
+ * @class: device class pointer
+ * @buf: buffer to scan for timeout value
+ * @count: number of bytes in @buf
+ *
 *      Sets the number of seconds to wait for the firmware.  Once
- *      this expires an error will be return to the driver and no
+ *      this expires an error will be returned to the driver and no
 *      firmware will be provided.
 *
- *      Note: zero means 'wait for ever'
+ *      Note: zero means 'wait forever'.
- *
 **/
 static ssize_t
 firmware_timeout_store(struct class *class, const char *buf, size_t count)
@@ -123,12 +125,15 @@ firmware_loading_show(struct class_device *class_dev, char *buf)
 }
 /**
- * firmware_loading_store: - loading control file
+ * firmware_loading_store - set value in the 'loading' control file
- * Description:
+ * @class_dev: class_device pointer
+ * @buf: buffer to scan for loading control value
+ * @count: number of bytes in @buf
+ *
 *      The relevant values are:
 *
 *       1: Start a load, discarding any previous partial load.
- *       0: Conclude the load and handle the data to the driver code.
+ *       0: Conclude the load and hand the data to the driver code.
 *      -1: Conclude the load with an error and discard any written data.
 **/
 static ssize_t
@@ -201,6 +206,7 @@ out:
        up(&fw_lock);
        return ret_count;
 }
 static int
 fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
 {
@@ -227,11 +233,13 @@ fw_realloc_buffer(struct firmware_priv *fw_priv, int min_size)
 }
 /**
- * firmware_data_write:
+ * firmware_data_write - write method for firmware
+ * @kobj: kobject for the class_device
+ * @buffer: buffer being written
+ * @offset: buffer offset for write in total data store area
+ * @count: buffer size
 *
- * Description:
+ *      Data written to the 'data' attribute will be later handed to
- *
- *      Data written to the 'data' attribute will be later handled to
 *      the driver as a firmware image.
 **/
 static ssize_t
@@ -264,6 +272,7 @@ out:
        up(&fw_lock);
        return retval;
 }
 static struct bin_attribute firmware_attr_data_tmpl = {
        .attr = {.name = "data", .mode = 0644, .owner = THIS_MODULE},
        .size = 0,
@@ -448,13 +457,16 @@ out:
 /**
 * request_firmware: - request firmware to hotplug and wait for it
- * Description:
+ * @firmware_p: pointer to firmware image
- *      @firmware will be used to return a firmware image by the name
+ * @name: name of firmware file
+ * @device: device for which firmware is being loaded
+ *
+ *      @firmware_p will be used to return a firmware image by the name
 *      of @name for device @device.
 *
 *      Should be called from user context where sleeping is allowed.
 *
- *      @name will be use as $FIRMWARE in the hotplug environment and
+ *      @name will be used as $FIRMWARE in the hotplug environment and
 *      should be distinctive enough not to be confused with any other
 *      firmware image for this or any other device.
 **/
@@ -468,6 +480,7 @@ request_firmware(const struct firmware **firmware_p, const char *name,
 /**
 * release_firmware: - release the resource associated with a firmware image
+ * @fw: firmware resource to release
 **/
 void
 release_firmware(const struct firmware *fw)
@@ -480,8 +493,10 @@ release_firmware(const struct firmware *fw)
 /**
 * register_firmware: - provide a firmware image for later usage
+ * @name: name of firmware image file
+ * @data: buffer pointer for the firmware image
+ * @size: size of the data buffer area
 *
- * Description:
 *      Make sure that @data will be available by requesting firmware @name.
 *
 *      Note: This will not be possible until some kind of persistence
@@ -526,21 +541,19 @@ request_firmware_work_func(void *arg)
 }
 /**
- * request_firmware_nowait:
+ * request_firmware_nowait: asynchronous version of request_firmware
+ * @module: module requesting the firmware
+ * @hotplug: invokes hotplug event to copy the firmware image if this flag
+ *      is non-zero else the firmware copy must be done manually.
+ * @name: name of firmware file
+ * @device: device for which firmware is being loaded
+ * @context: will be passed over to @cont, and
+ *      @fw may be %NULL if firmware request fails.
+ * @cont: function will be called asynchronously when the firmware
+ *      request is over.
 *
- * Description:
 *      Asynchronous variant of request_firmware() for contexts where
 *      it is not possible to sleep.
- *
- *      @hotplug invokes hotplug event to copy the firmware image if this flag
- *      is non-zero else the firmware copy must be done manually.
- *
- *      @cont will be called asynchronously when the firmware request is over.
- *
- *      @context will be passed over to @cont.
- *
- *      @fw may be %NULL if firmware request fails.
- *
 **/
 int
 request_firmware_nowait(
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 75ce8711bca5..08d9cc99c7de 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -16,6 +16,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/bootmem.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 #include "base.h"
diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 3431eb6004c3..66ed8f2fece5 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -21,6 +21,7 @@
 #include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/pm.h>
+#include <asm/semaphore.h>
 extern struct subsystem devices_subsys;
diff --git a/drivers/block/Kconfig.iosched b/drivers/block/Kconfig.iosched
index 6070a480600b..5b90d2fa63b8 100644
--- a/drivers/block/Kconfig.iosched
+++ b/drivers/block/Kconfig.iosched
@@ -38,4 +38,32 @@ config IOSCHED_CFQ
          among all processes in the system. It should provide a fair
          working environment, suitable for desktop systems.
+choice
+        prompt "Default I/O scheduler"
+        default DEFAULT_AS
+        help
+          Select the I/O scheduler which will be used by default for all
+          block devices.
+        config DEFAULT_AS
+                bool "Anticipatory" if IOSCHED_AS
+        config DEFAULT_DEADLINE
+                bool "Deadline" if IOSCHED_DEADLINE
+        config DEFAULT_CFQ
+                bool "CFQ" if IOSCHED_CFQ
+        config DEFAULT_NOOP
+                bool "No-op"
+endchoice
+config DEFAULT_IOSCHED
+        string
+        default "anticipatory" if DEFAULT_AS
+        default "deadline" if DEFAULT_DEADLINE
+        default "cfq" if DEFAULT_CFQ
+        default "noop" if DEFAULT_NOOP
 endmenu
diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c
index 564172234819..c6744ff38294 100644
--- a/drivers/block/as-iosched.c
+++ b/drivers/block/as-iosched.c
@@ -1973,8 +1973,8 @@ static int __init as_init(void)
 static void __exit as_exit(void)
 {
-        kmem_cache_destroy(arq_pool);
        elv_unregister(&iosched_as);
+        kmem_cache_destroy(arq_pool);
 }
 module_init(as_init);
diff --git a/drivers/block/cciss_scsi.c b/drivers/block/cciss_scsi.c
index e183a3ef7839..ec27976a57da 100644
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
@@ -28,13 +28,17 @@
   through the array controller.  Note in particular, neither 
   physical nor logical disks are presented through the scsi layer. */
+#include <linux/timer.h>
+#include <linux/completion.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <asm/atomic.h>
 #include <scsi/scsi.h> 
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h> 
-#include <asm/atomic.h>
-#include <linux/timer.h>
-#include <linux/completion.h>
 #include "cciss_scsi.h"
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c
index 94690e4d41e0..5281f8e70510 100644
--- a/drivers/block/cfq-iosched.c
+++ b/drivers/block/cfq-iosched.c
@@ -2418,28 +2418,8 @@ static int __init cfq_init(void)
 static void __exit cfq_exit(void)
 {
-        struct task_struct *g, *p;
-        unsigned long flags;
-        read_lock_irqsave(&tasklist_lock, flags);
-        /*
-         * iterate each process in the system, removing our io_context
-         */
-        do_each_thread(g, p) {
-                struct io_context *ioc = p->io_context;
-                if (ioc && ioc->cic) {
-                        ioc->cic->exit(ioc->cic);
-                        cfq_free_io_context(ioc->cic);
-                        ioc->cic = NULL;
-                }
-        } while_each_thread(g, p);
-        read_unlock_irqrestore(&tasklist_lock, flags);
-        cfq_slab_kill();
        elv_unregister(&iosched_cfq);
+        cfq_slab_kill();
 }
 module_init(cfq_init);
diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
index 55621d5c5774..36f1057084b0 100644
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -147,24 +147,17 @@ static void elevator_setup_default(void)
        struct elevator_type *e;
        /*
-         * check if default is set and exists
+         * If default has not been set, use the compiled-in selection.
         */
-        if (chosen_elevator[0] && (e = elevator_get(chosen_elevator))) {
+        if (!chosen_elevator[0])
-                elevator_put(e);
+                strcpy(chosen_elevator, CONFIG_DEFAULT_IOSCHED);
-                return;
-        }
-#if defined(CONFIG_IOSCHED_AS)
+        /*
-        strcpy(chosen_elevator, "anticipatory");
+         * If the given scheduler is not available, fall back to no-op.
-#elif defined(CONFIG_IOSCHED_DEADLINE)
+         */
-        strcpy(chosen_elevator, "deadline");
+        if (!(e = elevator_find(chosen_elevator)))
-#elif defined(CONFIG_IOSCHED_CFQ)
+                strcpy(chosen_elevator, "noop");
-        strcpy(chosen_elevator, "cfq");
+        elevator_put(e);
-#elif defined(CONFIG_IOSCHED_NOOP)
-        strcpy(chosen_elevator, "noop");
-#else
-#error "You must build at least 1 IO scheduler into the kernel"
-#endif
 }
 static int __init elevator_setup(char *str)
@@ -642,6 +635,27 @@ EXPORT_SYMBOL_GPL(elv_register);
 void elv_unregister(struct elevator_type *e)
 {
+        struct task_struct *g, *p;
+        /*
+         * Iterate every thread in the process to remove the io contexts.
+         */
+        read_lock(&tasklist_lock);
+        do_each_thread(g, p) {
+                struct io_context *ioc = p->io_context;
+                if (ioc && ioc->cic) {
+                        ioc->cic->exit(ioc->cic);
+                        ioc->cic->dtor(ioc->cic);
+                        ioc->cic = NULL;
+                }
+                if (ioc && ioc->aic) {
+                        ioc->aic->exit(ioc->aic);
+                        ioc->aic->dtor(ioc->aic);
+                        ioc->aic = NULL;
+                }
+        } while_each_thread(g, p);
+        read_unlock(&tasklist_lock);
        spin_lock_irq(&elv_list_lock);
        list_del_init(&e->list);
        spin_unlock_irq(&elv_list_lock);
@@ -739,8 +753,10 @@ ssize_t elv_iosched_store(request_queue_t *q, const char *name, size_t count)
                return -EINVAL;
        }
-        if (!strcmp(elevator_name, q->elevator->elevator_type->elevator_name))
+        if (!strcmp(elevator_name, q->elevator->elevator_type->elevator_name)) {
+                elevator_put(e);
                return count;
+        }
        elevator_switch(q, e);
        return count;
diff --git a/drivers/block/paride/paride.c b/drivers/block/paride/paride.c
index 1fef136c0e41..ce94aa11f6a7 100644
--- a/drivers/block/paride/paride.c
+++ b/drivers/block/paride/paride.c
@@ -29,6 +29,7 @@
 #include <linux/string.h>
 #include <linux/spinlock.h>
 #include <linux/wait.h>
+#include <linux/sched.h>        /* TASK_* */
 #ifdef CONFIG_PARPORT_MODULE
 #define CONFIG_PARPORT
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 94af920465b5..e9746af29b9f 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -807,10 +807,6 @@ static int pf_next_buf(void)
                return 1;
        spin_lock_irqsave(&pf_spin_lock, saved_flags);
        pf_end_request(1);
-        if (pf_req) {
-                pf_count = pf_req->current_nr_sectors;
-                pf_buf = pf_req->buffer;
-        }
        spin_unlock_irqrestore(&pf_spin_lock, saved_flags);
        return 1;
 }
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 82f2d6d2eeef..6f5df0fad703 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -162,6 +162,8 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_SLV, D_DLY};
 #include <linux/mtio.h>
 #include <linux/pg.h>
 #include <linux/device.h>
+#include <linux/sched.h>        /* current, TASK_* */
+#include <linux/jiffies.h>
 #include <asm/uaccess.h>
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index 686c95573452..715ae5dc88fb 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -146,6 +146,7 @@ static int (*drives[4])[6] = {&drive0, &drive1, &drive2, &drive3};
 #include <linux/slab.h>
 #include <linux/mtio.h>
 #include <linux/device.h>
+#include <linux/sched.h>        /* current, TASK_*, schedule_timeout() */
 #include <asm/uaccess.h>
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c29365d5b524..fdf4370db994 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -661,7 +661,7 @@ config HW_RANDOM
 config NVRAM
        tristate "/dev/nvram support"
-        depends on ATARI || X86 || X86_64 || ARM || GENERIC_NVRAM
+        depends on ATARI || X86 || ARM || GENERIC_NVRAM
        ---help---
          If you say Y here and create a character special file /dev/nvram
          with major number 10 and minor number 144 using mknod ("man mknod"),
@@ -985,7 +985,7 @@ config MAX_RAW_DEVS
 config HANGCHECK_TIMER
        tristate "Hangcheck timer"
-        depends on X86_64 || X86 || IA64 || PPC64 || ARCH_S390
+        depends on X86 || IA64 || PPC64 || ARCH_S390
        help
          The hangcheck-timer module detects when the system has gone
          out to lunch past a certain margin.  It can reboot the system
@@ -1001,5 +1001,17 @@ config MMTIMER
 source "drivers/char/tpm/Kconfig"
+config TELCLOCK
+        tristate "Telecom clock driver for MPBL0010 ATCA SBC"
+        depends on EXPERIMENTAL
+        default n
+        help
+          The telecom clock device is specific to the MPBL0010 ATCA computer and
+          allows direct userspace access to the configuration of the telecom clock
+          configuration settings.  This device is used for hardware synchronization
+          across the ATCA backplane fabric.  Upon loading, the driver exports a
+          sysfs directory, /sys/devices/platform/telco_clock, with a number of
+          files for controlling the behavior of this hardware.
 endmenu
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 08f69287ea36..4aeae687e88a 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -82,6 +82,7 @@ obj-$(CONFIG_NWFLASH) += nwflash.o
 obj-$(CONFIG_SCx200_GPIO) += scx200_gpio.o
 obj-$(CONFIG_GPIO_VR41XX) += vr41xx_giu.o
 obj-$(CONFIG_TANBAC_TB0219) += tb0219.o
+obj-$(CONFIG_TELCLOCK) += tlclk.o
 obj-$(CONFIG_WATCHDOG)  += watchdog/
 obj-$(CONFIG_MWAVE) += mwave/
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 7f8c1b53b754..486ed8a11b59 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -27,7 +27,7 @@ config AGP
 config AGP_ALI
        tristate "ALI chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
        ---help---
          This option gives you AGP support for the GLX component of
          XFree86 4.x on the following ALi chipsets.  The supported chipsets
@@ -45,7 +45,7 @@ config AGP_ALI
 config AGP_ATI
        tristate "ATI chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
        ---help---
      This option gives you AGP support for the GLX component of
      XFree86 4.x on the ATI RadeonIGP family of chipsets.
@@ -55,7 +55,7 @@ config AGP_ATI
 config AGP_AMD
        tristate "AMD Irongate, 761, and 762 chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
        help
          This option gives you AGP support for the GLX component of
          XFree86 4.x on AMD Irongate, 761, and 762 chipsets.
@@ -91,7 +91,7 @@ config AGP_INTEL
 config AGP_NVIDIA
        tristate "NVIDIA nForce/nForce2 chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
        help
          This option gives you AGP support for the GLX component of
          XFree86 4.x on the following NVIDIA chipsets.  The supported chipsets
@@ -99,7 +99,7 @@ config AGP_NVIDIA
 config AGP_SIS
        tristate "SiS chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
        help
          This option gives you AGP support for the GLX component of
          XFree86 4.x on Silicon Integrated Systems [SiS] chipsets.
@@ -111,14 +111,14 @@ config AGP_SIS
 config AGP_SWORKS
        tristate "Serverworks LE/HE chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
        help
          Say Y here to support the Serverworks AGP card.  See 
          <http://www.serverworks.com/> for product descriptions and images.
 config AGP_VIA
        tristate "VIA chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
        help
          This option gives you AGP support for the GLX component of
          XFree86 4.x on VIA MVP3/Apollo Pro chipsets.
@@ -154,7 +154,7 @@ config AGP_UNINORTH
 config AGP_EFFICEON
        tristate "Transmeta Efficeon support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
        help
          This option gives you AGP support for the Transmeta Efficeon
          series processors with integrated northbridges.
diff --git a/drivers/char/agp/ali-agp.c b/drivers/char/agp/ali-agp.c
index 9c9c9c2247ce..b02fc2267159 100644
--- a/drivers/char/agp/ali-agp.c
+++ b/drivers/char/agp/ali-agp.c
@@ -7,6 +7,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/agp_backend.h>
+#include <asm/page.h>           /* PAGE_SIZE */
 #include "agp.h"
 #define ALI_AGPCTRL     0xb8
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c
index 0a7624a9b1c1..0e6c3a31d344 100644
--- a/drivers/char/agp/amd64-agp.c
+++ b/drivers/char/agp/amd64-agp.c
@@ -13,6 +13,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/agp_backend.h>
+#include <asm/page.h>           /* PAGE_SIZE */
 #include "agp.h"
 /* Will need to be increased if AMD64 ever goes >8-way. */
diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c
index e572ced9100a..0b6e72642d6e 100644
--- a/drivers/char/agp/ati-agp.c
+++ b/drivers/char/agp/ati-agp.c
@@ -6,6 +6,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include <asm/agp.h>
 #include "agp.h"
diff --git a/drivers/char/agp/i460-agp.c b/drivers/char/agp/i460-agp.c
index 94943298c03e..a2d9e5e48bbe 100644
--- a/drivers/char/agp/i460-agp.c
+++ b/drivers/char/agp/i460-agp.c
@@ -10,6 +10,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include "agp.h"
diff --git a/drivers/char/agp/isoch.c b/drivers/char/agp/isoch.c
index c9ac731504f2..40083241804e 100644
--- a/drivers/char/agp/isoch.c
+++ b/drivers/char/agp/isoch.c
@@ -6,6 +6,7 @@
 #include <linux/pci.h>
 #include <linux/agp_backend.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include "agp.h"
diff --git a/drivers/char/agp/sworks-agp.c b/drivers/char/agp/sworks-agp.c
index a9fb12c20eb7..71ea59a1dbeb 100644
--- a/drivers/char/agp/sworks-agp.c
+++ b/drivers/char/agp/sworks-agp.c
@@ -5,6 +5,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include "agp.h"
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index cf4c3648463d..c7f818cd7b02 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -281,7 +281,7 @@ static char rcsid[] =
 * make sure "cyc" appears in all kernel messages; all soft interrupts
 * handled by same routine; recognize out-of-band reception; comment
 * out some diagnostic messages; leave RTS/CTS flow control to hardware;
- * fix race condition in -Z buffer management; only -Y needs to explictly
+ * fix race condition in -Z buffer management; only -Y needs to explicitly
 * flush chars; tidy up some startup messages;
 *
 * Revision 1.36.4.18  1996/07/25 18:57:31  bentson
diff --git a/drivers/char/drm/drm_sysfs.c b/drivers/char/drm/drm_sysfs.c
index 475cc5e555e1..6d3449761914 100644
--- a/drivers/char/drm/drm_sysfs.c
+++ b/drivers/char/drm/drm_sysfs.c
@@ -15,6 +15,8 @@
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 #include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 #include "drm_core.h"
 #include "drmP.h"
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index 407708a001e4..b7a0e4d6b934 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -3113,6 +3113,7 @@ MODULE_DEVICE_TABLE(pci, epca_pci_tbl);
 int __init init_PCI (void)
 {       /* Begin init_PCI */
        memset (&epca_driver, 0, sizeof (epca_driver));
+        epca_driver.owner = THIS_MODULE;
        epca_driver.name = "epca";
        epca_driver.id_table = epca_pci_tbl;
        epca_driver.probe = epca_init_one;
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
index a54bc93353af..66e53dd450ff 100644
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
@@ -117,7 +117,7 @@ __setup("hcheck_reboot", hangcheck_parse_reboot);
 __setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks);
 #endif /* not MODULE */
-#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
+#if defined(CONFIG_X86)
 # define HAVE_MONOTONIC
 # define TIMER_FREQ 1000000000ULL
 #elif defined(CONFIG_ARCH_S390)
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index c055bb630ffc..3808d9572619 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -49,7 +49,9 @@
 #define HPET_USER_FREQ  (64)
 #define HPET_DRIFT      (500)
-static u32 hpet_ntimer, hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
+#define HPET_RANGE_SIZE         1024    /* from HPET spec */
+static u32 hpet_nhpet, hpet_max_freq = HPET_USER_FREQ;
 /* A lock for concurrent access by app and isr hpet activity. */
 static DEFINE_SPINLOCK(hpet_lock);
@@ -78,7 +80,7 @@ struct hpets {
        struct hpet __iomem *hp_hpet;
        unsigned long hp_hpet_phys;
        struct time_interpolator *hp_interpolator;
-        unsigned long hp_period;
+        unsigned long long hp_tick_freq;
        unsigned long hp_delta;
        unsigned int hp_ntimer;
        unsigned int hp_which;
@@ -90,6 +92,7 @@ static struct hpets *hpets;
 #define HPET_OPEN               0x0001
 #define HPET_IE                 0x0002  /* interrupt enabled */
 #define HPET_PERIODIC           0x0004
+#define HPET_SHARED_IRQ         0x0008
 #if BITS_PER_LONG == 64
 #define write_counter(V, MC)    writeq(V, MC)
@@ -120,6 +123,11 @@ static irqreturn_t hpet_interrupt(int irq, void *data, struct pt_regs *regs)
        unsigned long isr;
        devp = data;
+        isr = 1 << (devp - devp->hd_hpets->hp_dev);
+        if ((devp->hd_flags & HPET_SHARED_IRQ) &&
+            !(isr & readl(&devp->hd_hpet->hpet_isr)))
+                return IRQ_NONE;
        spin_lock(&hpet_lock);
        devp->hd_irqdata++;
@@ -137,8 +145,8 @@ static irqreturn_t hpet_interrupt(int irq, void *data, struct pt_regs *regs)
                              &devp->hd_timer->hpet_compare);
        }
-        isr = (1 << (devp - devp->hd_hpets->hp_dev));
+        if (devp->hd_flags & HPET_SHARED_IRQ)
-        writeq(isr, &devp->hd_hpet->hpet_isr);
+                writel(isr, &devp->hd_hpet->hpet_isr);
        spin_unlock(&hpet_lock);
        spin_lock(&hpet_task_lock);
@@ -276,7 +284,8 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma)
        if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT,
                                        PAGE_SIZE, vma->vm_page_prot)) {
-                printk(KERN_ERR "remap_pfn_range failed in hpet.c\n");
+                printk(KERN_ERR "%s: io_remap_pfn_range failed\n",
+                        __FUNCTION__);
                return -EAGAIN;
        }
@@ -364,7 +373,9 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
        hpet = devp->hd_hpet;
        hpetp = devp->hd_hpets;
-        v = readq(&timer->hpet_config);
+        if (!devp->hd_ireqfreq)
+                return -EIO;
        spin_lock_irq(&hpet_lock);
        if (devp->hd_flags & HPET_IE) {
@@ -373,16 +384,21 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
        }
        devp->hd_flags |= HPET_IE;
+        if (readl(&timer->hpet_config) & Tn_INT_TYPE_CNF_MASK)
+                devp->hd_flags |= HPET_SHARED_IRQ;
        spin_unlock_irq(&hpet_lock);
-        t = readq(&timer->hpet_config);
        irq = devp->hd_hdwirq;
        if (irq) {
-                sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev));
+                unsigned long irq_flags;
-                if (request_irq
+                sprintf(devp->hd_name, "hpet%d", (int)(devp - hpetp->hp_dev));
-                    (irq, hpet_interrupt, SA_INTERRUPT, devp->hd_name, (void *)devp)) {
+                irq_flags = devp->hd_flags & HPET_SHARED_IRQ
+                                                ? SA_SHIRQ : SA_INTERRUPT;
+                if (request_irq(irq, hpet_interrupt, irq_flags,
+                                devp->hd_name, (void *)devp)) {
                        printk(KERN_ERR "hpet: IRQ %d is not free\n", irq);
                        irq = 0;
                }
@@ -416,20 +432,24 @@ static int hpet_ioctl_ieon(struct hpet_dev *devp)
                write_counter(t + m + hpetp->hp_delta, &timer->hpet_compare);
        }
-        isr = (1 << (devp - hpets->hp_dev));
+        if (devp->hd_flags & HPET_SHARED_IRQ) {
-        writeq(isr, &hpet->hpet_isr);
+                isr = 1 << (devp - devp->hd_hpets->hp_dev);
+                writel(isr, &hpet->hpet_isr);
+        }
        writeq(g, &timer->hpet_config);
        local_irq_restore(flags);
        return 0;
 }
-static inline unsigned long hpet_time_div(unsigned long dis)
+/* converts Hz to number of timer ticks */
+static inline unsigned long hpet_time_div(struct hpets *hpets,
+                                          unsigned long dis)
 {
-        unsigned long long m = 1000000000000000ULL;
+        unsigned long long m;
+        m = hpets->hp_tick_freq + (dis >> 1);
        do_div(m, dis);
        return (unsigned long)m;
 }
@@ -477,14 +497,21 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
                {
                        struct hpet_info info;
-                        info.hi_ireqfreq = hpet_time_div(hpetp->hp_period *
+                        if (devp->hd_ireqfreq)
-                                                         devp->hd_ireqfreq);
+                                info.hi_ireqfreq =
+                                        hpet_time_div(hpetp, devp->hd_ireqfreq);
+                        else
+                                info.hi_ireqfreq = 0;
                        info.hi_flags =
                            readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
-                        info.hi_hpet = devp->hd_hpets->hp_which;
+                        info.hi_hpet = hpetp->hp_which;
-                        info.hi_timer = devp - devp->hd_hpets->hp_dev;
+                        info.hi_timer = devp - hpetp->hp_dev;
-                        if (copy_to_user((void __user *)arg, &info, sizeof(info)))
+                        if (kernel)
-                                err = -EFAULT;
+                                memcpy((void *)arg, &info, sizeof(info));
+                        else
+                                if (copy_to_user((void __user *)arg, &info,
+                                                 sizeof(info)))
+                                        err = -EFAULT;
                        break;
                }
        case HPET_EPI:
@@ -516,12 +543,12 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
                        break;
                }
-                if (arg & (arg - 1)) {
+                if (!arg) {
                        err = -EINVAL;
                        break;
                }
-                devp->hd_ireqfreq = hpet_time_div(hpetp->hp_period * arg);
+                devp->hd_ireqfreq = hpet_time_div(hpetp, arg);
        }
        return err;
@@ -539,6 +566,17 @@ static struct file_operations hpet_fops = {
        .mmap = hpet_mmap,
 };
+static int hpet_is_known(struct hpet_data *hdp)
+{
+        struct hpets *hpetp;
+        for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)
+                if (hpetp->hp_hpet_phys == hdp->hd_phys_address)
+                        return 1;
+        return 0;
+}
 EXPORT_SYMBOL(hpet_alloc);
 EXPORT_SYMBOL(hpet_register);
 EXPORT_SYMBOL(hpet_unregister);
@@ -563,6 +601,8 @@ int hpet_register(struct hpet_task *tp, int periodic)
                return -EINVAL;
        }
+        tp->ht_opaque = NULL;
        spin_lock_irq(&hpet_task_lock);
        spin_lock(&hpet_lock);
@@ -702,15 +742,14 @@ static void hpet_register_interpolator(struct hpets *hpetp)
 #ifdef  CONFIG_TIME_INTERPOLATION
        struct time_interpolator *ti;
-        ti = kmalloc(sizeof(*ti), GFP_KERNEL);
+        ti = kzalloc(sizeof(*ti), GFP_KERNEL);
        if (!ti)
                return;
-        memset(ti, 0, sizeof(*ti));
        ti->source = TIME_SOURCE_MMIO64;
        ti->shift = 10;
        ti->addr = &hpetp->hp_hpet->hpet_mc;
-        ti->frequency = hpet_time_div(hpets->hp_period);
+        ti->frequency = hpetp->hp_tick_freq;
        ti->drift = HPET_DRIFT;
        ti->mask = -1;
@@ -743,11 +782,11 @@ static unsigned long hpet_calibrate(struct hpets *hpetp)
        if (!timer)
                return 0;
-        hpet = hpets->hp_hpet;
+        hpet = hpetp->hp_hpet;
        t = read_counter(&timer->hpet_compare);
        i = 0;
-        count = hpet_time_div(hpetp->hp_period * TICK_CALIBRATE);
+        count = hpet_time_div(hpetp, TICK_CALIBRATE);
        local_irq_save(flags);
@@ -771,28 +810,29 @@ int hpet_alloc(struct hpet_data *hdp)
        struct hpets *hpetp;
        size_t siz;
        struct hpet __iomem *hpet;
-        static struct hpets *last = (struct hpets *)0;
+        static struct hpets *last = NULL;
-        unsigned long ns;
+        unsigned long period;
+        unsigned long long temp;
        /*
         * hpet_alloc can be called by platform dependent code.
-         * if platform dependent code has allocated the hpet
+         * If platform dependent code has allocated the hpet that
-         * ACPI also reports hpet, then we catch it here.
+         * ACPI has also reported, then we catch it here.
         */
-        for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)
+        if (hpet_is_known(hdp)) {
-                if (hpetp->hp_hpet == hdp->hd_address)
+                printk(KERN_DEBUG "%s: duplicate HPET ignored\n",
-                        return 0;
+                        __FUNCTION__);
+                return 0;
+        }
        siz = sizeof(struct hpets) + ((hdp->hd_nirqs - 1) *
                                      sizeof(struct hpet_dev));
-        hpetp = kmalloc(siz, GFP_KERNEL);
+        hpetp = kzalloc(siz, GFP_KERNEL);
        if (!hpetp)
                return -ENOMEM;
-        memset(hpetp, 0, siz);
        hpetp->hp_which = hpet_nhpet++;
        hpetp->hp_hpet = hdp->hd_address;
        hpetp->hp_hpet_phys = hdp->hd_phys_address;
@@ -822,21 +862,23 @@ int hpet_alloc(struct hpet_data *hdp)
        last = hpetp;
-        hpetp->hp_period = (cap & HPET_COUNTER_CLK_PERIOD_MASK) >>
+        period = (cap & HPET_COUNTER_CLK_PERIOD_MASK) >>
-            HPET_COUNTER_CLK_PERIOD_SHIFT;
+                HPET_COUNTER_CLK_PERIOD_SHIFT; /* fs, 10^-15 */
+        temp = 1000000000000000uLL; /* 10^15 femtoseconds per second */
+        temp += period >> 1; /* round */
+        do_div(temp, period);
+        hpetp->hp_tick_freq = temp; /* ticks per second */
-        printk(KERN_INFO "hpet%d: at MMIO 0x%lx, IRQ%s",
+        printk(KERN_INFO "hpet%d: at MMIO 0x%lx (virtual 0x%p), IRQ%s",
-                hpetp->hp_which, hdp->hd_phys_address,
+                hpetp->hp_which, hdp->hd_phys_address, hdp->hd_address,
                hpetp->hp_ntimer > 1 ? "s" : "");
        for (i = 0; i < hpetp->hp_ntimer; i++)
                printk("%s %d", i > 0 ? "," : "", hdp->hd_irq[i]);
        printk("\n");
-        ns = hpetp->hp_period;  /* femptoseconds, 10^-15 */
+        printk(KERN_INFO "hpet%u: %u %d-bit timers, %Lu Hz\n",
-        ns /= 1000000;          /* convert to nanoseconds, 10^-9 */
+               hpetp->hp_which, hpetp->hp_ntimer,
-        printk(KERN_INFO "hpet%d: %ldns tick, %d %d-bit timers\n",
+               cap & HPET_COUNTER_SIZE_MASK ? 64 : 32, hpetp->hp_tick_freq);
-                hpetp->hp_which, ns, hpetp->hp_ntimer,
-                cap & HPET_COUNTER_SIZE_MASK ? 64 : 32);
        mcfg = readq(&hpet->hpet_config);
        if ((mcfg & HPET_ENABLE_CNF_MASK) == 0) {
@@ -845,13 +887,10 @@ int hpet_alloc(struct hpet_data *hdp)
                writeq(mcfg, &hpet->hpet_config);
        }
-        for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer;
+        for (i = 0, devp = hpetp->hp_dev; i < hpetp->hp_ntimer; i++, devp++) {
-             i++, hpet_ntimer++, devp++) {
-                unsigned long v;
                struct hpet_timer __iomem *timer;
                timer = &hpet->hpet_timers[devp - hpetp->hp_dev];
-                v = readq(&timer->hpet_config);
                devp->hd_hpets = hpetp;
                devp->hd_hpet = hpet;
@@ -880,7 +919,6 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
        struct hpet_data *hdp;
        acpi_status status;
        struct acpi_resource_address64 addr;
-        struct hpets *hpetp;
        hdp = data;
@@ -893,9 +931,29 @@ static acpi_status hpet_resources(struct acpi_resource *res, void *data)
                hdp->hd_phys_address = addr.min_address_range;
                hdp->hd_address = ioremap(addr.min_address_range, size);
-                for (hpetp = hpets; hpetp; hpetp = hpetp->hp_next)
+                if (hpet_is_known(hdp)) {
-                        if (hpetp->hp_hpet == hdp->hd_address)
+                        printk(KERN_DEBUG "%s: 0x%lx is busy\n",
-                                return -EBUSY;
+                                __FUNCTION__, hdp->hd_phys_address);
+                        iounmap(hdp->hd_address);
+                        return -EBUSY;
+                }
+        } else if (res->id == ACPI_RSTYPE_FIXED_MEM32) {
+                struct acpi_resource_fixed_mem32 *fixmem32;
+                fixmem32 = &res->data.fixed_memory32;
+                if (!fixmem32)
+                        return -EINVAL;
+                hdp->hd_phys_address = fixmem32->range_base_address;
+                hdp->hd_address = ioremap(fixmem32->range_base_address,
+                                                HPET_RANGE_SIZE);
+                if (hpet_is_known(hdp)) {
+                        printk(KERN_DEBUG "%s: 0x%lx is busy\n",
+                                __FUNCTION__, hdp->hd_phys_address);
+                        iounmap(hdp->hd_address);
+                        return -EBUSY;
+                }
        } else if (res->id == ACPI_RSTYPE_EXT_IRQ) {
                struct acpi_resource_ext_irq *irqp;
                int i;
diff --git a/drivers/char/mwave/3780i.c b/drivers/char/mwave/3780i.c
index 613aed9e1840..d1fe05e83882 100644
--- a/drivers/char/mwave/3780i.c
+++ b/drivers/char/mwave/3780i.c
@@ -53,6 +53,8 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
+#include <linux/sched.h>        /* cond_resched() */
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 5b1d3680c8ab..928b850cc679 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -256,7 +256,6 @@ static int sInitController(CONTROLLER_T * CtlP, int CtlNum, ByteIO_t MudbacIO,
 static int sReadAiopID(ByteIO_t io);
 static int sReadAiopNumChan(WordIO_t io);
-#ifdef MODULE
 MODULE_AUTHOR("Theodore Ts'o");
 MODULE_DESCRIPTION("Comtrol RocketPort driver");
 module_param(board1, ulong, 0);
@@ -288,17 +287,14 @@ MODULE_PARM_DESC(pc104_3, "set interface types for ISA(PC104) board #3 (e.g. pc1
 module_param_array(pc104_4, ulong, NULL, 0);
 MODULE_PARM_DESC(pc104_4, "set interface types for ISA(PC104) board #4 (e.g. pc104_4=232,232,485,485,...");
-int rp_init(void);
+static int rp_init(void);
 static void rp_cleanup_module(void);
 module_init(rp_init);
 module_exit(rp_cleanup_module);
-#endif
-#ifdef MODULE_LICENSE
 MODULE_LICENSE("Dual BSD/GPL");
-#endif
 /*************************************************************************/
 /*                     Module code starts here                           */
@@ -2378,7 +2374,7 @@ static struct tty_operations rocket_ops = {
 /*
 * The module "startup" routine; it's run when the module is loaded.
 */
-int __init rp_init(void)
+static int __init rp_init(void)
 {
        int retval, pci_boards_found, isa_boards_found, i;
@@ -2502,7 +2498,6 @@ int __init rp_init(void)
        return 0;
 }
-#ifdef MODULE
 static void rp_cleanup_module(void)
 {
@@ -2530,7 +2525,6 @@ static void rp_cleanup_module(void)
        if (controller)
                release_region(controller, 4);
 }
-#endif
 /***************************************************************************
 Function: sInitController
diff --git a/drivers/char/ser_a2232.c b/drivers/char/ser_a2232.c
index 6b4e9d155f50..dda30e42ec79 100644
--- a/drivers/char/ser_a2232.c
+++ b/drivers/char/ser_a2232.c
@@ -790,7 +790,7 @@ static int __init a2232board_init(void)
        }       
-        printk("Total: %d A2232 boards initialized.\n.", nr_a2232); /* Some status report if no card was found */
+        printk("Total: %d A2232 boards initialized.\n", nr_a2232); /* Some status report if no card was found */
        a2232_init_portstructs();
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c
index 50e0b612a8a2..352547eabf7b 100644
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
@@ -38,19 +38,19 @@
 *
 * Revision 1.0:  April 1st 1997.
 *                Initial release for alpha testing.
- * Revision 1.1:  April 14th 1997. 
+ * Revision 1.1:  April 14th 1997.
- *                Incorporated Richard Hudsons suggestions, 
+ *                Incorporated Richard Hudsons suggestions,
 *                removed some debugging printk's.
 * Revision 1.2:  April 15th 1997.
 *                Ported to 2.1.x kernels.
- * Revision 1.3:  April 17th 1997 
+ * Revision 1.3:  April 17th 1997
- *                Backported to 2.0. (Compatibility macros). 
+ *                Backported to 2.0. (Compatibility macros).
 * Revision 1.4:  April 18th 1997
- *                Fixed DTR/RTS bug that caused the card to indicate 
+ *                Fixed DTR/RTS bug that caused the card to indicate
- *                "don't send data" to a modem after the password prompt.  
+ *                "don't send data" to a modem after the password prompt.
 *                Fixed bug for premature (fake) interrupts.
 * Revision 1.5:  April 19th 1997
- *                fixed a minor typo in the header file, cleanup a little. 
+ *                fixed a minor typo in the header file, cleanup a little.
 *                performance warnings are now MAXed at once per minute.
 * Revision 1.6:  May 23 1997
 *                Changed the specialix=... format to include interrupt.
@@ -60,10 +60,10 @@
 *                port to linux-2.1.43 kernel.
 * Revision 1.9:  Oct 9  1998
 *                Added stuff for the IO8+/PCI version.
- * Revision 1.10: Oct 22  1999 / Jan 21 2000. 
+ * Revision 1.10: Oct 22  1999 / Jan 21 2000.
- *                Added stuff for setserial. 
+ *                Added stuff for setserial.
 *                Nicolas Mailhot (Nicolas.Mailhot@email.enst.fr)
- * 
+ *
 */
 #define VERSION "1.11"
@@ -154,7 +154,7 @@ static int sx_poll = HZ;
-/* 
+/*
 * The following defines are mostly for testing purposes. But if you need
 * some nice reporting in your syslog, you can define them also.
 */
@@ -188,7 +188,7 @@ static DECLARE_MUTEX(tmp_buf_sem);
 static unsigned long baud_table[] =  {
        0, 50, 75, 110, 134, 150, 200, 300, 600, 1200, 1800, 2400, 4800,
-        9600, 19200, 38400, 57600, 115200, 0, 
+        9600, 19200, 38400, 57600, 115200, 0,
 };
 static struct specialix_board sx_board[SX_NBOARD] =  {
@@ -216,7 +216,7 @@ static inline int sx_paranoia_check(struct specialix_port const * port,
                KERN_ERR "sx: Warning: bad specialix port magic number for device %s in %s\n";
        static const char *badinfo =
                KERN_ERR "sx: Warning: null specialix port for device %s in %s\n";
- 
        if (!port) {
                printk(badinfo, name, routine);
                return 1;
@@ -231,9 +231,9 @@ static inline int sx_paranoia_check(struct specialix_port const * port,
 /*
- * 
+ *
 *  Service functions for specialix IO8+ driver.
- * 
+ *
 */
 /* Get board number from pointer */
@@ -246,7 +246,7 @@ static inline int board_No (struct specialix_board * bp)
 /* Get port number from pointer */
 static inline int port_No (struct specialix_port const * port)
 {
-        return SX_PORT(port - sx_port); 
+        return SX_PORT(port - sx_port);
 }
@@ -309,7 +309,7 @@ static inline void sx_wait_CCR(struct specialix_board  * bp)
                        return;
                udelay (1);
        }
-        
        printk(KERN_ERR "sx%d: Timeout waiting for CCR.\n", board_No(bp));
 }
@@ -329,7 +329,7 @@ static inline void sx_wait_CCR_off(struct specialix_board  * bp)
                        return;
                udelay (1);
        }
-        
        printk(KERN_ERR "sx%d: Timeout waiting for CCR.\n", board_No(bp));
 }
@@ -338,34 +338,28 @@ static inline void sx_wait_CCR_off(struct specialix_board  * bp)
 *  specialix IO8+ IO range functions.
 */
-static inline int sx_check_io_range(struct specialix_board * bp)
+static inline int sx_request_io_range(struct specialix_board * bp)
 {
-        return check_region (bp->base, SX_IO_SPACE);
+        return request_region(bp->base,
-}
+                bp->flags & SX_BOARD_IS_PCI ? SX_PCI_IO_SPACE : SX_IO_SPACE,
+                "specialix IO8+") == NULL;
-static inline void sx_request_io_range(struct specialix_board * bp)
-{
-        request_region(bp->base, 
-                       bp->flags&SX_BOARD_IS_PCI?SX_PCI_IO_SPACE:SX_IO_SPACE,
-                       "specialix IO8+" );
 }
 static inline void sx_release_io_range(struct specialix_board * bp)
 {
-        release_region(bp->base, 
+        release_region(bp->base,
                       bp->flags&SX_BOARD_IS_PCI?SX_PCI_IO_SPACE:SX_IO_SPACE);
 }
-        
 /* Must be called with enabled interrupts */
-/* Ugly. Very ugly. Don't use this for anything else than initialization 
+/* Ugly. Very ugly. Don't use this for anything else than initialization
   code */
 static inline void sx_long_delay(unsigned long delay)
 {
        unsigned long i;
-        
        for (i = jiffies + delay; time_after(i, jiffies); ) ;
 }
@@ -378,7 +372,7 @@ static int sx_set_irq ( struct specialix_board *bp)
        int i;
        unsigned long flags;
-        if (bp->flags & SX_BOARD_IS_PCI) 
+        if (bp->flags & SX_BOARD_IS_PCI)
                return 1;
        switch (bp->irq) {
        /* In the same order as in the docs... */
@@ -420,7 +414,7 @@ static int sx_init_CD186x(struct specialix_board  * bp)
        sx_out_off(bp, CD186x_PILR3, SX_ACK_RINT);      /* Prio for receiver intr    */
        /* Set RegAckEn */
        sx_out_off(bp, CD186x_SRCR, sx_in (bp, CD186x_SRCR) | SRCR_REGACKEN);
-        
        /* Setting up prescaler. We need 4 ticks per 1 ms */
        scaler =  SX_OSCFREQ/SPECIALIX_TPS;
@@ -448,7 +442,7 @@ static int read_cross_byte (struct specialix_board *bp, int reg, int bit)
        spin_lock_irqsave(&bp->lock, flags);
        for (i=0, t=0;i<8;i++) {
                sx_out_off (bp, CD186x_CAR, i);
-                if (sx_in_off (bp, reg) & bit) 
+                if (sx_in_off (bp, reg) & bit)
                        t |= 1 << i;
        }
        spin_unlock_irqrestore(&bp->lock, flags);
@@ -472,7 +466,7 @@ void missed_irq (unsigned long data)
        spin_unlock_irqrestore(&bp->lock, flags);
        if (irq) {
                printk (KERN_INFO "Missed interrupt... Calling int from timer. \n");
-                sx_interrupt (((struct specialix_board *)data)->irq, 
+                sx_interrupt (((struct specialix_board *)data)->irq,
                              (void*)data, NULL);
        }
        missed_irq_timer.expires = jiffies + sx_poll;
@@ -495,7 +489,7 @@ static int sx_probe(struct specialix_board *bp)
        func_enter();
-        if (sx_check_io_range(bp)) {
+        if (sx_request_io_range(bp)) {
                func_exit();
                return 1;
        }
@@ -509,15 +503,16 @@ static int sx_probe(struct specialix_board *bp)
        short_pause ();
        val2 = sx_in_off(bp, CD186x_PPRL);
-        
        if ((val1 != 0x5a) || (val2 != 0xa5)) {
                printk(KERN_INFO "sx%d: specialix IO8+ Board at 0x%03x not found.\n",
                       board_No(bp), bp->base);
+                sx_release_io_range(bp);
                func_exit();
                return 1;
        }
-        /* Check the DSR lines that Specialix uses as board 
+        /* Check the DSR lines that Specialix uses as board
           identification */
        val1 = read_cross_byte (bp, CD186x_MSVR, MSVR_DSR);
        val2 = read_cross_byte (bp, CD186x_MSVR, MSVR_RTS);
@@ -532,6 +527,7 @@ static int sx_probe(struct specialix_board *bp)
        if (val1 != val2) {
                printk(KERN_INFO "sx%d: specialix IO8+ ID %02x at 0x%03x not found (%02x).\n",
                       board_No(bp), val2, bp->base, val1);
+                sx_release_io_range(bp);
                func_exit();
                return 1;
        }
@@ -546,7 +542,7 @@ static int sx_probe(struct specialix_board *bp)
                sx_wait_CCR(bp);
                sx_out(bp, CD186x_CCR, CCR_TXEN);        /* Enable transmitter     */
                sx_out(bp, CD186x_IER, IER_TXRDY);       /* Enable tx empty intr   */
-                sx_long_delay(HZ/20);                   
+                sx_long_delay(HZ/20);
                irqs = probe_irq_off(irqs);
                dprintk (SX_DEBUG_INIT, "SRSR = %02x, ", sx_in(bp, CD186x_SRSR));
@@ -561,14 +557,15 @@ static int sx_probe(struct specialix_board *bp)
                }
                dprintk (SX_DEBUG_INIT "val1 = %02x, val2 = %02x, val3 = %02x.\n",
-                        val1, val2, val3); 
+                        val1, val2, val3);
-        
        }
-        
 #if 0
        if (irqs <= 0) {
                printk(KERN_ERR "sx%d: Can't find IRQ for specialix IO8+ board at 0x%03x.\n",
                       board_No(bp), bp->base);
+                sx_release_io_range(bp);
                func_exit();
                return 1;
        }
@@ -579,19 +576,20 @@ static int sx_probe(struct specialix_board *bp)
 #endif
        /* Reset CD186x again  */
        if (!sx_init_CD186x(bp)) {
+                sx_release_io_range(bp);
                func_exit();
-                return -EIO;
+                return 1;
        }
        sx_request_io_range(bp);
        bp->flags |= SX_BOARD_PRESENT;
-        
        /* Chip           revcode   pkgtype
                          GFRCR     SRCR bit 7
           CD180 rev B    0x81      0
           CD180 rev C    0x82      0
           CD1864 rev A   0x82      1
-           CD1865 rev A   0x83      1  -- Do not use!!! Does not work. 
+           CD1865 rev A   0x83      1  -- Do not use!!! Does not work.
           CD1865 rev B   0x84      1
         -- Thanks to Gwen Wang, Cirrus Logic.
         */
@@ -623,8 +621,8 @@ static int sx_probe(struct specialix_board *bp)
        return 0;
 }
-/* 
+/*
- * 
+ *
 *  Interrupt processing routines.
 * */
@@ -657,7 +655,7 @@ static inline struct specialix_port * sx_get_port(struct specialix_board * bp,
                        return port;
                }
        }
-        printk(KERN_INFO "sx%d: %s interrupt from invalid port %d\n", 
+        printk(KERN_INFO "sx%d: %s interrupt from invalid port %d\n",
               board_No(bp), what, channel);
        return NULL;
 }
@@ -681,7 +679,7 @@ static inline void sx_receive_exc(struct specialix_board * bp)
        tty = port->tty;
        dprintk (SX_DEBUG_RX, "port: %p count: %d BUFF_SIZE: %d\n",
                 port,  tty->flip.count, TTY_FLIPBUF_SIZE);
-        
        status = sx_in(bp, CD186x_RCSR);
        dprintk (SX_DEBUG_RX, "status: 0x%x\n", status);
@@ -707,30 +705,30 @@ static inline void sx_receive_exc(struct specialix_board * bp)
                return;
        }
        if (status & RCSR_TOUT) {
-                printk(KERN_INFO "sx%d: port %d: Receiver timeout. Hardware problems ?\n", 
+                printk(KERN_INFO "sx%d: port %d: Receiver timeout. Hardware problems ?\n",
                       board_No(bp), port_No(port));
                func_exit();
                return;
-                
        } else if (status & RCSR_BREAK) {
                dprintk(SX_DEBUG_RX, "sx%d: port %d: Handling break...\n",
                       board_No(bp), port_No(port));
                *tty->flip.flag_buf_ptr++ = TTY_BREAK;
                if (port->flags & ASYNC_SAK)
                        do_SAK(tty);
-                
-        } else if (status & RCSR_PE) 
+        } else if (status & RCSR_PE)
                *tty->flip.flag_buf_ptr++ = TTY_PARITY;
-        
-        else if (status & RCSR_FE) 
+        else if (status & RCSR_FE)
                *tty->flip.flag_buf_ptr++ = TTY_FRAME;
-        
        else if (status & RCSR_OE)
                *tty->flip.flag_buf_ptr++ = TTY_OVERRUN;
-        
        else
                *tty->flip.flag_buf_ptr++ = 0;
-        
        *tty->flip.char_buf_ptr++ = ch;
        tty->flip.count++;
        schedule_delayed_work(&tty->flip.work, 1);
@@ -746,18 +744,18 @@ static inline void sx_receive(struct specialix_board * bp)
        unsigned char count;
        func_enter();
-        
        if (!(port = sx_get_port(bp, "Receive"))) {
                dprintk (SX_DEBUG_RX, "Hmm, couldn't find port.\n");
                func_exit();
                return;
        }
        tty = port->tty;
-        
        count = sx_in(bp, CD186x_RDCR);
        dprintk (SX_DEBUG_RX, "port: %p: count: %d\n", port, count);
        port->hits[count > 8 ? 9 : count]++;
-        
        while (count--) {
                if (tty->flip.count >= TTY_FLIPBUF_SIZE) {
                        printk(KERN_INFO "sx%d: port %d: Working around flip buffer overflow.\n",
@@ -787,7 +785,7 @@ static inline void sx_transmit(struct specialix_board * bp)
        }
        dprintk (SX_DEBUG_TX, "port: %p\n", port);
        tty = port->tty;
-        
        if (port->IER & IER_TXEMPTY) {
                /* FIFO drained */
                sx_out(bp, CD186x_CAR, port_No(port));
@@ -796,7 +794,7 @@ static inline void sx_transmit(struct specialix_board * bp)
                func_exit();
                return;
        }
-        
        if ((port->xmit_cnt <= 0 && !port->break_length)
            || tty->stopped || tty->hw_stopped) {
                sx_out(bp, CD186x_CAR, port_No(port));
@@ -805,7 +803,7 @@ static inline void sx_transmit(struct specialix_board * bp)
                func_exit();
                return;
        }
-        
        if (port->break_length) {
                if (port->break_length > 0) {
                        if (port->COR2 & COR2_ETC) {
@@ -831,7 +829,7 @@ static inline void sx_transmit(struct specialix_board * bp)
                func_exit();
                return;
        }
-        
        count = CD186x_NFIFO;
        do {
                sx_out(bp, CD186x_TDR, port->xmit_buf[port->xmit_tail++]);
@@ -839,7 +837,7 @@ static inline void sx_transmit(struct specialix_board * bp)
                if (--port->xmit_cnt <= 0)
                        break;
        } while (--count > 0);
-        
        if (port->xmit_cnt <= 0) {
                sx_out(bp, CD186x_CAR, port_No(port));
                port->IER &= ~IER_TXRDY;
@@ -862,9 +860,9 @@ static inline void sx_check_modem(struct specialix_board * bp)
        dprintk (SX_DEBUG_SIGNALS, "Modem intr. ");
        if (!(port = sx_get_port(bp, "Modem")))
                return;
-        
        tty = port->tty;
-        
        mcr = sx_in(bp, CD186x_MCR);
        printk ("mcr = %02x.\n", mcr);
@@ -879,7 +877,7 @@ static inline void sx_check_modem(struct specialix_board * bp)
                        schedule_work(&port->tqueue_hangup);
                }
        }
-        
 #ifdef SPECIALIX_BRAIN_DAMAGED_CTS
        if (mcr & MCR_CTSCHG) {
                if (sx_in(bp, CD186x_MSVR) & MSVR_CTS) {
@@ -906,7 +904,7 @@ static inline void sx_check_modem(struct specialix_board * bp)
                sx_out(bp, CD186x_IER, port->IER);
        }
 #endif /* SPECIALIX_BRAIN_DAMAGED_CTS */
-        
        /* Clear change bits */
        sx_out(bp, CD186x_MCR, 0);
 }
@@ -940,7 +938,7 @@ static irqreturn_t sx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        while ((++loop < 16) && (status = (sx_in(bp, CD186x_SRSR) &
                                           (SRSR_RREQint |
                                            SRSR_TREQint |
-                                            SRSR_MREQint)))) {  
+                                            SRSR_MREQint)))) {
                if (status & SRSR_RREQint) {
                        ack = sx_in(bp, CD186x_RRAR);
@@ -951,7 +949,7 @@ static irqreturn_t sx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                        else
                                printk(KERN_ERR "sx%d: status: 0x%x Bad receive ack 0x%02x.\n",
                                       board_No(bp), status, ack);
-                
                } else if (status & SRSR_TREQint) {
                        ack = sx_in(bp, CD186x_TRAR);
@@ -963,13 +961,13 @@ static irqreturn_t sx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                } else if (status & SRSR_MREQint) {
                        ack = sx_in(bp, CD186x_MRAR);
-                        if (ack == (SX_ID | GIVR_IT_MODEM)) 
+                        if (ack == (SX_ID | GIVR_IT_MODEM))
                                sx_check_modem(bp);
                        else
                                printk(KERN_ERR "sx%d: status: 0x%x Bad modem ack 0x%02x.\n",
                                       board_No(bp), status, ack);
-                
-                } 
+                }
                sx_out(bp, CD186x_EOIR, 0);   /* Mark end of interrupt */
        }
@@ -1026,7 +1024,7 @@ static inline int sx_setup_board(struct specialix_board * bp)
 {
        int error;
-        if (bp->flags & SX_BOARD_ACTIVE) 
+        if (bp->flags & SX_BOARD_ACTIVE)
                return 0;
        if (bp->flags & SX_BOARD_IS_PCI)
@@ -1034,7 +1032,7 @@ static inline int sx_setup_board(struct specialix_board * bp)
        else
                error = request_irq(bp->irq, sx_interrupt, SA_INTERRUPT, "specialix IO8+", bp);
-        if (error) 
+        if (error)
                return error;
        turn_ints_on (bp);
@@ -1055,7 +1053,7 @@ static inline void sx_shutdown_board(struct specialix_board *bp)
        }
        bp->flags &= ~SX_BOARD_ACTIVE;
-        
        dprintk (SX_DEBUG_IRQ, "Freeing IRQ%d for board %d.\n",
                 bp->irq, board_No (bp));
        free_irq(bp->irq, bp);
@@ -1068,7 +1066,7 @@ static inline void sx_shutdown_board(struct specialix_board *bp)
 /*
- * Setting up port characteristics. 
+ * Setting up port characteristics.
 * Must be called with disabled interrupts
 */
 static void sx_change_speed(struct specialix_board *bp, struct specialix_port *port)
@@ -1103,10 +1101,10 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
        spin_unlock_irqrestore(&bp->lock, flags);
        dprintk (SX_DEBUG_TERMIOS, "sx: got MSVR=%02x.\n", port->MSVR);
        baud = C_BAUD(tty);
-        
        if (baud & CBAUDEX) {
                baud &= ~CBAUDEX;
-                if (baud < 1 || baud > 2) 
+                if (baud < 1 || baud > 2)
                        port->tty->termios->c_cflag &= ~CBAUDEX;
                else
                        baud += 15;
@@ -1117,8 +1115,8 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
                        baud += 2;
        }
-        
-        
        if (!baud_table[baud]) {
                /* Drop DTR & exit */
                dprintk (SX_DEBUG_TERMIOS, "Dropping DTR...  Hmm....\n");
@@ -1127,7 +1125,7 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                        spin_lock_irqsave(&bp->lock, flags);
                        sx_out(bp, CD186x_MSVR, port->MSVR );
                        spin_unlock_irqrestore(&bp->lock, flags);
-                } 
+                }
                else
                        dprintk (SX_DEBUG_TERMIOS, "Can't drop DTR: no DTR.\n");
                return;
@@ -1137,9 +1135,9 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                        port ->MSVR |= MSVR_DTR;
                }
        }
-        
        /*
-         * Now we must calculate some speed depended things 
+         * Now we must calculate some speed depended things
         */
        /* Set baud rate for port */
@@ -1152,7 +1150,7 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                tmp = (((SX_OSCFREQ + baud_table[baud]/2) / baud_table[baud] +
                         CD186x_TPC/2) / CD186x_TPC);
-        if ((tmp < 0x10) && time_before(again, jiffies)) { 
+        if ((tmp < 0x10) && time_before(again, jiffies)) {
                again = jiffies + HZ * 60;
                /* Page 48 of version 2.0 of the CL-CD1865 databook */
                if (tmp >= 12) {
@@ -1164,27 +1162,27 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                        printk (KERN_INFO "sx%d: Baud rate divisor is %ld. \n"
                                "Warning: overstressing Cirrus chip. "
                                "This might not work.\n"
-                                "Read specialix.txt for more info.\n", 
+                                "Read specialix.txt for more info.\n",
                                port_No (port), tmp);
                }
        }
        spin_lock_irqsave(&bp->lock, flags);
-        sx_out(bp, CD186x_RBPRH, (tmp >> 8) & 0xff); 
+        sx_out(bp, CD186x_RBPRH, (tmp >> 8) & 0xff);
-        sx_out(bp, CD186x_TBPRH, (tmp >> 8) & 0xff); 
+        sx_out(bp, CD186x_TBPRH, (tmp >> 8) & 0xff);
-        sx_out(bp, CD186x_RBPRL, tmp & 0xff); 
+        sx_out(bp, CD186x_RBPRL, tmp & 0xff);
        sx_out(bp, CD186x_TBPRL, tmp & 0xff);
        spin_unlock_irqrestore(&bp->lock, flags);
        if (port->custom_divisor) {
                baud = (SX_OSCFREQ + port->custom_divisor/2) / port->custom_divisor;
                baud = ( baud + 5 ) / 10;
-        } else 
+        } else
                baud = (baud_table[baud] + 5) / 10;   /* Estimated CPS */
        /* Two timer ticks seems enough to wakeup something like SLIP driver */
-        tmp = ((baud + HZ/2) / HZ) * 2 - CD186x_NFIFO;          
+        tmp = ((baud + HZ/2) / HZ) * 2 - CD186x_NFIFO;
        port->wakeup_chars = (tmp < 0) ? 0 : ((tmp >= SERIAL_XMIT_SIZE) ?
                                              SERIAL_XMIT_SIZE - 1 : tmp);
-        
        /* Receiver timeout will be transmission time for 1.5 chars */
        tmp = (SPECIALIX_TPS + SPECIALIX_TPS/2 + baud/2) / baud;
        tmp = (tmp > 0xff) ? 0xff : tmp;
@@ -1205,29 +1203,29 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                cor1 |= COR1_8BITS;
                break;
        }
-        
-        if (C_CSTOPB(tty)) 
+        if (C_CSTOPB(tty))
                cor1 |= COR1_2SB;
-        
        cor1 |= COR1_IGNORE;
        if (C_PARENB(tty)) {
                cor1 |= COR1_NORMPAR;
-                if (C_PARODD(tty)) 
+                if (C_PARODD(tty))
                        cor1 |= COR1_ODDP;
-                if (I_INPCK(tty)) 
+                if (I_INPCK(tty))
                        cor1 &= ~COR1_IGNORE;
        }
        /* Set marking of some errors */
        port->mark_mask = RCSR_OE | RCSR_TOUT;
-        if (I_INPCK(tty)) 
+        if (I_INPCK(tty))
                port->mark_mask |= RCSR_FE | RCSR_PE;
-        if (I_BRKINT(tty) || I_PARMRK(tty)) 
+        if (I_BRKINT(tty) || I_PARMRK(tty))
                port->mark_mask |= RCSR_BREAK;
-        if (I_IGNPAR(tty)) 
+        if (I_IGNPAR(tty))
                port->mark_mask &= ~(RCSR_FE | RCSR_PE);
        if (I_IGNBRK(tty)) {
                port->mark_mask &= ~RCSR_BREAK;
-                if (I_IGNPAR(tty)) 
+                if (I_IGNPAR(tty))
                        /* Real raw mode. Ignore all */
                        port->mark_mask &= ~RCSR_OE;
        }
@@ -1241,7 +1239,7 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                tty->hw_stopped = !(sx_in(bp, CD186x_MSVR) & (MSVR_CTS|MSVR_DSR));
                spin_unlock_irqrestore(&bp->lock, flags);
 #else
-                port->COR2 |= COR2_CTSAE; 
+                port->COR2 |= COR2_CTSAE;
 #endif
        }
        /* Enable Software Flow Control. FIXME: I'm not sure about this */
@@ -1264,11 +1262,11 @@ static void sx_change_speed(struct specialix_board *bp, struct specialix_port *p
                mcor1 |= MCOR1_CDZD;
                mcor2 |= MCOR2_CDOD;
        }
-        
-        if (C_CREAD(tty)) 
+        if (C_CREAD(tty))
                /* Enable receiver */
                port->IER |= IER_RXD;
-        
        /* Set input FIFO size (1-8 bytes) */
        cor3 |= sx_rxfifo;
        /* Setting up CD186x channel registers */
@@ -1311,11 +1309,11 @@ static int sx_setup_port(struct specialix_board *bp, struct specialix_port *port
                func_exit();
                return 0;
        }
-        
        if (!port->xmit_buf) {
                /* We may sleep in get_zeroed_page() */
                unsigned long tmp;
-                
                if (!(tmp = get_zeroed_page(GFP_KERNEL))) {
                        func_exit();
                        return -ENOMEM;
@@ -1328,10 +1326,10 @@ static int sx_setup_port(struct specialix_board *bp, struct specialix_port *port
                }
                port->xmit_buf = (unsigned char *) tmp;
        }
-                
        spin_lock_irqsave(&port->lock, flags);
-        if (port->tty) 
+        if (port->tty)
                clear_bit(TTY_IO_ERROR, &port->tty->flags);
        port->xmit_cnt = port->xmit_head = port->xmit_tail = 0;
@@ -1340,7 +1338,7 @@ static int sx_setup_port(struct specialix_board *bp, struct specialix_port *port
        spin_unlock_irqrestore(&port->lock, flags);
-                
        func_exit();
        return 0;
 }
@@ -1352,14 +1350,14 @@ static void sx_shutdown_port(struct specialix_board *bp, struct specialix_port *
        struct tty_struct *tty;
        int i;
        unsigned long flags;
-        
        func_enter();
        if (!(port->flags & ASYNC_INITIALIZED)) {
                func_exit();
                return;
        }
-        
        if (sx_debug & SX_DEBUG_FIFO) {
                dprintk(SX_DEBUG_FIFO, "sx%d: port %d: %ld overruns, FIFO hits [ ",
                        board_No(bp), port_No(port), port->overrun);
@@ -1394,13 +1392,13 @@ static void sx_shutdown_port(struct specialix_board *bp, struct specialix_port *
        if (tty)
                set_bit(TTY_IO_ERROR, &tty->flags);
        port->flags &= ~ASYNC_INITIALIZED;
-        
-        if (!bp->count) 
+        if (!bp->count)
                sx_shutdown_board(bp);
        func_exit();
 }
-        
 static int block_til_ready(struct tty_struct *tty, struct file * filp,
                           struct specialix_port *port)
 {
@@ -1427,7 +1425,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                        return -ERESTARTSYS;
                }
        }
-        
        /*
         * If non-blocking mode is set, or the port is not enabled,
         * then make the check up front and then exit.
@@ -1477,7 +1475,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
                        if (port->flags & ASYNC_HUP_NOTIFY)
                                retval = -EAGAIN;
                        else
-                                retval = -ERESTARTSYS;  
+                                retval = -ERESTARTSYS;
                        break;
                }
                if (!(port->flags & ASYNC_CLOSING) &&
@@ -1506,7 +1504,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
        port->flags |= ASYNC_NORMAL_ACTIVE;
        func_exit();
        return 0;
-}       
+}
 static int sx_open(struct tty_struct * tty, struct file * filp)
@@ -1526,7 +1524,7 @@ static int sx_open(struct tty_struct * tty, struct file * filp)
                func_exit();
                return -ENODEV;
        }
-        
        bp = &sx_board[board];
        port = sx_port + board * SX_NPORT + SX_PORT(tty->index);
        port->overrun = 0;
@@ -1557,7 +1555,7 @@ static int sx_open(struct tty_struct * tty, struct file * filp)
                func_enter();
                return error;
        }
-        
        if ((error = block_til_ready(tty, filp, port))) {
                func_enter();
                return error;
@@ -1574,7 +1572,7 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
        struct specialix_board *bp;
        unsigned long flags;
        unsigned long timeout;
-        
        func_enter();
        if (!port || sx_paranoia_check(port, tty->name, "close")) {
                func_exit();
@@ -1587,7 +1585,7 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
                func_exit();
                return;
        }
-        
        bp = port_Board(port);
        if ((tty->count == 1) && (port->count != 1)) {
                printk(KERN_ERR "sx%d: sx_close: bad port count;"
@@ -1607,7 +1605,7 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
        }
        port->flags |= ASYNC_CLOSING;
        /*
-         * Now we wait for the transmit buffer to clear; and we notify 
+         * Now we wait for the transmit buffer to clear; and we notify
         * the line discipline to only process XON/XOFF characters.
         */
        tty->closing = 1;
@@ -1681,7 +1679,7 @@ static void sx_close(struct tty_struct * tty, struct file * filp)
 }
-static int sx_write(struct tty_struct * tty, 
+static int sx_write(struct tty_struct * tty,
                    const unsigned char *buf, int count)
 {
        struct specialix_port *port = (struct specialix_port *)tty->driver_data;
@@ -1694,7 +1692,7 @@ static int sx_write(struct tty_struct * tty,
                func_exit();
                return 0;
        }
-        
        bp = port_Board(port);
        if (!tty || !port->xmit_buf || !tmp_buf) {
@@ -1824,7 +1822,7 @@ static int sx_chars_in_buffer(struct tty_struct *tty)
        struct specialix_port *port = (struct specialix_port *)tty->driver_data;
        func_enter();
-        
        if (sx_paranoia_check(port, tty->name, "sx_chars_in_buffer")) {
                func_exit();
                return 0;
@@ -1881,13 +1879,13 @@ static int sx_tiocmget(struct tty_struct *tty, struct file *file)
                port_No(port), status, sx_in (bp, CD186x_CAR));
        dprintk (SX_DEBUG_INIT, "sx_port = %p, port = %p\n", sx_port, port);
        if (SX_CRTSCTS(port->tty)) {
-                result  = /*   (status & MSVR_RTS) ? */ TIOCM_DTR /* : 0) */ 
+                result  = /*   (status & MSVR_RTS) ? */ TIOCM_DTR /* : 0) */
                          |   ((status & MSVR_DTR) ? TIOCM_RTS : 0)
                          |   ((status & MSVR_CD)  ? TIOCM_CAR : 0)
                          |/* ((status & MSVR_DSR) ? */ TIOCM_DSR /* : 0) */
                          |   ((status & MSVR_CTS) ? TIOCM_CTS : 0);
        } else {
-                result  = /*   (status & MSVR_RTS) ? */ TIOCM_RTS /* : 0) */ 
+                result  = /*   (status & MSVR_RTS) ? */ TIOCM_RTS /* : 0) */
                          |   ((status & MSVR_DTR) ? TIOCM_DTR : 0)
                          |   ((status & MSVR_CD)  ? TIOCM_CAR : 0)
                          |/* ((status & MSVR_DSR) ? */ TIOCM_DSR /* : 0) */
@@ -1955,7 +1953,7 @@ static inline void sx_send_break(struct specialix_port * port, unsigned long len
 {
        struct specialix_board *bp = port_Board(port);
        unsigned long flags;
-        
        func_enter();
        spin_lock_irqsave (&port->lock, flags);
@@ -1996,8 +1994,8 @@ static inline int sx_set_serial_info(struct specialix_port * port,
                func_enter();
                return -EFAULT;
        }
-        
-#if 0   
+#if 0
        if ((tmp.irq != bp->irq) ||
            (tmp.port != bp->base) ||
            (tmp.type != PORT_CIRRUS) ||
@@ -2008,12 +2006,12 @@ static inline int sx_set_serial_info(struct specialix_port * port,
                func_exit();
                return -EINVAL;
        }
-#endif  
+#endif
        change_speed = ((port->flags & ASYNC_SPD_MASK) !=
                        (tmp.flags & ASYNC_SPD_MASK));
        change_speed |= (tmp.custom_divisor != port->custom_divisor);
-        
        if (!capable(CAP_SYS_ADMIN)) {
                if ((tmp.close_delay != port->close_delay) ||
                    (tmp.closing_wait != port->closing_wait) ||
@@ -2045,7 +2043,7 @@ static inline int sx_get_serial_info(struct specialix_port * port,
 {
        struct serial_struct tmp;
        struct specialix_board *bp = port_Board(port);
-        
        func_enter();
        /*
@@ -2074,7 +2072,7 @@ static inline int sx_get_serial_info(struct specialix_port * port,
 }
-static int sx_ioctl(struct tty_struct * tty, struct file * filp, 
+static int sx_ioctl(struct tty_struct * tty, struct file * filp,
                    unsigned int cmd, unsigned long arg)
 {
        struct specialix_port *port = (struct specialix_port *)tty->driver_data;
@@ -2087,7 +2085,7 @@ static int sx_ioctl(struct tty_struct * tty, struct file * filp,
                func_exit();
                return -ENODEV;
        }
-        
        switch (cmd) {
         case TCSBRK:   /* SVID version: non-zero arg --> no break */
                retval = tty_check_change(tty);
@@ -2129,7 +2127,7 @@ static int sx_ioctl(struct tty_struct * tty, struct file * filp,
         case TIOCGSERIAL:
                 func_exit();
                return sx_get_serial_info(port, argp);
-         case TIOCSSERIAL:      
+         case TIOCSSERIAL:
                 func_exit();
                return sx_set_serial_info(port, argp);
         default:
@@ -2153,16 +2151,16 @@ static void sx_throttle(struct tty_struct * tty)
                func_exit();
                return;
        }
-        
        bp = port_Board(port);
-        
        /* Use DTR instead of RTS ! */
-        if (SX_CRTSCTS (tty)) 
+        if (SX_CRTSCTS (tty))
                port->MSVR &= ~MSVR_DTR;
        else {
                /* Auch!!! I think the system shouldn't call this then. */
                /* Or maybe we're supposed (allowed?) to do our side of hw
-                   handshake anyway, even when hardware handshake is off. 
+                   handshake anyway, even when hardware handshake is off.
                   When you see this in your logs, please report.... */
                printk (KERN_ERR "sx%d: Need to throttle, but can't (hardware hs is off)\n",
                         port_No (port));
@@ -2193,14 +2191,14 @@ static void sx_unthrottle(struct tty_struct * tty)
        unsigned long flags;
        func_enter();
-                                
        if (sx_paranoia_check(port, tty->name, "sx_unthrottle")) {
                func_exit();
                return;
        }
-        
        bp = port_Board(port);
-        
        spin_lock_irqsave(&port->lock, flags);
        /* XXXX Use DTR INSTEAD???? */
        if (SX_CRTSCTS(tty)) {
@@ -2234,14 +2232,14 @@ static void sx_stop(struct tty_struct * tty)
        unsigned long flags;
        func_enter();
-        
        if (sx_paranoia_check(port, tty->name, "sx_stop")) {
                func_exit();
                return;
        }
        bp = port_Board(port);
-        
        spin_lock_irqsave(&port->lock, flags);
        port->IER &= ~IER_TXRDY;
        spin_lock_irqsave(&bp->lock, flags);
@@ -2261,14 +2259,14 @@ static void sx_start(struct tty_struct * tty)
        unsigned long flags;
        func_enter();
-                                
        if (sx_paranoia_check(port, tty->name, "sx_start")) {
                func_exit();
                return;
        }
-        
        bp = port_Board(port);
-        
        spin_lock_irqsave(&port->lock, flags);
        if (port->xmit_cnt && port->xmit_buf && !(port->IER & IER_TXRDY)) {
                port->IER |= IER_TXRDY;
@@ -2290,13 +2288,13 @@ static void sx_start(struct tty_struct * tty)
 *
 *      serial interrupt routine -> (workqueue) ->
 *      do_sx_hangup() -> tty->hangup() -> sx_hangup()
- * 
+ *
 */
 static void do_sx_hangup(void *private_)
 {
        struct specialix_port   *port = (struct specialix_port *) private_;
        struct tty_struct       *tty;
-        
        func_enter();
        tty = port->tty;
@@ -2319,9 +2317,9 @@ static void sx_hangup(struct tty_struct * tty)
                func_exit();
                return;
        }
-        
        bp = port_Board(port);
-        
        sx_shutdown_port(bp, port);
        spin_lock_irqsave(&port->lock, flags);
        port->event = 0;
@@ -2346,10 +2344,10 @@ static void sx_set_termios(struct tty_struct * tty, struct termios * old_termios
        struct specialix_port *port = (struct specialix_port *)tty->driver_data;
        unsigned long flags;
        struct specialix_board  * bp;
-                                
        if (sx_paranoia_check(port, tty->name, "sx_set_termios"))
                return;
-        
        if (tty->termios->c_cflag == old_termios->c_cflag &&
            tty->termios->c_iflag == old_termios->c_iflag)
                return;
@@ -2420,7 +2418,7 @@ static int sx_init_drivers(void)
                func_exit();
                return 1;
        }
-        
        if (!(tmp_buf = (unsigned char *) get_zeroed_page(GFP_KERNEL))) {
                printk(KERN_ERR "sx: Couldn't get free page.\n");
                put_tty_driver(specialix_driver);
@@ -2457,7 +2455,7 @@ static int sx_init_drivers(void)
                init_waitqueue_head(&sx_port[i].close_wait);
                spin_lock_init(&sx_port[i].lock);
        }
-        
        func_exit();
        return 0;
 }
@@ -2472,8 +2470,8 @@ static void sx_release_drivers(void)
        func_exit();
 }
-/* 
+/*
- * This routine must be called by kernel at boot time 
+ * This routine must be called by kernel at boot time
 */
 static int __init specialix_init(void)
 {
@@ -2489,7 +2487,7 @@ static int __init specialix_init(void)
 #else
        printk (KERN_INFO "sx: DTR/RTS pin is RTS when CRTSCTS is on.\n");
 #endif
-        
        for (i = 0; i < SX_NBOARD; i++)
                sx_board[i].lock = SPIN_LOCK_UNLOCKED;
@@ -2498,7 +2496,7 @@ static int __init specialix_init(void)
                return -EIO;
        }
-        for (i = 0; i < SX_NBOARD; i++) 
+        for (i = 0; i < SX_NBOARD; i++)
                if (sx_board[i].base && !sx_probe(&sx_board[i]))
                        found++;
@@ -2512,8 +2510,8 @@ static int __init specialix_init(void)
                                i++;
                                continue;
                        }
-                        pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX, 
+                        pdev = pci_find_device (PCI_VENDOR_ID_SPECIALIX,
-                                                PCI_DEVICE_ID_SPECIALIX_IO8, 
+                                                PCI_DEVICE_ID_SPECIALIX_IO8,
                                                pdev);
                        if (!pdev) break;
@@ -2557,10 +2555,10 @@ module_param(sx_poll, int, 0);
 /*
 * You can setup up to 4 boards.
 * by specifying "iobase=0xXXX,0xXXX ..." as insmod parameter.
- * You should specify the IRQs too in that case "irq=....,...". 
+ * You should specify the IRQs too in that case "irq=....,...".
- * 
+ *
 * More than 4 boards in one computer is not possible, as the card can
- * only use 4 different interrupts. 
+ * only use 4 different interrupts.
 *
 */
 static int __init specialix_init_module(void)
@@ -2583,16 +2581,16 @@ static int __init specialix_init_module(void)
        return specialix_init();
 }
-        
 static void __exit specialix_exit_module(void)
 {
        int i;
-        
        func_enter();
        sx_release_drivers();
        for (i = 0; i < SX_NBOARD; i++)
-                if (sx_board[i].flags & SX_BOARD_PRESENT) 
+                if (sx_board[i].flags & SX_BOARD_PRESENT)
                        sx_release_io_range(&sx_board[i]);
 #ifdef SPECIALIX_TIMER
        del_timer (&missed_irq_timer);
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index ea2d54be4843..0133dc0e25d0 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -912,6 +912,7 @@ MODULE_DEVICE_TABLE(pci, synclink_pci_tbl);
 MODULE_LICENSE("GPL");
 static struct pci_driver synclink_pci_driver = {
+        .owner          = THIS_MODULE,
        .name           = "synclink",
        .id_table       = synclink_pci_tbl,
        .probe          = synclink_init_one,
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 6fb165cf8a61..f185724448b1 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -500,6 +500,7 @@ MODULE_DEVICE_TABLE(pci, synclinkmp_pci_tbl);
 MODULE_LICENSE("GPL");
 static struct pci_driver synclinkmp_pci_driver = {
+        .owner          = THIS_MODULE,
        .name           = "synclinkmp",
        .id_table       = synclinkmp_pci_tbl,
        .probe          = synclinkmp_init_one,
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
new file mode 100644
index 000000000000..18cdd4361dc6
--- /dev/null
+++ b/drivers/char/tlclk.c
@@ -0,0 +1,896 @@
+/*
+ * Telecom Clock driver for Intel NetStructure(tm) MPCBL0010
+ *
+ * Copyright (C) 2005 Kontron Canada
+ *
+ * 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 as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
+ * NON INFRINGEMENT.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Send feedback to <sebastien.bouchard@ca.kontron.com> and the current
+ * Maintainer  <mark.gross@intel.com>
+ *
+ * Description : This is the TELECOM CLOCK module driver for the ATCA
+ * MPCBL0010 ATCA computer.
+ */
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/sched.h>
+#include <linux/kernel.h>       /* printk() */
+#include <linux/fs.h>           /* everything... */
+#include <linux/errno.h>        /* error codes */
+#include <linux/delay.h>        /* udelay */
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+#include <linux/timer.h>
+#include <linux/sysfs.h>
+#include <linux/device.h>
+#include <linux/miscdevice.h>
+#include <asm/io.h>             /* inb/outb */
+#include <asm/uaccess.h>
+MODULE_AUTHOR("Sebastien Bouchard <sebastien.bouchard@ca.kontron.com>");
+MODULE_LICENSE("GPL");
+/*Hardware Reset of the PLL */
+#define RESET_ON        0x00
+#define RESET_OFF       0x01
+/* MODE SELECT */
+#define NORMAL_MODE     0x00
+#define HOLDOVER_MODE   0x10
+#define FREERUN_MODE    0x20
+/* FILTER SELECT */
+#define FILTER_6HZ      0x04
+#define FILTER_12HZ     0x00
+/* SELECT REFERENCE FREQUENCY */
+#define REF_CLK1_8kHz           0x00
+#define REF_CLK2_19_44MHz       0x02
+/* Select primary or secondary redundant clock */
+#define PRIMARY_CLOCK   0x00
+#define SECONDARY_CLOCK 0x01
+/* CLOCK TRANSMISSION DEFINE */
+#define CLK_8kHz        0xff
+#define CLK_16_384MHz   0xfb
+#define CLK_1_544MHz    0x00
+#define CLK_2_048MHz    0x01
+#define CLK_4_096MHz    0x02
+#define CLK_6_312MHz    0x03
+#define CLK_8_192MHz    0x04
+#define CLK_19_440MHz   0x06
+#define CLK_8_592MHz    0x08
+#define CLK_11_184MHz   0x09
+#define CLK_34_368MHz   0x0b
+#define CLK_44_736MHz   0x0a
+/* RECEIVED REFERENCE */
+#define AMC_B1 0
+#define AMC_B2 1
+/* HARDWARE SWITCHING DEFINE */
+#define HW_ENABLE       0x80
+#define HW_DISABLE      0x00
+/* HARDWARE SWITCHING MODE DEFINE */
+#define PLL_HOLDOVER    0x40
+#define LOST_CLOCK      0x00
+/* ALARMS DEFINE */
+#define UNLOCK_MASK     0x10
+#define HOLDOVER_MASK   0x20
+#define SEC_LOST_MASK   0x40
+#define PRI_LOST_MASK   0x80
+/* INTERRUPT CAUSE DEFINE */
+#define PRI_LOS_01_MASK         0x01
+#define PRI_LOS_10_MASK         0x02
+#define SEC_LOS_01_MASK         0x04
+#define SEC_LOS_10_MASK         0x08
+#define HOLDOVER_01_MASK        0x10
+#define HOLDOVER_10_MASK        0x20
+#define UNLOCK_01_MASK          0x40
+#define UNLOCK_10_MASK          0x80
+struct tlclk_alarms {
+        __u32 lost_clocks;
+        __u32 lost_primary_clock;
+        __u32 lost_secondary_clock;
+        __u32 primary_clock_back;
+        __u32 secondary_clock_back;
+        __u32 switchover_primary;
+        __u32 switchover_secondary;
+        __u32 pll_holdover;
+        __u32 pll_end_holdover;
+        __u32 pll_lost_sync;
+        __u32 pll_sync;
+};
+/* Telecom clock I/O register definition */
+#define TLCLK_BASE 0xa08
+#define TLCLK_REG0 TLCLK_BASE
+#define TLCLK_REG1 (TLCLK_BASE+1)
+#define TLCLK_REG2 (TLCLK_BASE+2)
+#define TLCLK_REG3 (TLCLK_BASE+3)
+#define TLCLK_REG4 (TLCLK_BASE+4)
+#define TLCLK_REG5 (TLCLK_BASE+5)
+#define TLCLK_REG6 (TLCLK_BASE+6)
+#define TLCLK_REG7 (TLCLK_BASE+7)
+#define SET_PORT_BITS(port, mask, val) outb(((inb(port) & mask) | val), port)
+/* 0 = Dynamic allocation of the major device number */
+#define TLCLK_MAJOR 0
+/* sysfs interface definition:
+Upon loading the driver will create a sysfs directory under
+/sys/devices/platform/telco_clock.
+This directory exports the following interfaces.  There operation is
+documented in the MCPBL0010 TPS under the Telecom Clock API section, 11.4.
+alarms                          :
+current_ref                     :
+enable_clk3a_output             :
+enable_clk3b_output             :
+enable_clka0_output             :
+enable_clka1_output             :
+enable_clkb0_output             :
+enable_clkb1_output             :
+filter_select                   :
+hardware_switching              :
+hardware_switching_mode         :
+interrupt_switch                :
+mode_select                     :
+refalign                        :
+reset                           :
+select_amcb1_transmit_clock     :
+select_amcb2_transmit_clock     :
+select_redundant_clock          :
+select_ref_frequency            :
+test_mode                       :
+All sysfs interfaces are integers in hex format, i.e echo 99 > refalign
+has the same effect as echo 0x99 > refalign.
+*/
+static unsigned int telclk_interrupt;
+static int int_events;          /* Event that generate a interrupt */
+static int got_event;           /* if events processing have been done */
+static void switchover_timeout(unsigned long data);
+static struct timer_list switchover_timer =
+        TIMER_INITIALIZER(switchover_timeout , 0, 0);
+static struct tlclk_alarms *alarm_events;
+static DEFINE_SPINLOCK(event_lock);
+static int tlclk_major = TLCLK_MAJOR;
+static irqreturn_t tlclk_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static DECLARE_WAIT_QUEUE_HEAD(wq);
+static int tlclk_open(struct inode *inode, struct file *filp)
+{
+        int result;
+        /* Make sure there is no interrupt pending while
+         * initialising interrupt handler */
+        inb(TLCLK_REG6);
+        /* This device is wired through the FPGA IO space of the ATCA blade
+         * we can't share this IRQ */
+        result = request_irq(telclk_interrupt, &tlclk_interrupt,
+                             SA_INTERRUPT, "telco_clock", tlclk_interrupt);
+        if (result == -EBUSY) {
+                printk(KERN_ERR "telco_clock: Interrupt can't be reserved!\n");
+                return -EBUSY;
+        }
+        inb(TLCLK_REG6);        /* Clear interrupt events */
+        return 0;
+}
+static int tlclk_release(struct inode *inode, struct file *filp)
+{
+        free_irq(telclk_interrupt, tlclk_interrupt);
+        return 0;
+}
+ssize_t tlclk_read(struct file *filp, char __user *buf, size_t count,
+                loff_t *f_pos)
+{
+        if (count < sizeof(struct tlclk_alarms))
+                return -EIO;
+        wait_event_interruptible(wq, got_event);
+        if (copy_to_user(buf, alarm_events, sizeof(struct tlclk_alarms)))
+                return -EFAULT;
+        memset(alarm_events, 0, sizeof(struct tlclk_alarms));
+        got_event = 0;
+        return  sizeof(struct tlclk_alarms);
+}
+ssize_t tlclk_write(struct file *filp, const char __user *buf, size_t count,
+            loff_t *f_pos)
+{
+        return 0;
+}
+static struct file_operations tlclk_fops = {
+        .read = tlclk_read,
+        .write = tlclk_write,
+        .open = tlclk_open,
+        .release = tlclk_release,
+};
+static struct miscdevice tlclk_miscdev = {
+        .minor = MISC_DYNAMIC_MINOR,
+        .name = "telco_clock",
+        .fops = &tlclk_fops,
+};
+static ssize_t show_current_ref(struct device *d,
+                struct device_attribute *attr, char *buf)
+{
+        unsigned long ret_val;
+        unsigned long flags;
+        spin_lock_irqsave(&event_lock, flags);
+        ret_val = ((inb(TLCLK_REG1) & 0x08) >> 3);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return sprintf(buf, "0x%lX\n", ret_val);
+}
+static DEVICE_ATTR(current_ref, S_IRUGO, show_current_ref, NULL);
+static ssize_t show_interrupt_switch(struct device *d,
+                struct device_attribute *attr, char *buf)
+{
+        unsigned long ret_val;
+        unsigned long flags;
+        spin_lock_irqsave(&event_lock, flags);
+        ret_val = inb(TLCLK_REG6);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return sprintf(buf, "0x%lX\n", ret_val);
+}
+static DEVICE_ATTR(interrupt_switch, S_IRUGO,
+                show_interrupt_switch, NULL);
+static ssize_t show_alarms(struct device *d,
+                struct device_attribute *attr,  char *buf)
+{
+        unsigned long ret_val;
+        unsigned long flags;
+        spin_lock_irqsave(&event_lock, flags);
+        ret_val = (inb(TLCLK_REG2) & 0xf0);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return sprintf(buf, "0x%lX\n", ret_val);
+}
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+static ssize_t store_enable_clk3b_output(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, ": tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG3, 0x7f, val << 7);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(enable_clk3b_output, S_IWUGO, NULL,
+                store_enable_clk3b_output);
+static ssize_t store_enable_clk3a_output(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long flags;
+        unsigned long tmp;
+        unsigned char val;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG3, 0xbf, val << 6);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(enable_clk3a_output, S_IWUGO, NULL,
+                store_enable_clk3a_output);
+static ssize_t store_enable_clkb1_output(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long flags;
+        unsigned long tmp;
+        unsigned char val;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG2, 0xf7, val << 3);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(enable_clkb1_output, S_IWUGO, NULL,
+                store_enable_clkb1_output);
+static ssize_t store_enable_clka1_output(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long flags;
+        unsigned long tmp;
+        unsigned char val;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG2, 0xfb, val << 2);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(enable_clka1_output, S_IWUGO, NULL,
+                store_enable_clka1_output);
+static ssize_t store_enable_clkb0_output(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long flags;
+        unsigned long tmp;
+        unsigned char val;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG2, 0xfd, val << 1);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(enable_clkb0_output, S_IWUGO, NULL,
+                store_enable_clkb0_output);
+static ssize_t store_enable_clka0_output(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long flags;
+        unsigned long tmp;
+        unsigned char val;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG2, 0xfe, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(enable_clka0_output, S_IWUGO, NULL,
+                store_enable_clka0_output);
+static ssize_t store_test_mode(struct device *d,
+                struct device_attribute *attr,  const char *buf, size_t count)
+{
+        unsigned long flags;
+        unsigned long tmp;
+        unsigned char val;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG4, 0xfd, 2);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(test_mode, S_IWUGO, NULL, store_test_mode);
+static ssize_t store_select_amcb2_transmit_clock(struct device *d,
+                struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long flags;
+        unsigned long tmp;
+        unsigned char val;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+                if ((val == CLK_8kHz) || (val == CLK_16_384MHz)) {
+                        SET_PORT_BITS(TLCLK_REG3, 0xc7, 0x28);
+                        SET_PORT_BITS(TLCLK_REG1, 0xfb, ~val);
+                } else if (val >= CLK_8_592MHz) {
+                        SET_PORT_BITS(TLCLK_REG3, 0xc7, 0x38);
+                        switch (val) {
+                        case CLK_8_592MHz:
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 1);
+                                break;
+                        case CLK_11_184MHz:
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 0);
+                                break;
+                        case CLK_34_368MHz:
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 3);
+                                break;
+                        case CLK_44_736MHz:
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 2);
+                                break;
+                        }
+                } else
+                        SET_PORT_BITS(TLCLK_REG3, 0xc7, val << 3);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(select_amcb2_transmit_clock, S_IWUGO, NULL,
+        store_select_amcb2_transmit_clock);
+static ssize_t store_select_amcb1_transmit_clock(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+                if ((val == CLK_8kHz) || (val == CLK_16_384MHz)) {
+                        SET_PORT_BITS(TLCLK_REG3, 0xf8, 0x5);
+                        SET_PORT_BITS(TLCLK_REG1, 0xfb, ~val);
+                } else if (val >= CLK_8_592MHz) {
+                        SET_PORT_BITS(TLCLK_REG3, 0xf8, 0x7);
+                        switch (val) {
+                        case CLK_8_592MHz:
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 1);
+                                break;
+                        case CLK_11_184MHz:
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 0);
+                                break;
+                        case CLK_34_368MHz:
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 3);
+                                break;
+                        case CLK_44_736MHz:
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 2);
+                                break;
+                        }
+                } else
+                        SET_PORT_BITS(TLCLK_REG3, 0xf8, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(select_amcb1_transmit_clock, S_IWUGO, NULL,
+                store_select_amcb1_transmit_clock);
+static ssize_t store_select_redundant_clock(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG1, 0xfe, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(select_redundant_clock, S_IWUGO, NULL,
+                store_select_redundant_clock);
+static ssize_t store_select_ref_frequency(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG1, 0xfd, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(select_ref_frequency, S_IWUGO, NULL,
+                store_select_ref_frequency);
+static ssize_t store_filter_select(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG0, 0xfb, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(filter_select, S_IWUGO, NULL, store_filter_select);
+static ssize_t store_hardware_switching_mode(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG0, 0xbf, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(hardware_switching_mode, S_IWUGO, NULL,
+                store_hardware_switching_mode);
+static ssize_t store_hardware_switching(struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG0, 0x7f, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(hardware_switching, S_IWUGO, NULL,
+                store_hardware_switching);
+static ssize_t store_refalign (struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG0, 0xf7, 0);
+        udelay(2);
+        SET_PORT_BITS(TLCLK_REG0, 0xf7, 0x08);
+        udelay(2);
+        SET_PORT_BITS(TLCLK_REG0, 0xf7, 0);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(refalign, S_IWUGO, NULL, store_refalign);
+static ssize_t store_mode_select (struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG0, 0xcf, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(mode_select, S_IWUGO, NULL, store_mode_select);
+static ssize_t store_reset (struct device *d,
+                 struct device_attribute *attr, const char *buf, size_t count)
+{
+        unsigned long tmp;
+        unsigned char val;
+        unsigned long flags;
+        sscanf(buf, "%lX", &tmp);
+        dev_dbg(d, "tmp = 0x%lX\n", tmp);
+        val = (unsigned char)tmp;
+        spin_lock_irqsave(&event_lock, flags);
+        SET_PORT_BITS(TLCLK_REG4, 0xfd, val);
+        spin_unlock_irqrestore(&event_lock, flags);
+        return strnlen(buf, count);
+}
+static DEVICE_ATTR(reset, S_IWUGO, NULL, store_reset);
+static struct attribute *tlclk_sysfs_entries[] = {
+        &dev_attr_current_ref.attr,
+        &dev_attr_interrupt_switch.attr,
+        &dev_attr_alarms.attr,
+        &dev_attr_enable_clk3a_output.attr,
+        &dev_attr_enable_clk3b_output.attr,
+        &dev_attr_enable_clkb1_output.attr,
+        &dev_attr_enable_clka1_output.attr,
+        &dev_attr_enable_clkb0_output.attr,
+        &dev_attr_enable_clka0_output.attr,
+        &dev_attr_test_mode.attr,
+        &dev_attr_select_amcb1_transmit_clock.attr,
+        &dev_attr_select_amcb2_transmit_clock.attr,
+        &dev_attr_select_redundant_clock.attr,
+        &dev_attr_select_ref_frequency.attr,
+        &dev_attr_filter_select.attr,
+        &dev_attr_hardware_switching_mode.attr,
+        &dev_attr_hardware_switching.attr,
+        &dev_attr_refalign.attr,
+        &dev_attr_mode_select.attr,
+        &dev_attr_reset.attr,
+        NULL
+};
+static struct attribute_group tlclk_attribute_group = {
+        .name = NULL,           /* put in device directory */
+        .attrs = tlclk_sysfs_entries,
+};
+static struct platform_device *tlclk_device;
+static int __init tlclk_init(void)
+{
+        int ret;
+        ret = register_chrdev(tlclk_major, "telco_clock", &tlclk_fops);
+        if (ret < 0) {
+                printk(KERN_ERR "telco_clock: can't get major! %d\n", tlclk_major);
+                return ret;
+        }
+        alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL);
+        if (!alarm_events)
+                goto out1;
+        /* Read telecom clock IRQ number (Set by BIOS) */
+        if (!request_region(TLCLK_BASE, 8, "telco_clock")) {
+                printk(KERN_ERR "tlclk: request_region failed! 0x%X\n",
+                        TLCLK_BASE);
+                ret = -EBUSY;
+                goto out2;
+        }
+        telclk_interrupt = (inb(TLCLK_REG7) & 0x0f);
+        if (0x0F == telclk_interrupt ) { /* not MCPBL0010 ? */
+                printk(KERN_ERR "telclk_interrup = 0x%x non-mcpbl0010 hw\n",
+                        telclk_interrupt);
+                ret = -ENXIO;
+                goto out3;
+        }
+        init_timer(&switchover_timer);
+        ret = misc_register(&tlclk_miscdev);
+        if (ret < 0) {
+                printk(KERN_ERR " misc_register retruns %d\n", ret);
+                ret = -EBUSY;
+                goto out3;
+        }
+        tlclk_device = platform_device_register_simple("telco_clock",
+                                -1, NULL, 0);
+        if (!tlclk_device) {
+                printk(KERN_ERR " platform_device_register retruns 0x%X\n",
+                        (unsigned int) tlclk_device);
+                ret = -EBUSY;
+                goto out4;
+        }
+        ret = sysfs_create_group(&tlclk_device->dev.kobj,
+                        &tlclk_attribute_group);
+        if (ret) {
+                printk(KERN_ERR "failed to create sysfs device attributes\n");
+                sysfs_remove_group(&tlclk_device->dev.kobj,
+                        &tlclk_attribute_group);
+                goto out5;
+        }
+        return 0;
+out5:
+        platform_device_unregister(tlclk_device);
+out4:
+        misc_deregister(&tlclk_miscdev);
+out3:
+        release_region(TLCLK_BASE, 8);
+out2:
+        kfree(alarm_events);
+out1:
+        unregister_chrdev(tlclk_major, "telco_clock");
+        return ret;
+}
+static void __exit tlclk_cleanup(void)
+{
+        sysfs_remove_group(&tlclk_device->dev.kobj, &tlclk_attribute_group);
+        platform_device_unregister(tlclk_device);
+        misc_deregister(&tlclk_miscdev);
+        unregister_chrdev(tlclk_major, "telco_clock");
+        release_region(TLCLK_BASE, 8);
+        del_timer_sync(&switchover_timer);
+        kfree(alarm_events);
+}
+static void switchover_timeout(unsigned long data)
+{
+        if ((data & 1)) {
+                if ((inb(TLCLK_REG1) & 0x08) != (data & 0x08))
+                        alarm_events->switchover_primary++;
+        } else {
+                if ((inb(TLCLK_REG1) & 0x08) != (data & 0x08))
+                        alarm_events->switchover_secondary++;
+        }
+        /* Alarm processing is done, wake up read task */
+        del_timer(&switchover_timer);
+        got_event = 1;
+        wake_up(&wq);
+}
+static irqreturn_t tlclk_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&event_lock, flags);
+        /* Read and clear interrupt events */
+        int_events = inb(TLCLK_REG6);
+        /* Primary_Los changed from 0 to 1 ? */
+        if (int_events & PRI_LOS_01_MASK) {
+                if (inb(TLCLK_REG2) & SEC_LOST_MASK)
+                        alarm_events->lost_clocks++;
+                else
+                        alarm_events->lost_primary_clock++;
+        }
+        /* Primary_Los changed from 1 to 0 ? */
+        if (int_events & PRI_LOS_10_MASK) {
+                alarm_events->primary_clock_back++;
+                SET_PORT_BITS(TLCLK_REG1, 0xFE, 1);
+        }
+        /* Secondary_Los changed from 0 to 1 ? */
+        if (int_events & SEC_LOS_01_MASK) {
+                if (inb(TLCLK_REG2) & PRI_LOST_MASK)
+                        alarm_events->lost_clocks++;
+                else
+                        alarm_events->lost_secondary_clock++;
+        }
+        /* Secondary_Los changed from 1 to 0 ? */
+        if (int_events & SEC_LOS_10_MASK) {
+                alarm_events->secondary_clock_back++;
+                SET_PORT_BITS(TLCLK_REG1, 0xFE, 0);
+        }
+        if (int_events & HOLDOVER_10_MASK)
+                alarm_events->pll_end_holdover++;
+        if (int_events & UNLOCK_01_MASK)
+                alarm_events->pll_lost_sync++;
+        if (int_events & UNLOCK_10_MASK)
+                alarm_events->pll_sync++;
+        /* Holdover changed from 0 to 1 ? */
+        if (int_events & HOLDOVER_01_MASK) {
+                alarm_events->pll_holdover++;
+                /* TIMEOUT in ~10ms */
+                switchover_timer.expires = jiffies + msecs_to_jiffies(10);
+                switchover_timer.data = inb(TLCLK_REG1);
+                add_timer(&switchover_timer);
+        } else {
+                got_event = 1;
+                wake_up(&wq);
+        }
+        spin_unlock_irqrestore(&event_lock, flags);
+        return IRQ_HANDLED;
+}
+module_init(tlclk_init);
+module_exit(tlclk_cleanup);
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 049d128ae7f0..303f15880466 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -64,7 +64,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
        if (count == 0)
                return -ENODATA;
        if (count > bufsiz) {
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                        "invalid count value %x %zx \n", count, bufsiz);
                return -E2BIG;
        }
@@ -72,21 +72,21 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
        down(&chip->tpm_mutex);
        if ((rc = chip->vendor->send(chip, (u8 *) buf, count)) < 0) {
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                        "tpm_transmit: tpm_send: error %zd\n", rc);
                goto out;
        }
        stop = jiffies + 2 * 60 * HZ;
        do {
-                u8 status = inb(chip->vendor->base + 1);
+                u8 status = chip->vendor->status(chip);
                if ((status & chip->vendor->req_complete_mask) ==
                    chip->vendor->req_complete_val) {
                        goto out_recv;
                }
                if ((status == chip->vendor->req_canceled)) {
-                        dev_err(&chip->pci_dev->dev, "Operation Canceled\n");
+                        dev_err(chip->dev, "Operation Canceled\n");
                        rc = -ECANCELED;
                        goto out;
                }
@@ -97,14 +97,14 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
        chip->vendor->cancel(chip);
-        dev_err(&chip->pci_dev->dev, "Operation Timed out\n");
+        dev_err(chip->dev, "Operation Timed out\n");
        rc = -ETIME;
        goto out;
 out_recv:
        rc = chip->vendor->recv(chip, (u8 *) buf, bufsiz);
        if (rc < 0)
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                        "tpm_transmit: tpm_recv: error %zd\n", rc);
 out:
        up(&chip->tpm_mutex);
@@ -139,15 +139,14 @@ ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
        __be32 index;
        char *str = buf;
-        struct tpm_chip *chip =
+        struct tpm_chip *chip = dev_get_drvdata(dev);
-            pci_get_drvdata(to_pci_dev(dev));
        if (chip == NULL)
                return -ENODEV;
        memcpy(data, cap_pcr, sizeof(cap_pcr));
        if ((len = tpm_transmit(chip, data, sizeof(data)))
            < CAP_PCR_RESULT_SIZE) {
-                dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred "
+                dev_dbg(chip->dev, "A TPM error (%d) occurred "
                                "attempting to determine the number of PCRS\n",
                        be32_to_cpu(*((__be32 *) (data + 6))));
                return 0;
@@ -161,9 +160,10 @@ ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
                memcpy(data + 10, &index, 4);
                if ((len = tpm_transmit(chip, data, sizeof(data)))
                    < READ_PCR_RESULT_SIZE){
-                        dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred"
+                        dev_dbg(chip->dev, "A TPM error (%d) occurred"
                                " attempting to read PCR %d of %d\n",
-                                be32_to_cpu(*((__be32 *) (data + 6))), i, num_pcrs);
+                                be32_to_cpu(*((__be32 *) (data + 6))),
+                                i, num_pcrs);
                        goto out;
                }
                str += sprintf(str, "PCR-%02d: ", i);
@@ -191,21 +191,19 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
        int i, rc;
        char *str = buf;
-        struct tpm_chip *chip =
+        struct tpm_chip *chip = dev_get_drvdata(dev);
-            pci_get_drvdata(to_pci_dev(dev));
        if (chip == NULL)
                return -ENODEV;
-        data = kmalloc(READ_PUBEK_RESULT_SIZE, GFP_KERNEL);
+        data = kzalloc(READ_PUBEK_RESULT_SIZE, GFP_KERNEL);
        if (!data)
                return -ENOMEM;
        memcpy(data, readpubek, sizeof(readpubek));
-        memset(data + sizeof(readpubek), 0, 20);        /* zero nonce */
        if ((len = tpm_transmit(chip, data, READ_PUBEK_RESULT_SIZE)) <
            READ_PUBEK_RESULT_SIZE) {
-                dev_dbg(&chip->pci_dev->dev, "A TPM error (%d) occurred "
+                dev_dbg(chip->dev, "A TPM error (%d) occurred "
                                "attempting to read the PUBEK\n",
                            be32_to_cpu(*((__be32 *) (data + 6))));
                rc = 0;
@@ -245,7 +243,6 @@ out:
        kfree(data);
        return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_show_pubek);
 #define CAP_VER_RESULT_SIZE 18
@@ -274,8 +271,7 @@ ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr,
        ssize_t len;
        char *str = buf;
-        struct tpm_chip *chip =
+        struct tpm_chip *chip = dev_get_drvdata(dev);
-            pci_get_drvdata(to_pci_dev(dev));
        if (chip == NULL)
                return -ENODEV;
@@ -315,7 +311,6 @@ ssize_t tpm_store_cancel(struct device *dev, struct device_attribute *attr,
 }
 EXPORT_SYMBOL_GPL(tpm_store_cancel);
 /*
 * Device file system interface to the TPM
 */
@@ -339,21 +334,20 @@ int tpm_open(struct inode *inode, struct file *file)
        }
        if (chip->num_opens) {
-                dev_dbg(&chip->pci_dev->dev,
+                dev_dbg(chip->dev, "Another process owns this TPM\n");
-                        "Another process owns this TPM\n");
                rc = -EBUSY;
                goto err_out;
        }
        chip->num_opens++;
-        pci_dev_get(chip->pci_dev);
+        get_device(chip->dev);
        spin_unlock(&driver_lock);
        chip->data_buffer = kmalloc(TPM_BUFSIZE * sizeof(u8), GFP_KERNEL);
        if (chip->data_buffer == NULL) {
                chip->num_opens--;
-                pci_dev_put(chip->pci_dev);
+                put_device(chip->dev);
                return -ENOMEM;
        }
@@ -366,7 +360,6 @@ err_out:
        spin_unlock(&driver_lock);
        return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_open);
 int tpm_release(struct inode *inode, struct file *file)
@@ -378,15 +371,14 @@ int tpm_release(struct inode *inode, struct file *file)
        chip->num_opens--;
        del_singleshot_timer_sync(&chip->user_read_timer);
        atomic_set(&chip->data_pending, 0);
-        pci_dev_put(chip->pci_dev);
+        put_device(chip->dev);
        kfree(chip->data_buffer);
        spin_unlock(&driver_lock);
        return 0;
 }
 EXPORT_SYMBOL_GPL(tpm_release);
-ssize_t tpm_write(struct file * file, const char __user * buf,
+ssize_t tpm_write(struct file *file, const char __user *buf,
                  size_t size, loff_t * off)
 {
        struct tpm_chip *chip = file->private_data;
@@ -422,7 +414,7 @@ ssize_t tpm_write(struct file * file, const char __user * buf,
 EXPORT_SYMBOL_GPL(tpm_write);
-ssize_t tpm_read(struct file * file, char __user * buf,
+ssize_t tpm_read(struct file * file, char __user *buf,
                 size_t size, loff_t * off)
 {
        struct tpm_chip *chip = file->private_data;
@@ -444,15 +436,14 @@ ssize_t tpm_read(struct file * file, char __user * buf,
        return ret_size;
 }
 EXPORT_SYMBOL_GPL(tpm_read);
-void __devexit tpm_remove(struct pci_dev *pci_dev)
+void tpm_remove_hardware(struct device *dev)
 {
-        struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+        struct tpm_chip *chip = dev_get_drvdata(dev);
        if (chip == NULL) {
-                dev_err(&pci_dev->dev, "No device data found\n");
+                dev_err(dev, "No device data found\n");
                return;
        }
@@ -462,22 +453,20 @@ void __devexit tpm_remove(struct pci_dev *pci_dev)
        spin_unlock(&driver_lock);
-        pci_set_drvdata(pci_dev, NULL);
+        dev_set_drvdata(dev, NULL);
        misc_deregister(&chip->vendor->miscdev);
        kfree(chip->vendor->miscdev.name);
-        sysfs_remove_group(&pci_dev->dev.kobj, chip->vendor->attr_group);
+        sysfs_remove_group(&dev->kobj, chip->vendor->attr_group);
-        pci_disable_device(pci_dev);
+        dev_mask[chip->dev_num / TPM_NUM_MASK_ENTRIES ] &=
+                !(1 << (chip->dev_num % TPM_NUM_MASK_ENTRIES));
-        dev_mask[chip->dev_num / TPM_NUM_MASK_ENTRIES ] &= !(1 << (chip->dev_num % TPM_NUM_MASK_ENTRIES));
        kfree(chip);
-        pci_dev_put(pci_dev);
+        put_device(dev);
 }
+EXPORT_SYMBOL_GPL(tpm_remove_hardware);
-EXPORT_SYMBOL_GPL(tpm_remove);
 static u8 savestate[] = {
        0, 193,                 /* TPM_TAG_RQU_COMMAND */
@@ -489,32 +478,30 @@ static u8 savestate[] = {
 * We are about to suspend. Save the TPM state
 * so that it can be restored.
 */
-int tpm_pm_suspend(struct pci_dev *pci_dev, pm_message_t pm_state)
+int tpm_pm_suspend(struct device *dev, pm_message_t pm_state)
 {
-        struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+        struct tpm_chip *chip = dev_get_drvdata(dev);
        if (chip == NULL)
                return -ENODEV;
        tpm_transmit(chip, savestate, sizeof(savestate));
        return 0;
 }
 EXPORT_SYMBOL_GPL(tpm_pm_suspend);
 /*
 * Resume from a power safe. The BIOS already restored
 * the TPM state.
 */
-int tpm_pm_resume(struct pci_dev *pci_dev)
+int tpm_pm_resume(struct device *dev)
 {
-        struct tpm_chip *chip = pci_get_drvdata(pci_dev);
+        struct tpm_chip *chip = dev_get_drvdata(dev);
        if (chip == NULL)
                return -ENODEV;
        return 0;
 }
 EXPORT_SYMBOL_GPL(tpm_pm_resume);
 /*
@@ -524,8 +511,7 @@ EXPORT_SYMBOL_GPL(tpm_pm_resume);
 * upon errant exit from this function specific probe function should call
 * pci_disable_device
 */
-int tpm_register_hardware(struct pci_dev *pci_dev,
+int tpm_register_hardware(struct device *dev, struct tpm_vendor_specific *entry)
-                          struct tpm_vendor_specific *entry)
 {
 #define DEVNAME_SIZE 7
@@ -534,12 +520,10 @@ int tpm_register_hardware(struct pci_dev *pci_dev,
        int i, j;
        /* Driver specific per-device data */
-        chip = kmalloc(sizeof(*chip), GFP_KERNEL);
+        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
        if (chip == NULL)
                return -ENOMEM;
-        memset(chip, 0, sizeof(struct tpm_chip));
        init_MUTEX(&chip->buffer_mutex);
        init_MUTEX(&chip->tpm_mutex);
        INIT_LIST_HEAD(&chip->list);
@@ -563,8 +547,7 @@ int tpm_register_hardware(struct pci_dev *pci_dev,
 dev_num_search_complete:
        if (chip->dev_num < 0) {
-                dev_err(&pci_dev->dev,
+                dev_err(dev, "No available tpm device numbers\n");
-                        "No available tpm device numbers\n");
                kfree(chip);
                return -ENODEV;
        } else if (chip->dev_num == 0)
@@ -576,15 +559,15 @@ dev_num_search_complete:
        scnprintf(devname, DEVNAME_SIZE, "%s%d", "tpm", chip->dev_num);
        chip->vendor->miscdev.name = devname;
-        chip->vendor->miscdev.dev = &(pci_dev->dev);
+        chip->vendor->miscdev.dev = dev;
-        chip->pci_dev = pci_dev_get(pci_dev);
+        chip->dev = get_device(dev);
        if (misc_register(&chip->vendor->miscdev)) {
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                        "unable to misc_register %s, minor %d\n",
                        chip->vendor->miscdev.name,
                        chip->vendor->miscdev.minor);
-                pci_dev_put(pci_dev);
+                put_device(dev);
                kfree(chip);
                dev_mask[i] &= !(1 << j);
                return -ENODEV;
@@ -592,17 +575,16 @@ dev_num_search_complete:
        spin_lock(&driver_lock);
-        pci_set_drvdata(pci_dev, chip);
+        dev_set_drvdata(dev, chip);
        list_add(&chip->list, &tpm_chip_list);
        spin_unlock(&driver_lock);
-        sysfs_create_group(&pci_dev->dev.kobj, chip->vendor->attr_group);
+        sysfs_create_group(&dev->kobj, chip->vendor->attr_group);
        return 0;
 }
 EXPORT_SYMBOL_GPL(tpm_register_hardware);
 MODULE_AUTHOR("Leendert van Doorn (leendert@watson.ibm.com)");
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 373b41f6b460..024814b50c3c 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -55,12 +55,13 @@ struct tpm_vendor_specific {
        int (*recv) (struct tpm_chip *, u8 *, size_t);
        int (*send) (struct tpm_chip *, u8 *, size_t);
        void (*cancel) (struct tpm_chip *);
+        u8 (*status) (struct tpm_chip *);
        struct miscdevice miscdev;
        struct attribute_group *attr_group;
 };
 struct tpm_chip {
-        struct pci_dev *pci_dev;        /* PCI device stuff */
+        struct device *dev;     /* Device stuff */
        int dev_num;            /* /dev/tpm# */
        int num_opens;          /* only one allowed */
@@ -91,13 +92,13 @@ static inline void tpm_write_index(int base, int index, int value)
        outb(value & 0xFF, base+1);
 }
-extern int tpm_register_hardware(struct pci_dev *,
+extern int tpm_register_hardware(struct device *,
                                 struct tpm_vendor_specific *);
 extern int tpm_open(struct inode *, struct file *);
 extern int tpm_release(struct inode *, struct file *);
 extern ssize_t tpm_write(struct file *, const char __user *, size_t,
                         loff_t *);
 extern ssize_t tpm_read(struct file *, char __user *, size_t, loff_t *);
-extern void __devexit tpm_remove(struct pci_dev *);
+extern void tpm_remove_hardware(struct device *);
-extern int tpm_pm_suspend(struct pci_dev *, pm_message_t);
+extern int tpm_pm_suspend(struct device *, pm_message_t);
-extern int tpm_pm_resume(struct pci_dev *);
+extern int tpm_pm_resume(struct device *);
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index c0d64914595f..8cb42e84723c 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -40,7 +40,7 @@ enum tpm_atmel_read_status {
        ATML_STATUS_READY = 0x08
 };
-static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
+static int tpm_atml_recv(struct tpm_chip *chip, u8 *buf, size_t count)
 {
        u8 status, *hdr = buf;
        u32 size;
@@ -54,7 +54,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
        for (i = 0; i < 6; i++) {
                status = inb(chip->vendor->base + 1);
                if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                "error reading header\n");
                        return -EIO;
                }
@@ -66,12 +66,12 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
        size = be32_to_cpu(*native_size);
        if (count < size) {
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                        "Recv size(%d) less than available space\n", size);
                for (; i < size; i++) { /* clear the waiting data anyway */
                        status = inb(chip->vendor->base + 1);
                        if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                                dev_err(&chip->pci_dev->dev,
+                                dev_err(chip->dev,
                                        "error reading data\n");
                                return -EIO;
                        }
@@ -83,7 +83,7 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
        for (; i < size; i++) {
                status = inb(chip->vendor->base + 1);
                if ((status & ATML_STATUS_DATA_AVAIL) == 0) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                "error reading data\n");
                        return -EIO;
                }
@@ -93,20 +93,20 @@ static int tpm_atml_recv(struct tpm_chip *chip, u8 * buf, size_t count)
        /* make sure data available is gone */
        status = inb(chip->vendor->base + 1);
        if (status & ATML_STATUS_DATA_AVAIL) {
-                dev_err(&chip->pci_dev->dev, "data available is stuck\n");
+                dev_err(chip->dev, "data available is stuck\n");
                return -EIO;
        }
        return size;
 }
-static int tpm_atml_send(struct tpm_chip *chip, u8 * buf, size_t count)
+static int tpm_atml_send(struct tpm_chip *chip, u8 *buf, size_t count)
 {
        int i;
-        dev_dbg(&chip->pci_dev->dev, "tpm_atml_send: ");
+        dev_dbg(chip->dev, "tpm_atml_send:\n");
        for (i = 0; i < count; i++) {
-                dev_dbg(&chip->pci_dev->dev, "0x%x(%d) ", buf[i], buf[i]);
+                dev_dbg(chip->dev, "%d 0x%x(%d)\n",  i, buf[i], buf[i]);
                outb(buf[i], chip->vendor->base);
        }
@@ -118,6 +118,11 @@ static void tpm_atml_cancel(struct tpm_chip *chip)
        outb(ATML_STATUS_ABORT, chip->vendor->base + 1);
 }
+static u8 tpm_atml_status(struct tpm_chip *chip)
+{
+        return inb(chip->vendor->base + 1);
+}
 static struct file_operations atmel_ops = {
        .owner = THIS_MODULE,
        .llseek = no_llseek,
@@ -137,7 +142,7 @@ static struct attribute* atmel_attrs[] = {
        &dev_attr_pcrs.attr,
        &dev_attr_caps.attr,
        &dev_attr_cancel.attr,
-        0,
+        NULL,
 };
 static struct attribute_group atmel_attr_grp = { .attrs = atmel_attrs };
@@ -146,6 +151,7 @@ static struct tpm_vendor_specific tpm_atmel = {
        .recv = tpm_atml_recv,
        .send = tpm_atml_send,
        .cancel = tpm_atml_cancel,
+        .status = tpm_atml_status,
        .req_complete_mask = ATML_STATUS_BUSY | ATML_STATUS_DATA_AVAIL,
        .req_complete_val = ATML_STATUS_DATA_AVAIL,
        .req_canceled = ATML_STATUS_READY,
@@ -153,86 +159,94 @@ static struct tpm_vendor_specific tpm_atmel = {
        .miscdev = { .fops = &atmel_ops, },
 };
-static int __devinit tpm_atml_init(struct pci_dev *pci_dev,
+static struct platform_device *pdev;
-                                   const struct pci_device_id *pci_id)
+static void __devexit tpm_atml_remove(struct device *dev)
+{
+        struct tpm_chip *chip = dev_get_drvdata(dev);
+        if (chip) {
+                release_region(chip->vendor->base, 2);
+                tpm_remove_hardware(chip->dev);
+        }
+}
+static struct device_driver atml_drv = {
+        .name = "tpm_atmel",
+        .bus = &platform_bus_type,
+        .owner = THIS_MODULE,
+        .suspend = tpm_pm_suspend,
+        .resume = tpm_pm_resume,
+};
+static int __init init_atmel(void)
 {
-        u8 version[4];
        int rc = 0;
        int lo, hi;
-        if (pci_enable_device(pci_dev))
+        driver_register(&atml_drv);
-                return -EIO;
        lo = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_LO);
        hi = tpm_read_index(TPM_ADDR, TPM_ATMEL_BASE_ADDR_HI);
        tpm_atmel.base = (hi<<8)|lo;
-        dev_dbg( &pci_dev->dev, "Operating with base: 0x%x\n", tpm_atmel.base);
        /* verify that it is an Atmel part */
        if (tpm_read_index(TPM_ADDR, 4) != 'A' || tpm_read_index(TPM_ADDR, 5) != 'T'
            || tpm_read_index(TPM_ADDR, 6) != 'M' || tpm_read_index(TPM_ADDR, 7) != 'L') {
-                rc = -ENODEV;
+                return -ENODEV;
-                goto out_err;
        }
-        /* query chip for its version number */
+        /* verify chip version number is 1.1 */
-        if ((version[0] = tpm_read_index(TPM_ADDR, 0x00)) != 0xFF) {
+        if (    (tpm_read_index(TPM_ADDR, 0x00) != 0x01) ||
-                version[1] = tpm_read_index(TPM_ADDR, 0x01);
+                (tpm_read_index(TPM_ADDR, 0x01) != 0x01 ))
-                version[2] = tpm_read_index(TPM_ADDR, 0x02);
+                return -ENODEV;
-                version[3] = tpm_read_index(TPM_ADDR, 0x03);
-        } else {
+        pdev = kzalloc(sizeof(struct platform_device), GFP_KERNEL);
-                dev_info(&pci_dev->dev, "version query failed\n");
+        if ( !pdev )
-                rc = -ENODEV;
+                return -ENOMEM;
-                goto out_err;
+        pdev->name = "tpm_atmel0";
+        pdev->id = -1;
+        pdev->num_resources = 0;
+        pdev->dev.release = tpm_atml_remove;
+        pdev->dev.driver = &atml_drv;
+        if ((rc = platform_device_register(pdev)) < 0) {
+                kfree(pdev);
+                pdev = NULL;
+                return rc;
        }
-        if ((rc = tpm_register_hardware(pci_dev, &tpm_atmel)) < 0)
+        if (request_region(tpm_atmel.base, 2, "tpm_atmel0") == NULL ) {
-                goto out_err;
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+                return -EBUSY;
+        }
-        dev_info(&pci_dev->dev,
+        if ((rc = tpm_register_hardware(&pdev->dev, &tpm_atmel)) < 0) {
-                 "Atmel TPM version %d.%d.%d.%d\n", version[0], version[1],
+                release_region(tpm_atmel.base, 2);
-                 version[2], version[3]);
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+                return rc;
+        }
+        dev_info(&pdev->dev, "Atmel TPM 1.1, Base Address: 0x%x\n",
+                        tpm_atmel.base);
        return 0;
-out_err:
-        pci_disable_device(pci_dev);
-        return rc;
-}
-static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
-        {PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6LPC)},
-        {0,}
-};
-MODULE_DEVICE_TABLE(pci, tpm_pci_tbl);
-static struct pci_driver atmel_pci_driver = {
-        .name = "tpm_atmel",
-        .id_table = tpm_pci_tbl,
-        .probe = tpm_atml_init,
-        .remove = __devexit_p(tpm_remove),
-        .suspend = tpm_pm_suspend,
-        .resume = tpm_pm_resume,
-};
-static int __init init_atmel(void)
-{
-        return pci_register_driver(&atmel_pci_driver);
 }
 static void __exit cleanup_atmel(void)
 {
-        pci_unregister_driver(&atmel_pci_driver);
+        if (pdev) {
+                tpm_atml_remove(&pdev->dev);
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+        }
+        driver_unregister(&atml_drv);
 }
 module_init(init_atmel);
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 939e51e119e6..8198dbb7370f 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -5,6 +5,7 @@
 * Specifications at www.trustedcomputinggroup.org
 *
 * Copyright (C) 2005, Marcel Selhorst <selhorst@crypto.rub.de>
+ * Sirrix AG - security technologies, http://www.sirrix.com and
 * Applied Data Security Group, Ruhr-University Bochum, Germany
 * Project-Homepage: http://www.prosec.rub.de/tpm
 *
@@ -29,9 +30,10 @@
 #define TPM_INFINEON_DEV_VEN_VALUE      0x15D1
 /* These values will be filled after PnP-call */
-static int TPM_INF_DATA = 0;
+static int TPM_INF_DATA;
-static int TPM_INF_ADDR = 0;
+static int TPM_INF_ADDR;
-static int pnp_registered = 0;
+static int TPM_INF_BASE;
+static int TPM_INF_PORT_LEN;
 /* TPM header definitions */
 enum infineon_tpm_header {
@@ -143,11 +145,9 @@ static int wait(struct tpm_chip *chip, int wait_for_bit)
        }
        if (i == TPM_MAX_TRIES) {       /* timeout occurs */
                if (wait_for_bit == STAT_XFE)
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev, "Timeout in wait(STAT_XFE)\n");
-                                "Timeout in wait(STAT_XFE)\n");
                if (wait_for_bit == STAT_RDA)
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev, "Timeout in wait(STAT_RDA)\n");
-                                "Timeout in wait(STAT_RDA)\n");
                return -EIO;
        }
        return 0;
@@ -170,7 +170,7 @@ static void wait_and_send(struct tpm_chip *chip, u8 sendbyte)
 static void tpm_wtx(struct tpm_chip *chip)
 {
        number_of_wtx++;
-        dev_info(&chip->pci_dev->dev, "Granting WTX (%02d / %02d)\n",
+        dev_info(chip->dev, "Granting WTX (%02d / %02d)\n",
                 number_of_wtx, TPM_MAX_WTX_PACKAGES);
        wait_and_send(chip, TPM_VL_VER);
        wait_and_send(chip, TPM_CTRL_WTX);
@@ -181,7 +181,7 @@ static void tpm_wtx(struct tpm_chip *chip)
 static void tpm_wtx_abort(struct tpm_chip *chip)
 {
-        dev_info(&chip->pci_dev->dev, "Aborting WTX\n");
+        dev_info(chip->dev, "Aborting WTX\n");
        wait_and_send(chip, TPM_VL_VER);
        wait_and_send(chip, TPM_CTRL_WTX_ABORT);
        wait_and_send(chip, 0x00);
@@ -206,7 +206,7 @@ recv_begin:
        }
        if (buf[0] != TPM_VL_VER) {
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                        "Wrong transport protocol implementation!\n");
                return -EIO;
        }
@@ -221,8 +221,7 @@ recv_begin:
                }
                if ((size == 0x6D00) && (buf[1] == 0x80)) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev, "Error handling on vendor layer!\n");
-                                "Error handling on vendor layer!\n");
                        return -EIO;
                }
@@ -234,7 +233,7 @@ recv_begin:
        }
        if (buf[1] == TPM_CTRL_WTX) {
-                dev_info(&chip->pci_dev->dev, "WTX-package received\n");
+                dev_info(chip->dev, "WTX-package received\n");
                if (number_of_wtx < TPM_MAX_WTX_PACKAGES) {
                        tpm_wtx(chip);
                        goto recv_begin;
@@ -245,14 +244,14 @@ recv_begin:
        }
        if (buf[1] == TPM_CTRL_WTX_ABORT_ACK) {
-                dev_info(&chip->pci_dev->dev, "WTX-abort acknowledged\n");
+                dev_info(chip->dev, "WTX-abort acknowledged\n");
                return size;
        }
        if (buf[1] == TPM_CTRL_ERROR) {
-                dev_err(&chip->pci_dev->dev, "ERROR-package received:\n");
+                dev_err(chip->dev, "ERROR-package received:\n");
                if (buf[4] == TPM_INF_NAK)
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                "-> Negative acknowledgement"
                                " - retransmit command!\n");
                return -EIO;
@@ -271,7 +270,7 @@ static int tpm_inf_send(struct tpm_chip *chip, u8 * buf, size_t count)
        ret = empty_fifo(chip, 1);
        if (ret) {
-                dev_err(&chip->pci_dev->dev, "Timeout while clearing FIFO\n");
+                dev_err(chip->dev, "Timeout while clearing FIFO\n");
                return -EIO;
        }
@@ -316,6 +315,11 @@ static void tpm_inf_cancel(struct tpm_chip *chip)
         */
 }
+static u8 tpm_inf_status(struct tpm_chip *chip)
+{
+        return inb(chip->vendor->base + STAT);
+}
 static DEVICE_ATTR(pubek, S_IRUGO, tpm_show_pubek, NULL);
 static DEVICE_ATTR(pcrs, S_IRUGO, tpm_show_pcrs, NULL);
 static DEVICE_ATTR(caps, S_IRUGO, tpm_show_caps, NULL);
@@ -344,6 +348,7 @@ static struct tpm_vendor_specific tpm_inf = {
        .recv = tpm_inf_recv,
        .send = tpm_inf_send,
        .cancel = tpm_inf_cancel,
+        .status = tpm_inf_status,
        .req_complete_mask = 0,
        .req_complete_val = 0,
        .attr_group = &inf_attr_grp,
@@ -356,30 +361,11 @@ static const struct pnp_device_id tpm_pnp_tbl[] = {
        {"IFX0102", 0},
        {"", 0}
 };
 MODULE_DEVICE_TABLE(pnp, tpm_pnp_tbl);
 static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,
-                                        const struct pnp_device_id *dev_id)
+                                       const struct pnp_device_id *dev_id)
-{
-        if (pnp_port_valid(dev, 0)) {
-                TPM_INF_ADDR = (pnp_port_start(dev, 0) & 0xff);
-                TPM_INF_DATA = ((TPM_INF_ADDR + 1) & 0xff);
-                tpm_inf.base = pnp_port_start(dev, 1);
-                dev_info(&dev->dev, "Found %s with ID %s\n",
-                dev->name, dev_id->id);
-                return 0;
-        }
-        return -ENODEV;
-}
-static struct pnp_driver tpm_inf_pnp = {
-        .name = "tpm_inf_pnp",
-        .id_table = tpm_pnp_tbl,
-        .probe = tpm_inf_pnp_probe,
-};
-static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
-                                   const struct pci_device_id *pci_id)
 {
        int rc = 0;
        u8 iol, ioh;
@@ -388,30 +374,28 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
        int productid[2];
        char chipname[20];
-        rc = pci_enable_device(pci_dev);
+        /* read IO-ports through PnP */
-        if (rc)
+        if (pnp_port_valid(dev, 0) && pnp_port_valid(dev, 1) &&
-                return rc;
+            !(pnp_port_flags(dev, 0) & IORESOURCE_DISABLED)) {
+                TPM_INF_ADDR = pnp_port_start(dev, 0);
-        dev_info(&pci_dev->dev, "LPC-bus found at 0x%x\n", pci_id->device);
+                TPM_INF_DATA = (TPM_INF_ADDR + 1);
+                TPM_INF_BASE = pnp_port_start(dev, 1);
-        /* read IO-ports from PnP */
+                TPM_INF_PORT_LEN = pnp_port_len(dev, 1);
-        rc = pnp_register_driver(&tpm_inf_pnp);
+                if (!TPM_INF_PORT_LEN)
-        if (rc < 0) {
+                        return -EINVAL;
-                dev_err(&pci_dev->dev,
+                dev_info(&dev->dev, "Found %s with ID %s\n",
-                        "Error %x from pnp_register_driver!\n",rc);
+                         dev->name, dev_id->id);
-                goto error2;
+                if (!((TPM_INF_BASE >> 8) & 0xff))
-        }
+                        return -EINVAL;
-        if (!rc) {
+                /* publish my base address and request region */
-                dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+                tpm_inf.base = TPM_INF_BASE;
-                goto error;
+                if (request_region
+                    (tpm_inf.base, TPM_INF_PORT_LEN, "tpm_infineon0") == NULL) {
+                        release_region(tpm_inf.base, TPM_INF_PORT_LEN);
+                        return -EINVAL;
+                }
        } else {
-                pnp_registered = 1;
+                return -EINVAL;
-        }
-        /* Make sure, we have received valid config ports */
-        if (!TPM_INF_ADDR) {
-                dev_err(&pci_dev->dev, "No valid IO-ports received!\n");
-                goto error;
        }
        /* query chip for its vendor, its version number a.s.o. */
@@ -443,10 +427,6 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
        if ((vendorid[0] << 8 | vendorid[1]) == (TPM_INFINEON_DEV_VEN_VALUE)) {
-                if (tpm_inf.base == 0) {
-                        dev_err(&pci_dev->dev, "No IO-ports found!\n");
-                        goto error;
-                }
                /* configure TPM with IO-ports */
                outb(IOLIMH, TPM_INF_ADDR);
                outb(((tpm_inf.base >> 8) & 0xff), TPM_INF_DATA);
@@ -460,10 +440,11 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                iol = inb(TPM_INF_DATA);
                if ((ioh << 8 | iol) != tpm_inf.base) {
-                        dev_err(&pci_dev->dev,
+                        dev_err(&dev->dev,
                                "Could not set IO-ports to %04x\n",
                                tpm_inf.base);
-                        goto error;
+                        release_region(tpm_inf.base, TPM_INF_PORT_LEN);
+                        return -EIO;
                }
                /* activate register */
@@ -475,7 +456,7 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                outb(RESET_LP_IRQC_DISABLE, tpm_inf.base + CMD);
                /* Finally, we're done, print some infos */
-                dev_info(&pci_dev->dev, "TPM found: "
+                dev_info(&dev->dev, "TPM found: "
                         "config base 0x%x, "
                         "io base 0x%x, "
                         "chip version %02x%02x, "
@@ -483,59 +464,53 @@ static int __devinit tpm_inf_probe(struct pci_dev *pci_dev,
                         "product id %02x%02x"
                         "%s\n",
                         TPM_INF_ADDR,
-                         tpm_inf.base,
+                         TPM_INF_BASE,
                         version[0], version[1],
                         vendorid[0], vendorid[1],
                         productid[0], productid[1], chipname);
-                rc = tpm_register_hardware(pci_dev, &tpm_inf);
+                rc = tpm_register_hardware(&dev->dev, &tpm_inf);
-                if (rc < 0)
+                if (rc < 0) {
-                        goto error;
+                        release_region(tpm_inf.base, TPM_INF_PORT_LEN);
+                        return -ENODEV;
+                }
                return 0;
        } else {
-                dev_info(&pci_dev->dev, "No Infineon TPM found!\n");
+                dev_info(&dev->dev, "No Infineon TPM found!\n");
-error:
-                pnp_unregister_driver(&tpm_inf_pnp);
-error2:
-                pci_disable_device(pci_dev);
-                pnp_registered = 0;
                return -ENODEV;
        }
 }
-static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
+static __devexit void tpm_inf_pnp_remove(struct pnp_dev *dev)
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
+{
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
+        struct tpm_chip *chip = pnp_get_drvdata(dev);
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_2)},
-        {0,}
-};
-MODULE_DEVICE_TABLE(pci, tpm_pci_tbl);
+        if (chip) {
+                release_region(chip->vendor->base, TPM_INF_PORT_LEN);
+                tpm_remove_hardware(chip->dev);
+        }
+}
-static struct pci_driver inf_pci_driver = {
+static struct pnp_driver tpm_inf_pnp = {
-        .name = "tpm_inf",
+        .name = "tpm_inf_pnp",
-        .id_table = tpm_pci_tbl,
+        .driver = {
-        .probe = tpm_inf_probe,
+                .owner = THIS_MODULE,
-        .remove = __devexit_p(tpm_remove),
+                .suspend = tpm_pm_suspend,
-        .suspend = tpm_pm_suspend,
+                .resume = tpm_pm_resume,
-        .resume = tpm_pm_resume,
+        },
+        .id_table = tpm_pnp_tbl,
+        .probe = tpm_inf_pnp_probe,
+        .remove = tpm_inf_pnp_remove,
 };
 static int __init init_inf(void)
 {
-        return pci_register_driver(&inf_pci_driver);
+        return pnp_register_driver(&tpm_inf_pnp);
 }
 static void __exit cleanup_inf(void)
 {
-        if (pnp_registered)
+        pnp_unregister_driver(&tpm_inf_pnp);
-                pnp_unregister_driver(&tpm_inf_pnp);
-        pci_unregister_driver(&inf_pci_driver);
 }
 module_init(init_inf);
@@ -543,5 +518,5 @@ module_exit(cleanup_inf);
 MODULE_AUTHOR("Marcel Selhorst <selhorst@crypto.rub.de>");
 MODULE_DESCRIPTION("Driver for Infineon TPM SLD 9630 TT 1.1 / SLB 9635 TT 1.2");
-MODULE_VERSION("1.5");
+MODULE_VERSION("1.6");
 MODULE_LICENSE("GPL");
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c
index b4127348c063..253871b5b1e2 100644
--- a/drivers/char/tpm/tpm_nsc.c
+++ b/drivers/char/tpm/tpm_nsc.c
@@ -111,7 +111,7 @@ static int nsc_wait_for_ready(struct tpm_chip *chip)
        }
        while (time_before(jiffies, stop));
-        dev_info(&chip->pci_dev->dev, "wait for ready failed\n");
+        dev_info(chip->dev, "wait for ready failed\n");
        return -EBUSY;
 }
@@ -127,12 +127,12 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
                return -EIO;
        if (wait_for_stat(chip, NSC_STATUS_F0, NSC_STATUS_F0, &data) < 0) {
-                dev_err(&chip->pci_dev->dev, "F0 timeout\n");
+                dev_err(chip->dev, "F0 timeout\n");
                return -EIO;
        }
        if ((data =
             inb(chip->vendor->base + NSC_DATA)) != NSC_COMMAND_NORMAL) {
-                dev_err(&chip->pci_dev->dev, "not in normal mode (0x%x)\n",
+                dev_err(chip->dev, "not in normal mode (0x%x)\n",
                        data);
                return -EIO;
        }
@@ -141,7 +141,7 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
        for (p = buffer; p < &buffer[count]; p++) {
                if (wait_for_stat
                    (chip, NSC_STATUS_OBF, NSC_STATUS_OBF, &data) < 0) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                "OBF timeout (while reading data)\n");
                        return -EIO;
                }
@@ -152,11 +152,11 @@ static int tpm_nsc_recv(struct tpm_chip *chip, u8 * buf, size_t count)
        if ((data & NSC_STATUS_F0) == 0 &&
        (wait_for_stat(chip, NSC_STATUS_F0, NSC_STATUS_F0, &data) < 0)) {
-                dev_err(&chip->pci_dev->dev, "F0 not set\n");
+                dev_err(chip->dev, "F0 not set\n");
                return -EIO;
        }
        if ((data = inb(chip->vendor->base + NSC_DATA)) != NSC_COMMAND_EOC) {
-                dev_err(&chip->pci_dev->dev,
+                dev_err(chip->dev,
                        "expected end of command(0x%x)\n", data);
                return -EIO;
        }
@@ -187,19 +187,19 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
                return -EIO;
        if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
-                dev_err(&chip->pci_dev->dev, "IBF timeout\n");
+                dev_err(chip->dev, "IBF timeout\n");
                return -EIO;
        }
        outb(NSC_COMMAND_NORMAL, chip->vendor->base + NSC_COMMAND);
        if (wait_for_stat(chip, NSC_STATUS_IBR, NSC_STATUS_IBR, &data) < 0) {
-                dev_err(&chip->pci_dev->dev, "IBR timeout\n");
+                dev_err(chip->dev, "IBR timeout\n");
                return -EIO;
        }
        for (i = 0; i < count; i++) {
                if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
-                        dev_err(&chip->pci_dev->dev,
+                        dev_err(chip->dev,
                                "IBF timeout (while writing data)\n");
                        return -EIO;
                }
@@ -207,7 +207,7 @@ static int tpm_nsc_send(struct tpm_chip *chip, u8 * buf, size_t count)
        }
        if (wait_for_stat(chip, NSC_STATUS_IBF, 0, &data) < 0) {
-                dev_err(&chip->pci_dev->dev, "IBF timeout\n");
+                dev_err(chip->dev, "IBF timeout\n");
                return -EIO;
        }
        outb(NSC_COMMAND_EOC, chip->vendor->base + NSC_COMMAND);
@@ -220,6 +220,11 @@ static void tpm_nsc_cancel(struct tpm_chip *chip)
        outb(NSC_COMMAND_CANCEL, chip->vendor->base + NSC_COMMAND);
 }
+static u8 tpm_nsc_status(struct tpm_chip *chip)
+{
+        return inb(chip->vendor->base + NSC_STATUS);
+}
 static struct file_operations nsc_ops = {
        .owner = THIS_MODULE,
        .llseek = no_llseek,
@@ -239,7 +244,7 @@ static struct attribute * nsc_attrs[] = {
        &dev_attr_pcrs.attr,
        &dev_attr_caps.attr,
        &dev_attr_cancel.attr,
-        0,
+        NULL,
 };
 static struct attribute_group nsc_attr_grp = { .attrs = nsc_attrs };
@@ -248,6 +253,7 @@ static struct tpm_vendor_specific tpm_nsc = {
        .recv = tpm_nsc_recv,
        .send = tpm_nsc_send,
        .cancel = tpm_nsc_cancel,
+        .status = tpm_nsc_status,
        .req_complete_mask = NSC_STATUS_OBF,
        .req_complete_val = NSC_STATUS_OBF,
        .req_canceled = NSC_STATUS_RDY,
@@ -255,16 +261,32 @@ static struct tpm_vendor_specific tpm_nsc = {
        .miscdev = { .fops = &nsc_ops, },
 };
-static int __devinit tpm_nsc_init(struct pci_dev *pci_dev,
+static struct platform_device *pdev = NULL;
-                                  const struct pci_device_id *pci_id)
+static void __devexit tpm_nsc_remove(struct device *dev)
+{
+        struct tpm_chip *chip = dev_get_drvdata(dev);
+        if ( chip ) {
+                release_region(chip->vendor->base, 2);
+                tpm_remove_hardware(chip->dev);
+        }
+}
+static struct device_driver nsc_drv = {
+        .name = "tpm_nsc",
+        .bus = &platform_bus_type,
+        .owner = THIS_MODULE,
+        .suspend = tpm_pm_suspend,
+        .resume = tpm_pm_resume,
+};
+static int __init init_nsc(void)
 {
        int rc = 0;
        int lo, hi;
        int nscAddrBase = TPM_ADDR;
+        driver_register(&nsc_drv);
-        if (pci_enable_device(pci_dev))
-                return -EIO;
        /* select PM channel 1 */
        tpm_write_index(nscAddrBase,NSC_LDN_INDEX, 0x12);
@@ -273,37 +295,71 @@ static int __devinit tpm_nsc_init(struct pci_dev *pci_dev,
        if (tpm_read_index(TPM_ADDR, NSC_SID_INDEX) != 0xEF) {
                nscAddrBase = (tpm_read_index(TPM_SUPERIO_ADDR, 0x2C)<<8)|
                        (tpm_read_index(TPM_SUPERIO_ADDR, 0x2B)&0xFE);
-                if (tpm_read_index(nscAddrBase, NSC_SID_INDEX) != 0xF6) {
+                if (tpm_read_index(nscAddrBase, NSC_SID_INDEX) != 0xF6)
-                        rc = -ENODEV;
+                        return -ENODEV;
-                        goto out_err;
-                }
        }
        hi = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_HI);
        lo = tpm_read_index(nscAddrBase, TPM_NSC_BASE0_LO);
        tpm_nsc.base = (hi<<8) | lo;
-        dev_dbg(&pci_dev->dev, "NSC TPM detected\n");
+        /* enable the DPM module */
-        dev_dbg(&pci_dev->dev,
+        tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01);
+        pdev = kmalloc(sizeof(struct platform_device), GFP_KERNEL);
+        if ( !pdev )
+                return -ENOMEM;
+        memset(pdev, 0, sizeof(struct platform_device));
+        pdev->name = "tpm_nscl0";
+        pdev->id = -1;
+        pdev->num_resources = 0;
+        pdev->dev.release = tpm_nsc_remove;
+        pdev->dev.driver = &nsc_drv;
+        if ((rc=platform_device_register(pdev)) < 0) {
+                kfree(pdev);
+                pdev = NULL;
+                return rc;
+        }
+        if (request_region(tpm_nsc.base, 2, "tpm_nsc0") == NULL ) {
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+                return -EBUSY;
+        }
+        if ((rc = tpm_register_hardware(&pdev->dev, &tpm_nsc)) < 0) {
+                release_region(tpm_nsc.base, 2);
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+                return rc;
+        }
+        dev_dbg(&pdev->dev, "NSC TPM detected\n");
+        dev_dbg(&pdev->dev,
                "NSC LDN 0x%x, SID 0x%x, SRID 0x%x\n",
                tpm_read_index(nscAddrBase,0x07), tpm_read_index(nscAddrBase,0x20),
                tpm_read_index(nscAddrBase,0x27));
-        dev_dbg(&pci_dev->dev,
+        dev_dbg(&pdev->dev,
                "NSC SIOCF1 0x%x SIOCF5 0x%x SIOCF6 0x%x SIOCF8 0x%x\n",
                tpm_read_index(nscAddrBase,0x21), tpm_read_index(nscAddrBase,0x25),
                tpm_read_index(nscAddrBase,0x26), tpm_read_index(nscAddrBase,0x28));
-        dev_dbg(&pci_dev->dev, "NSC IO Base0 0x%x\n",
+        dev_dbg(&pdev->dev, "NSC IO Base0 0x%x\n",
                (tpm_read_index(nscAddrBase,0x60) << 8) | tpm_read_index(nscAddrBase,0x61));
-        dev_dbg(&pci_dev->dev, "NSC IO Base1 0x%x\n",
+        dev_dbg(&pdev->dev, "NSC IO Base1 0x%x\n",
                (tpm_read_index(nscAddrBase,0x62) << 8) | tpm_read_index(nscAddrBase,0x63));
-        dev_dbg(&pci_dev->dev, "NSC Interrupt number and wakeup 0x%x\n",
+        dev_dbg(&pdev->dev, "NSC Interrupt number and wakeup 0x%x\n",
                tpm_read_index(nscAddrBase,0x70));
-        dev_dbg(&pci_dev->dev, "NSC IRQ type select 0x%x\n",
+        dev_dbg(&pdev->dev, "NSC IRQ type select 0x%x\n",
                tpm_read_index(nscAddrBase,0x71));
-        dev_dbg(&pci_dev->dev,
+        dev_dbg(&pdev->dev,
                "NSC DMA channel select0 0x%x, select1 0x%x\n",
                tpm_read_index(nscAddrBase,0x74), tpm_read_index(nscAddrBase,0x75));
-        dev_dbg(&pci_dev->dev,
+        dev_dbg(&pdev->dev,
                "NSC Config "
                "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n",
                tpm_read_index(nscAddrBase,0xF0), tpm_read_index(nscAddrBase,0xF1),
@@ -312,55 +368,23 @@ static int __devinit tpm_nsc_init(struct pci_dev *pci_dev,
                tpm_read_index(nscAddrBase,0xF6), tpm_read_index(nscAddrBase,0xF7),
                tpm_read_index(nscAddrBase,0xF8), tpm_read_index(nscAddrBase,0xF9));
-        dev_info(&pci_dev->dev,
+        dev_info(&pdev->dev,
                 "NSC TPM revision %d\n",
                 tpm_read_index(nscAddrBase, 0x27) & 0x1F);
-        /* enable the DPM module */
-        tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01);
-        if ((rc = tpm_register_hardware(pci_dev, &tpm_nsc)) < 0)
-                goto out_err;
        return 0;
-out_err:
-        pci_disable_device(pci_dev);
-        return rc;
-}
-static struct pci_device_id tpm_pci_tbl[] __devinitdata = {
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_12)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1)},
-        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0)},
-        {PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_LPC)},
-        {0,}
-};
-MODULE_DEVICE_TABLE(pci, tpm_pci_tbl);
-static struct pci_driver nsc_pci_driver = {
-        .name = "tpm_nsc",
-        .id_table = tpm_pci_tbl,
-        .probe = tpm_nsc_init,
-        .remove = __devexit_p(tpm_remove),
-        .suspend = tpm_pm_suspend,
-        .resume = tpm_pm_resume,
-};
-static int __init init_nsc(void)
-{
-        return pci_register_driver(&nsc_pci_driver);
 }
 static void __exit cleanup_nsc(void)
 {
-        pci_unregister_driver(&nsc_pci_driver);
+        if (pdev) {
+                tpm_nsc_remove(&pdev->dev);
+                platform_device_unregister(pdev);
+                kfree(pdev);
+                pdev = NULL;
+        }
+        driver_unregister(&nsc_drv);
 }
 module_init(init_nsc);
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index f5649a337743..c586bfa852ee 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -809,7 +809,7 @@ static void do_tty_hangup(void *data)
        check_tty_count(tty, "do_tty_hangup");
        file_list_lock();
        /* This breaks for file handles being sent over AF_UNIX sockets ? */
-        list_for_each_entry(filp, &tty->tty_files, f_list) {
+        list_for_each_entry(filp, &tty->tty_files, f_u.fu_list) {
                if (filp->f_op->write == redirected_tty_write)
                        cons_filp = filp;
                if (filp->f_op->write != tty_write)
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index 1d44f69e1fda..003dda147cd0 100644
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -192,6 +192,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
        int i, j, k;
        int ret;
+        if (!capable(CAP_SYS_TTY_CONFIG))
+                return -EPERM;
        kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
        if (!kbs) {
                ret = -ENOMEM;
diff --git a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c
index 2865dac0a813..e75045fe2641 100644
--- a/drivers/char/watchdog/cpu5wdt.c
+++ b/drivers/char/watchdog/cpu5wdt.c
@@ -28,6 +28,7 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/timer.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index 7fc2188386d9..d8dede575402 100644
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -45,6 +45,8 @@
 #include <linux/fs.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/timer.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index 427ad51b7a35..37c9e13ad3ac 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -66,7 +66,7 @@
 #include <linux/init.h>
 #include <linux/spinlock.h>
 #include <linux/reboot.h>
+#include <linux/sched.h>        /* TASK_INTERRUPTIBLE, set_current_state() and friends */
 #include <asm/uaccess.h>
 #include <asm/io.h>
diff --git a/drivers/char/watchdog/pcwd_pci.c b/drivers/char/watchdog/pcwd_pci.c
index 0b8e493be045..5308e5c8f29a 100644
--- a/drivers/char/watchdog/pcwd_pci.c
+++ b/drivers/char/watchdog/pcwd_pci.c
@@ -753,6 +753,7 @@ static struct pci_device_id pcipcwd_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, pcipcwd_pci_tbl);
 static struct pci_driver pcipcwd_driver = {
+        .owner          = THIS_MODULE,
        .name           = WATCHDOG_NAME,
        .id_table       = pcipcwd_pci_tbl,
        .probe          = pcipcwd_card_init,
diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
index 72501be79b0c..4ee9974ad8cb 100644
--- a/drivers/char/watchdog/sc520_wdt.c
+++ b/drivers/char/watchdog/sc520_wdt.c
@@ -63,6 +63,7 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
index 20e5eb8667f2..a91edaf3a350 100644
--- a/drivers/char/watchdog/softdog.c
+++ b/drivers/char/watchdog/softdog.c
@@ -47,6 +47,8 @@
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #include <asm/uaccess.h>
 #define PFX "SoftDog: "
diff --git a/drivers/char/watchdog/wdt_pci.c b/drivers/char/watchdog/wdt_pci.c
index 4b3311993d48..dc9370f6c348 100644
--- a/drivers/char/watchdog/wdt_pci.c
+++ b/drivers/char/watchdog/wdt_pci.c
@@ -711,6 +711,7 @@ MODULE_DEVICE_TABLE(pci, wdtpci_pci_tbl);
 static struct pci_driver wdtpci_driver = {
+        .owner          = THIS_MODULE,
        .name           = "wdt_pci",
        .id_table       = wdtpci_pci_tbl,
        .probe          = wdtpci_init_one,
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 109d62ccf651..6c6121b85a54 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -4,6 +4,9 @@
 *  Copyright (C) 2001 Russell King
 *            (C) 2002 - 2003 Dominik Brodowski <linux@brodo.de>
 *
+ *  Oct 2005 - Ashok Raj <ashok.raj@intel.com>
+ *                      Added handling for CPU hotplug
+ *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
@@ -36,13 +39,6 @@ static struct cpufreq_policy	*cpufreq_cpu_data[NR_CPUS];
 static DEFINE_SPINLOCK(cpufreq_driver_lock);
-/* we keep a copy of all ->add'ed CPU's struct sys_device here;
- * as it is only accessed in ->add and ->remove, no lock or reference
- * count is necessary.
- */
-static struct sys_device        *cpu_sys_devices[NR_CPUS];
 /* internal prototypes */
 static int __cpufreq_governor(struct cpufreq_policy *policy, unsigned int event);
 static void handle_update(void *data);
@@ -574,6 +570,9 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
        unsigned long flags;
        unsigned int j;
+        if (cpu_is_offline(cpu))
+                return 0;
        cpufreq_debug_disable_ratelimit();
        dprintk("adding CPU %u\n", cpu);
@@ -582,7 +581,6 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
         * CPU because it is in the same boat. */
        policy = cpufreq_cpu_get(cpu);
        if (unlikely(policy)) {
-                cpu_sys_devices[cpu] = sys_dev;
                dprintk("CPU already managed, adding link\n");
                sysfs_create_link(&sys_dev->kobj, &policy->kobj, "cpufreq");
                cpufreq_debug_enable_ratelimit();
@@ -657,7 +655,6 @@ static int cpufreq_add_dev (struct sys_device * sys_dev)
        }
        module_put(cpufreq_driver->owner);
-        cpu_sys_devices[cpu] = sys_dev;
        dprintk("initialization complete\n");
        cpufreq_debug_enable_ratelimit();
        
@@ -682,7 +679,7 @@ err_out:
 nomem_out:
        module_put(cpufreq_driver->owner);
- module_out:
+module_out:
        cpufreq_debug_enable_ratelimit();
        return ret;
 }
@@ -698,6 +695,7 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
        unsigned int cpu = sys_dev->id;
        unsigned long flags;
        struct cpufreq_policy *data;
+        struct sys_device *cpu_sys_dev;
 #ifdef CONFIG_SMP
        unsigned int j;
 #endif
@@ -710,7 +708,6 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
        if (!data) {
                spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
-                cpu_sys_devices[cpu] = NULL;
                cpufreq_debug_enable_ratelimit();
                return -EINVAL;
        }
@@ -725,14 +722,12 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
                dprintk("removing link\n");
                spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
                sysfs_remove_link(&sys_dev->kobj, "cpufreq");
-                cpu_sys_devices[cpu] = NULL;
                cpufreq_cpu_put(data);
                cpufreq_debug_enable_ratelimit();
                return 0;
        }
 #endif
-        cpu_sys_devices[cpu] = NULL;
        if (!kobject_get(&data->kobj)) {
                spin_unlock_irqrestore(&cpufreq_driver_lock, flags);
@@ -761,7 +756,8 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
                        if (j == cpu)
                                continue;
                        dprintk("removing link for cpu %u\n", j);
-                        sysfs_remove_link(&cpu_sys_devices[j]->kobj, "cpufreq");
+                        cpu_sys_dev = get_cpu_sysdev(j);
+                        sysfs_remove_link(&cpu_sys_dev->kobj, "cpufreq");
                        cpufreq_cpu_put(data);
                }
        }
@@ -772,7 +768,6 @@ static int cpufreq_remove_dev (struct sys_device * sys_dev)
        down(&data->lock);
        if (cpufreq_driver->target)
                __cpufreq_governor(data, CPUFREQ_GOV_STOP);
-        cpufreq_driver->target = NULL;
        up(&data->lock);
        kobject_unregister(&data->kobj);
@@ -1119,17 +1114,30 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy,
                            unsigned int relation)
 {
        int retval = -EINVAL;
-        lock_cpu_hotplug();
+        /*
+         * Converted the lock_cpu_hotplug to preempt_disable()
+         * and preempt_enable(). This is a bit kludgy and relies on how cpu
+         * hotplug works. All we need is a guarantee that cpu hotplug won't make
+         * progress on any cpu. Once we do preempt_disable(), this would ensure
+         * that hotplug threads don't get onto this cpu, thereby delaying
+         * the cpu remove process.
+         *
+         * We removed the lock_cpu_hotplug since we need to call this function
+         * via cpu hotplug callbacks, which result in locking the cpu hotplug
+         * thread itself. Agree this is not very clean, cpufreq community
+         * could improve this if required. - Ashok Raj <ashok.raj@intel.com>
+         */
+        preempt_disable();
        dprintk("target for CPU %u: %u kHz, relation %u\n", policy->cpu,
                target_freq, relation);
        if (cpu_online(policy->cpu) && cpufreq_driver->target)
                retval = cpufreq_driver->target(policy, target_freq, relation);
-        unlock_cpu_hotplug();
+        preempt_enable();
        return retval;
 }
 EXPORT_SYMBOL_GPL(__cpufreq_driver_target);
 int cpufreq_driver_target(struct cpufreq_policy *policy,
                          unsigned int target_freq,
                          unsigned int relation)
@@ -1416,6 +1424,45 @@ int cpufreq_update_policy(unsigned int cpu)
 }
 EXPORT_SYMBOL(cpufreq_update_policy);
+static int __cpuinit cpufreq_cpu_callback(struct notifier_block *nfb,
+                                        unsigned long action, void *hcpu)
+{
+        unsigned int cpu = (unsigned long)hcpu;
+        struct cpufreq_policy *policy;
+        struct sys_device *sys_dev;
+        sys_dev = get_cpu_sysdev(cpu);
+        if (sys_dev) {
+                switch (action) {
+                case CPU_ONLINE:
+                        cpufreq_add_dev(sys_dev);
+                        break;
+                case CPU_DOWN_PREPARE:
+                        /*
+                         * We attempt to put this cpu in lowest frequency
+                         * possible before going down. This will permit
+                         * hardware-managed P-State to switch other related
+                         * threads to min or higher speeds if possible.
+                         */
+                        policy = cpufreq_cpu_data[cpu];
+                        if (policy) {
+                                cpufreq_driver_target(policy, policy->min,
+                                                CPUFREQ_RELATION_H);
+                        }
+                        break;
+                case CPU_DEAD:
+                        cpufreq_remove_dev(sys_dev);
+                        break;
+                }
+        }
+        return NOTIFY_OK;
+}
+static struct notifier_block cpufreq_cpu_notifier =
+{
+    .notifier_call = cpufreq_cpu_callback,
+};
 /*********************************************************************
 *               REGISTER / UNREGISTER CPUFREQ DRIVER                *
@@ -1476,6 +1523,7 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
        }
        if (!ret) {
+                register_cpu_notifier(&cpufreq_cpu_notifier);
                dprintk("driver %s up and running\n", driver_data->name);
                cpufreq_debug_enable_ratelimit();
        }
@@ -1507,6 +1555,7 @@ int cpufreq_unregister_driver(struct cpufreq_driver *driver)
        dprintk("unregistering driver %s\n", driver->name);
        sysdev_driver_unregister(&cpu_sysdev_class, &cpufreq_sysdev_driver);
+        unregister_cpu_notifier(&cpufreq_cpu_notifier);
        spin_lock_irqsave(&cpufreq_driver_lock, flags);
        cpufreq_driver = NULL;
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c
index 741b6b191e6a..3597f25d5efa 100644
--- a/drivers/cpufreq/cpufreq_stats.c
+++ b/drivers/cpufreq/cpufreq_stats.c
@@ -19,6 +19,7 @@
 #include <linux/percpu.h>
 #include <linux/kobject.h>
 #include <linux/spinlock.h>
+#include <linux/notifier.h>
 #include <asm/cputime.h>
 static spinlock_t cpufreq_stats_lock;
@@ -298,6 +299,27 @@ cpufreq_stat_notifier_trans (struct notifier_block *nb, unsigned long val,
        return 0;
 }
+static int __cpuinit cpufreq_stat_cpu_callback(struct notifier_block *nfb,
+                                        unsigned long action, void *hcpu)
+{
+        unsigned int cpu = (unsigned long)hcpu;
+        switch (action) {
+        case CPU_ONLINE:
+                cpufreq_update_policy(cpu);
+                break;
+        case CPU_DEAD:
+                cpufreq_stats_free_table(cpu);
+                break;
+        }
+        return NOTIFY_OK;
+}
+static struct notifier_block cpufreq_stat_cpu_notifier =
+{
+        .notifier_call = cpufreq_stat_cpu_callback,
+};
 static struct notifier_block notifier_policy_block = {
        .notifier_call = cpufreq_stat_notifier_policy
 };
@@ -311,6 +333,7 @@ __init cpufreq_stats_init(void)
 {
        int ret;
        unsigned int cpu;
        spin_lock_init(&cpufreq_stats_lock);
        if ((ret = cpufreq_register_notifier(&notifier_policy_block,
                                CPUFREQ_POLICY_NOTIFIER)))
@@ -323,20 +346,31 @@ __init cpufreq_stats_init(void)
                return ret;
        }
-        for_each_cpu(cpu)
+        register_cpu_notifier(&cpufreq_stat_cpu_notifier);
-                cpufreq_update_policy(cpu);
+        lock_cpu_hotplug();
+        for_each_online_cpu(cpu) {
+                cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier, CPU_ONLINE,
+                        (void *)(long)cpu);
+        }
+        unlock_cpu_hotplug();
        return 0;
 }
 static void
 __exit cpufreq_stats_exit(void)
 {
        unsigned int cpu;
        cpufreq_unregister_notifier(&notifier_policy_block,
                        CPUFREQ_POLICY_NOTIFIER);
        cpufreq_unregister_notifier(&notifier_trans_block,
                        CPUFREQ_TRANSITION_NOTIFIER);
-        for_each_cpu(cpu)
+        unregister_cpu_notifier(&cpufreq_stat_cpu_notifier);
-                cpufreq_stats_free_table(cpu);
+        lock_cpu_hotplug();
+        for_each_online_cpu(cpu) {
+                cpufreq_stat_cpu_callback(&cpufreq_stat_cpu_notifier, CPU_DEAD,
+                        (void *)(long)cpu);
+        }
+        unlock_cpu_hotplug();
 }
 MODULE_AUTHOR ("Zou Nan hai <nanhai.zou@intel.com>");
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 094835cce321..4263935443cc 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -2,7 +2,7 @@ menu "Hardware crypto devices"
 config CRYPTO_DEV_PADLOCK
        tristate "Support for VIA PadLock ACE"
-        depends on CRYPTO && X86 && !X86_64
+        depends on CRYPTO && X86_32
        help
          Some VIA processors come with an integrated crypto engine
          (so called VIA PadLock ACE, Advanced Cryptography Engine)
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 327b58e64875..b6815c6c29a2 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -70,8 +70,7 @@ config DELL_RBU
 config DCDBAS
        tristate "Dell Systems Management Base Driver"
-        depends on X86 || X86_64
+        depends on X86
-        default m
        help
          The Dell Systems Management Base Driver provides a sysfs interface
          for systems management software to perform System Management
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 74af7e074868..8b9d85526596 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -2211,13 +2211,12 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
        if (toc == NULL) {
                /* Try to allocate space. */
-                toc = (struct atapi_toc *) kmalloc (sizeof (struct atapi_toc),
+                toc = kmalloc(sizeof(struct atapi_toc), GFP_KERNEL);
-                                                    GFP_KERNEL);
-                info->toc = toc;
                if (toc == NULL) {
                        printk (KERN_ERR "%s: No cdrom TOC buffer!\n", drive->name);
                        return -ENOMEM;
                }
+                info->toc = toc;
        }
        /* Check to see if the existing data is still valid.
@@ -2240,7 +2239,8 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
        /* First read just the header, so we know how long the TOC is. */
        stat = cdrom_read_tocentry(drive, 0, 1, 0, (char *) &toc->hdr,
                                    sizeof(struct atapi_toc_header), sense);
-        if (stat) return stat;
+        if (stat)
+                return stat;
 #if ! STANDARD_ATAPI
        if (CDROM_CONFIG_FLAGS(drive)->toctracks_as_bcd) {
@@ -2324,7 +2324,8 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
                /* Read the multisession information. */
                stat = cdrom_read_tocentry(drive, 0, 0, 1, (char *)&ms_tmp,
                                           sizeof(ms_tmp), sense);
-                if (stat) return stat;
+                if (stat)
+                        return stat;
                toc->last_session_lba = be32_to_cpu(ms_tmp.ent.addr.lba);
        } else {
@@ -2460,7 +2461,7 @@ static int ide_cdrom_packet(struct cdrom_device_info *cdi,
                            struct packet_command *cgc)
 {
        struct request req;
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        if (cgc->timeout <= 0)
                cgc->timeout = ATAPI_WAIT_PC;
@@ -2537,7 +2538,7 @@ int ide_cdrom_audio_ioctl (struct cdrom_device_info *cdi,
                           unsigned int cmd, void *arg)
                           
 {
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        struct cdrom_info *info = drive->driver_data;
        int stat;
@@ -2548,7 +2549,7 @@ int ide_cdrom_audio_ioctl (struct cdrom_device_info *cdi,
         */
        case CDROMPLAYTRKIND: {
                unsigned long lba_start, lba_end;
-                struct cdrom_ti *ti = (struct cdrom_ti *)arg;
+                struct cdrom_ti *ti = arg;
                struct atapi_toc_entry *first_toc, *last_toc;
                stat = cdrom_get_toc_entry(drive, ti->cdti_trk0, &first_toc);
@@ -2571,12 +2572,13 @@ int ide_cdrom_audio_ioctl (struct cdrom_device_info *cdi,
        }
        case CDROMREADTOCHDR: {
-                struct cdrom_tochdr *tochdr = (struct cdrom_tochdr *) arg;
+                struct cdrom_tochdr *tochdr = arg;
                struct atapi_toc *toc;
                /* Make sure our saved TOC is valid. */
                stat = cdrom_read_toc(drive, NULL);
-                if (stat) return stat;
+                if (stat)
+                        return stat;
                toc = info->toc;
                tochdr->cdth_trk0 = toc->hdr.first_track;
@@ -2586,11 +2588,12 @@ int ide_cdrom_audio_ioctl (struct cdrom_device_info *cdi,
        }
        case CDROMREADTOCENTRY: {
-                struct cdrom_tocentry *tocentry = (struct cdrom_tocentry*) arg;
+                struct cdrom_tocentry *tocentry = arg;
                struct atapi_toc_entry *toce;
                stat = cdrom_get_toc_entry(drive, tocentry->cdte_track, &toce);
-                if (stat) return stat;
+                if (stat)
+                        return stat;
                tocentry->cdte_ctrl = toce->control;
                tocentry->cdte_adr  = toce->adr;
@@ -2613,7 +2616,7 @@ int ide_cdrom_audio_ioctl (struct cdrom_device_info *cdi,
 static
 int ide_cdrom_reset (struct cdrom_device_info *cdi)
 {
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        struct request_sense sense;
        struct request req;
        int ret;
@@ -2636,12 +2639,13 @@ int ide_cdrom_reset (struct cdrom_device_info *cdi)
 static
 int ide_cdrom_tray_move (struct cdrom_device_info *cdi, int position)
 {
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        struct request_sense sense;
        if (position) {
                int stat = cdrom_lockdoor(drive, 0, &sense);
-                if (stat) return stat;
+                if (stat)
+                        return stat;
        }
        return cdrom_eject(drive, !position, &sense);
@@ -2650,7 +2654,7 @@ int ide_cdrom_tray_move (struct cdrom_device_info *cdi, int position)
 static
 int ide_cdrom_lock_door (struct cdrom_device_info *cdi, int lock)
 {
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        return cdrom_lockdoor(drive, lock, NULL);
 }
@@ -2700,7 +2704,7 @@ void ide_cdrom_update_speed (ide_drive_t *drive, struct atapi_capabilities_page
 static
 int ide_cdrom_select_speed (struct cdrom_device_info *cdi, int speed)
 {
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        struct request_sense sense;
        struct atapi_capabilities_page cap;
        int stat;
@@ -2723,7 +2727,7 @@ int ide_cdrom_select_speed (struct cdrom_device_info *cdi, int speed)
 static
 int ide_cdrom_drive_status (struct cdrom_device_info *cdi, int slot_nr)
 {
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        struct media_event_desc med;
        struct request_sense sense;
        int stat;
@@ -2769,7 +2773,7 @@ int ide_cdrom_get_last_session (struct cdrom_device_info *cdi,
                                struct cdrom_multisession *ms_info)
 {
        struct atapi_toc *toc;
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        struct cdrom_info *info = drive->driver_data;
        struct request_sense sense;
        int ret;
@@ -2791,7 +2795,7 @@ int ide_cdrom_get_mcn (struct cdrom_device_info *cdi,
 {
        int stat;
        char mcnbuf[24];
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
 /* get MCN */
        if ((stat = cdrom_read_subchannel(drive, 2, mcnbuf, sizeof (mcnbuf), NULL)))
@@ -2815,7 +2819,7 @@ static
 int ide_cdrom_check_media_change_real (struct cdrom_device_info *cdi,
                                       int slot_nr)
 {
-        ide_drive_t *drive = (ide_drive_t*) cdi->handle;
+        ide_drive_t *drive = cdi->handle;
        int retval;
        
        if (slot_nr == CDSL_CURRENT) {
@@ -2886,7 +2890,7 @@ static int ide_cdrom_register (ide_drive_t *drive, int nslots)
        devinfo->mask = 0;
        devinfo->speed = CDROM_STATE_FLAGS(drive)->current_speed;
        devinfo->capacity = nslots;
-        devinfo->handle = (void *) drive;
+        devinfo->handle = drive;
        strcpy(devinfo->name, drive->name);
        
        /* set capability mask to match the probe. */
@@ -2942,7 +2946,7 @@ int ide_cdrom_probe_capabilities (ide_drive_t *drive)
         * registered with the Uniform layer yet, it can't do this.
         * Same goes for cdi->ops.
         */
-        cdi->handle = (ide_drive_t *) drive;
+        cdi->handle = drive;
        cdi->ops = &ide_cdrom_dops;
        if (ide_cdrom_get_capabilities(drive, &cap))
@@ -3254,6 +3258,7 @@ int ide_cdrom_setup (ide_drive_t *drive)
        return 0;
 }
+#ifdef CONFIG_PROC_FS
 static
 sector_t ide_cdrom_capacity (ide_drive_t *drive)
 {
@@ -3264,6 +3269,7 @@ sector_t ide_cdrom_capacity (ide_drive_t *drive)
        return capacity * sectors_per_frame;
 }
+#endif
 static int ide_cd_remove(struct device *dev)
 {
@@ -3309,7 +3315,7 @@ static int ide_cd_probe(struct device *);
 static int proc_idecd_read_capacity
        (char *page, char **start, off_t off, int count, int *eof, void *data)
 {
-        ide_drive_t*drive = (ide_drive_t *)data;
+        ide_drive_t *drive = data;
        int len;
        len = sprintf(page,"%llu\n", (long long)ide_cdrom_capacity(drive));
@@ -3449,7 +3455,7 @@ static int ide_cd_probe(struct device *dev)
                printk(KERN_INFO "ide-cd: passing drive %s to ide-scsi emulation.\n", drive->name);
                goto failed;
        }
-        info = (struct cdrom_info *) kmalloc (sizeof (struct cdrom_info), GFP_KERNEL);
+        info = kmalloc(sizeof(struct cdrom_info), GFP_KERNEL);
        if (info == NULL) {
                printk(KERN_ERR "%s: Can't allocate a cdrom structure\n", drive->name);
                goto failed;
diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index f014e639088c..c57a3871184c 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/slab.h>
+#include <linux/sched.h>        /* INIT_WORK, schedule_work(), flush_scheduled_work() */
 #include <rdma/ib_cache.h>
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 89ce9dc210d4..acda7d63d6fe 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -43,6 +43,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/kref.h>
 #include <linux/idr.h>
+#include <linux/workqueue.h>
 #include <rdma/ib_pack.h>
 #include <rdma/ib_sa.h>
diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c
index 889e85096736..22fdc446f25c 100644
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
@@ -34,6 +34,8 @@
 */
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_cache.h>
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c
index 8561b297a19b..1229c604c6e0 100644
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c
@@ -34,6 +34,9 @@
 * $Id: mthca_mad.c 1349 2004-12-16 21:09:43Z roland $
 */
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_mad.h>
 #include <rdma/ib_smi.h>
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
index b47ea7daf088..2fc449da418d 100644
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -33,6 +33,8 @@
 */
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "mthca_dev.h"
 #include "mthca_cmd.h"
diff --git a/drivers/infiniband/hw/mthca/mthca_profile.c b/drivers/infiniband/hw/mthca/mthca_profile.c
index 0576056b34f4..bd1338682074 100644
--- a/drivers/infiniband/hw/mthca/mthca_profile.c
+++ b/drivers/infiniband/hw/mthca/mthca_profile.c
@@ -35,6 +35,8 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "mthca_profile.h"
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 62ff091505da..7c9afde5ace5 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -36,6 +36,8 @@
 */
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_cache.h>
diff --git a/drivers/infiniband/hw/mthca/mthca_reset.c b/drivers/infiniband/hw/mthca/mthca_reset.c
index 4f995391dd1d..df5e494a9d38 100644
--- a/drivers/infiniband/hw/mthca/mthca_reset.c
+++ b/drivers/infiniband/hw/mthca/mthca_reset.c
@@ -37,6 +37,7 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include "mthca_dev.h"
 #include "mthca_cmd.h"
diff --git a/drivers/infiniband/hw/mthca/mthca_uar.c b/drivers/infiniband/hw/mthca/mthca_uar.c
index 1c8791ded6ff..8e9219842be4 100644
--- a/drivers/infiniband/hw/mthca/mthca_uar.c
+++ b/drivers/infiniband/hw/mthca/mthca_uar.c
@@ -32,6 +32,8 @@
 * $Id$
 */
+#include <asm/page.h>           /* PAGE_SHIFT */
 #include "mthca_dev.h"
 #include "mthca_memfree.h"
diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index ab09cf4093e3..0506934244f0 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -21,6 +21,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/kthread.h>
+#include <linux/sched.h>        /* HZ */
 /*#include <asm/io.h>*/
diff --git a/drivers/input/joystick/a3d.c b/drivers/input/joystick/a3d.c
index bf65430181fa..4571ea3a4b92 100644
--- a/drivers/input/joystick/a3d.c
+++ b/drivers/input/joystick/a3d.c
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "FP-Gaming Assasin 3D joystick driver"
diff --git a/drivers/input/joystick/adi.c b/drivers/input/joystick/adi.c
index 9d95459f4bcb..704bf70f1db7 100644
--- a/drivers/input/joystick/adi.c
+++ b/drivers/input/joystick/adi.c
@@ -34,6 +34,7 @@
 #include <linux/input.h>
 #include <linux/gameport.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "Logitech ADI joystick family driver"
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c
index c75ac6eb1ffb..3121961e3e7c 100644
--- a/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 #include <asm/timex.h>
 #define DRIVER_DESC     "Analog joystick and gamepad driver"
diff --git a/drivers/input/joystick/cobra.c b/drivers/input/joystick/cobra.c
index 9a3dfc724a41..1909f7ef340c 100644
--- a/drivers/input/joystick/cobra.c
+++ b/drivers/input/joystick/cobra.c
@@ -34,6 +34,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "Creative Labs Blaster GamePad Cobra driver"
diff --git a/drivers/input/joystick/gf2k.c b/drivers/input/joystick/gf2k.c
index e151f8c5bcb9..8a3ad455eb38 100644
--- a/drivers/input/joystick/gf2k.c
+++ b/drivers/input/joystick/gf2k.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "Genius Flight 2000 joystick driver"
diff --git a/drivers/input/joystick/grip.c b/drivers/input/joystick/grip.c
index e206bb56e53c..a936e7aedb10 100644
--- a/drivers/input/joystick/grip.c
+++ b/drivers/input/joystick/grip.c
@@ -34,6 +34,7 @@
 #include <linux/slab.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "Gravis GrIP protocol joystick driver"
diff --git a/drivers/input/joystick/grip_mp.c b/drivers/input/joystick/grip_mp.c
index a0ba93ccac72..51a912222e85 100644
--- a/drivers/input/joystick/grip_mp.c
+++ b/drivers/input/joystick/grip_mp.c
@@ -19,6 +19,7 @@
 #include <linux/input.h>
 #include <linux/delay.h>
 #include <linux/proc_fs.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "Gravis Grip Multiport driver"
diff --git a/drivers/input/joystick/guillemot.c b/drivers/input/joystick/guillemot.c
index c528473c09d8..6e2c721c26ba 100644
--- a/drivers/input/joystick/guillemot.c
+++ b/drivers/input/joystick/guillemot.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "Guillemot Digital joystick driver"
diff --git a/drivers/input/joystick/interact.c b/drivers/input/joystick/interact.c
index 8511ee7bb263..c4ed01758226 100644
--- a/drivers/input/joystick/interact.c
+++ b/drivers/input/joystick/interact.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "InterAct digital joystick driver"
diff --git a/drivers/input/joystick/joydump.c b/drivers/input/joystick/joydump.c
index 4234ccaf9146..88ec5a918f2e 100644
--- a/drivers/input/joystick/joydump.c
+++ b/drivers/input/joystick/joydump.c
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #define DRIVER_DESC     "Gameport data dumper module"
diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
index eaaad45cc750..78dd163cd702 100644
--- a/drivers/input/joystick/sidewinder.c
+++ b/drivers/input/joystick/sidewinder.c
@@ -33,6 +33,7 @@
 #include <linux/init.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "Microsoft SideWinder joystick family driver"
diff --git a/drivers/input/joystick/tmdc.c b/drivers/input/joystick/tmdc.c
index 3a7d1bb46472..60e2aac7d06e 100644
--- a/drivers/input/joystick/tmdc.c
+++ b/drivers/input/joystick/tmdc.c
@@ -38,6 +38,7 @@
 #include <linux/init.h>
 #include <linux/gameport.h>
 #include <linux/input.h>
+#include <linux/jiffies.h>
 #define DRIVER_DESC     "ThrustMaster DirectConnect joystick driver"
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index bb934e6d9636..b3eaac1b35b6 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -14,7 +14,7 @@ if INPUT_MISC
 config INPUT_PCSPKR
        tristate "PC Speaker support"
-        depends on ALPHA || X86 || X86_64 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+        depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
        help
          Say Y here if you want the standard PC Speaker to be used for
          bells and whistles.
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c
index e3c44ffae674..1c9426fd5205 100644
--- a/drivers/input/serio/hp_sdc_mlc.c
+++ b/drivers/input/serio/hp_sdc_mlc.c
@@ -40,6 +40,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/string.h>
+#include <asm/semaphore.h>
 #define PREFIX "HP SDC MLC: "
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 3abd7fc6e5ef..7b564c0dd996 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/ctype.h>
+#include <linux/sched.h>        /* current */
 MODULE_DESCRIPTION("CAPI4Linux: /dev/capi/ filesystem");
 MODULE_AUTHOR("Carsten Paeth");
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index 7333377ab31d..e3866b0a97fd 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -1063,7 +1063,7 @@ tx_b_frame(struct hfc4s8s_btype *bch)
                                Write_hfc8(l1->hw, A_INC_RES_FIFO, 1);
                        }
                        ack_len += skb->truesize;
-                        bch->tx_skb = 0;
+                        bch->tx_skb = NULL;
                        bch->tx_cnt = 0;
                        dev_kfree_skb(skb);
                } else
@@ -1659,10 +1659,10 @@ hfc4s8s_remove(struct pci_dev *pdev)
 }
 static struct pci_driver hfc4s8s_driver = {
-      name:"hfc4s8s_l1",
+      .name     = "hfc4s8s_l1",
-      probe:hfc4s8s_probe,
+      .probe    = hfc4s8s_probe,
-      remove:__devexit_p(hfc4s8s_remove),
+      .remove   = __devexit_p(hfc4s8s_remove),
-      id_table:hfc4s8s_ids,
+      .id_table = hfc4s8s_ids,
 };
 /**********************/
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 1ee003346923..c34c96d18907 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -17,6 +17,8 @@
 #include <linux/pci_ids.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <asm/machdep.h>
 #include <asm/macio.h>
 #include <asm/pmac_feature.h>
diff --git a/drivers/mca/mca-device.c b/drivers/mca/mca-device.c
index 76d430aa243f..e7adf89fae41 100644
--- a/drivers/mca/mca-device.c
+++ b/drivers/mca/mca-device.c
@@ -29,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/mca.h>
+#include <linux/string.h>
 /**
 *      mca_device_read_stored_pos - read POS register from stored data
diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c
index 06f4d4686a6c..31fccb4f05d6 100644
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
 #include <media/ir-common.h>
 /* -------------------------------------------------------------------------- */
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
index 88757e2634e5..2aa767f9bd7d 100644
--- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
@@ -36,6 +36,7 @@
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
 #include <linux/rwsem.h>
+#include <linux/sched.h>
 #include "dvb_ca_en50221.h"
 #include "dvb_ringbuffer.h"
diff --git a/drivers/media/dvb/dvb-usb/dtt200u.c b/drivers/media/dvb/dvb-usb/dtt200u.c
index 5aa12ebab34f..b595476332cd 100644
--- a/drivers/media/dvb/dvb-usb/dtt200u.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u.c
@@ -151,7 +151,7 @@ static struct dvb_usb_properties dtt200u_properties = {
                  .cold_ids = { &dtt200u_usb_table[0], NULL },
                  .warm_ids = { &dtt200u_usb_table[1], NULL },
                },
-                { 0 },
+                { NULL },
        }
 };
@@ -192,7 +192,7 @@ static struct dvb_usb_properties wt220u_properties = {
                  .cold_ids = { &dtt200u_usb_table[2], NULL },
                  .warm_ids = { &dtt200u_usb_table[3], NULL },
                },
-                { 0 },
+                { NULL },
        }
 };
diff --git a/drivers/media/dvb/dvb-usb/vp7045.c b/drivers/media/dvb/dvb-usb/vp7045.c
index 0f57abeb6d6b..75765e3a569c 100644
--- a/drivers/media/dvb/dvb-usb/vp7045.c
+++ b/drivers/media/dvb/dvb-usb/vp7045.c
@@ -247,7 +247,7 @@ static struct dvb_usb_properties vp7045_properties = {
                  .cold_ids = { &vp7045_usb_table[2], NULL },
                  .warm_ids = { &vp7045_usb_table[3], NULL },
                },
-                { 0 },
+                { NULL },
        }
 };
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index f5fdc5c3e605..f6d4ee78bdd4 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -36,6 +36,9 @@
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/jiffies.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "bcm3510.h"
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index 21433e1831e7..6b0553608610 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -27,6 +27,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dib3000-common.h"
 #include "dib3000mb_priv.h"
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 441de665fec3..c024fad17337 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -26,6 +26,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dib3000-common.h"
 #include "dib3000mc_priv.h"
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c
index cff93b9d8ab2..794be520d590 100644
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -22,6 +22,8 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "dvb_dummy_fe.h"
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 7142b9c51dd2..8dde72bd1046 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -37,6 +37,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include "dvb_frontend.h"
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index e455aecd76b2..e38454901dd1 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -29,6 +29,8 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "mt312_priv.h"
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index cc1bc0edd65e..f0c610f2c2df 100644
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -35,6 +35,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "mt352_priv.h"
diff --git a/drivers/media/dvb/frontends/nxt2002.c b/drivers/media/dvb/frontends/nxt2002.c
index 35a1d60f1927..30786b1911bd 100644
--- a/drivers/media/dvb/frontends/nxt2002.c
+++ b/drivers/media/dvb/frontends/nxt2002.c
@@ -32,6 +32,8 @@
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "nxt2002.h"
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index b6d0eecc59eb..817b044c7fd1 100644
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -36,6 +36,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include "dvb_frontend.h"
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index ad56a9958404..8a9db23dd1b7 100644
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -34,6 +34,8 @@
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 #include "dvb_frontend.h"
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index c7fe27fd530c..f265418e3261 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -26,6 +26,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <asm/div64.h>
 #include "dvb_frontend.h"
 #include "s5h1420.h"
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 764a95a2e212..1c6b2e9264bc 100644
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -32,6 +32,8 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "sp8870.h"
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index d868a6927a16..73384e75625e 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -14,6 +14,8 @@
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "sp887x.h"
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 8d09afd7545d..6122ba754bc5 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -24,6 +24,8 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "stv0297.h"
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index 2d62931f20b5..889d9257215d 100644
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -48,6 +48,7 @@
 #include <linux/moduleparam.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/jiffies.h>
 #include <asm/div64.h>
 #include "dvb_frontend.h"
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index 74cea9f8d721..3529c618f828 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -32,6 +32,10 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
+#include <linux/jiffies.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "dvb_frontend.h"
 #include "tda1004x.h"
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c
index 168e013d23bd..c05cf1861051 100644
--- a/drivers/media/dvb/frontends/tda8083.c
+++ b/drivers/media/dvb/frontends/tda8083.c
@@ -30,6 +30,7 @@
 #include <linux/moduleparam.h>
 #include <linux/string.h>
 #include <linux/slab.h>
+#include <linux/jiffies.h>
 #include "dvb_frontend.h"
 #include "tda8083.h"
diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index df79d5e0aaed..e09214082e01 100644
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
+#include <linux/sched.h>        /* current, TASK_*, schedule_timeout() */
 #include <linux/delay.h>
 #include <asm/uaccess.h>
 #include "miropcm20-rds-core.h"
diff --git a/drivers/message/i2o/debug.c b/drivers/message/i2o/debug.c
index 018ca887ca85..40d4ea898dbc 100644
--- a/drivers/message/i2o/debug.c
+++ b/drivers/message/i2o/debug.c
@@ -90,7 +90,7 @@ static void i2o_report_fail_status(u8 req_status, u32 * msg)
        };
        if (req_status == I2O_FSC_TRANSPORT_UNKNOWN_FAILURE)
-                printk(KERN_DEBUG "TRANSPORT_UNKNOWN_FAILURE (%0#2x)\n.",
+                printk(KERN_DEBUG "TRANSPORT_UNKNOWN_FAILURE (%0#2x).\n",
                       req_status);
        else
                printk(KERN_DEBUG "TRANSPORT_%s.\n",
diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index d9879965eb50..8eb50cdb8ae1 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -16,6 +16,8 @@
 #include <linux/module.h>
 #include <linux/i2o.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "core.h"
 /**
diff --git a/drivers/message/i2o/driver.c b/drivers/message/i2o/driver.c
index 0079a4be0af2..0fb9c4e2ad4c 100644
--- a/drivers/message/i2o/driver.c
+++ b/drivers/message/i2o/driver.c
@@ -17,6 +17,9 @@
 #include <linux/module.h>
 #include <linux/rwsem.h>
 #include <linux/i2o.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "core.h"
 #define OSM_NAME        "i2o"
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index bda2c62648ba..b675b4ebbebd 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -30,6 +30,10 @@
 #include <linux/module.h>
 #include <linux/i2o.h>
 #include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <asm/param.h>          /* HZ */
 #include "core.h"
 #define OSM_NAME "exec-osm"
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 361da8d1d5e7..61b837de4b6a 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -28,6 +28,7 @@
 #include <linux/module.h>
 #include <linux/i2o.h>
 #include <linux/delay.h>
+#include <linux/sched.h>
 #include "core.h"
 #define OSM_NAME        "i2o"
diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c
index 62d235a9a4e2..4f6778f3ee3e 100644
--- a/drivers/mtd/chips/jedec.c
+++ b/drivers/mtd/chips/jedec.c
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/mtd/jedec.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/devices/lart.c b/drivers/mtd/devices/lart.c
index dfd335e4a2a8..df987a53ed9c 100644
--- a/drivers/mtd/devices/lart.c
+++ b/drivers/mtd/devices/lart.c
@@ -44,6 +44,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/mtd/mtd.h>
 #ifdef HAVE_PARTITIONS
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index a423a382095a..765c0179c8df 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -22,6 +22,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #define ERROR(fmt, args...) printk(KERN_ERR "phram: " fmt , ## args)
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index 0ba0ff7d43b9..63104c73ca3c 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -33,6 +33,7 @@
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index da8584a662f4..c68b31dc7e6d 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -20,6 +20,7 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/dc21285.c b/drivers/mtd/maps/dc21285.c
index 938c41f2f056..e5b74169fde6 100644
--- a/drivers/mtd/maps/dc21285.c
+++ b/drivers/mtd/maps/dc21285.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/dilnetpc.c b/drivers/mtd/maps/dilnetpc.c
index 0bc79c93a584..f99519692cb7 100644
--- a/drivers/mtd/maps/dilnetpc.c
+++ b/drivers/mtd/maps/dilnetpc.c
@@ -30,12 +30,15 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/string.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/concat.h>
+#include <asm/io.h>
 /*
 ** The DIL/NetPC keeps its BIOS in two distinct flash blocks.
 ** Destroying any of these blocks transforms the DNPC into
diff --git a/drivers/mtd/maps/epxa10db-flash.c b/drivers/mtd/maps/epxa10db-flash.c
index ab6dbe2b8cce..1df6188926b3 100644
--- a/drivers/mtd/maps/epxa10db-flash.c
+++ b/drivers/mtd/maps/epxa10db-flash.c
@@ -27,12 +27,15 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+#include <asm/io.h>
 #include <asm/hardware.h>
 #ifdef CONFIG_EPXA10DB
 #define BOARD_NAME "EPXA10DB"
 #else
diff --git a/drivers/mtd/maps/fortunet.c b/drivers/mtd/maps/fortunet.c
index 068bb6a54520..00f7bbe5479e 100644
--- a/drivers/mtd/maps/fortunet.c
+++ b/drivers/mtd/maps/fortunet.c
@@ -7,11 +7,14 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/string.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+#include <asm/io.h>
 #define MAX_NUM_REGIONS         4
 #define MAX_NUM_PARTITIONS      8
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index a9f86c7fbd52..1e5d6e1d05f3 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -22,11 +22,13 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
 #include <asm/io.h>
 #include <asm/hardware.h>
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c
index 3fcc32884074..da316e543237 100644
--- a/drivers/mtd/maps/ixp4xx.c
+++ b/drivers/mtd/maps/ixp4xx.c
@@ -20,11 +20,14 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
 #include <asm/io.h>
 #include <asm/mach/flash.h>
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c
index 1298de475c9a..2337e0c46750 100644
--- a/drivers/mtd/maps/lubbock-flash.c
+++ b/drivers/mtd/maps/lubbock-flash.c
@@ -15,10 +15,13 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/dma-mapping.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
diff --git a/drivers/mtd/maps/mainstone-flash.c b/drivers/mtd/maps/mainstone-flash.c
index 87e93fa60588..da0f8a692628 100644
--- a/drivers/mtd/maps/mainstone-flash.c
+++ b/drivers/mtd/maps/mainstone-flash.c
@@ -16,9 +16,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
diff --git a/drivers/mtd/maps/omap-toto-flash.c b/drivers/mtd/maps/omap-toto-flash.c
index 496109071cb1..da36e8dddd17 100644
--- a/drivers/mtd/maps/omap-toto-flash.c
+++ b/drivers/mtd/maps/omap-toto-flash.c
@@ -12,9 +12,9 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index b17bca657daf..fa84566245a7 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -36,6 +36,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/maps/pci.c b/drivers/mtd/maps/pci.c
index 18dbd3af1eaa..d9c64e99ee32 100644
--- a/drivers/mtd/maps/pci.c
+++ b/drivers/mtd/maps/pci.c
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 118b04544cad..a0577ea00c3c 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -30,6 +30,7 @@
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 995e9991cb8d..4e28b977f224 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -27,12 +27,14 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+#include <asm/io.h>
 #define FLASH_ADDR 0x40000000
 #define FLASH_SIZE 0x00800000
 #define FLASH_BANK_MAX 4
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index b7c32c242bc7..400dd9c89883 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+#include <linux/sched.h>        /* TASK_* */
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/blktrans.h>
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index c534fd5d95cb..16df1e4fb0e9 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/fs.h>
+#include <linux/sched.h>        /* TASK_* */
 #include <asm/uaccess.h>
 #include <linux/device.h>
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 8f66d093c80d..f3e65af33a9c 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -14,7 +14,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/sched.h>        /* TASK_* */
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/concat.h>
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index b47ebcb31e0f..b58ba236a9eb 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -51,6 +51,7 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 1ce2c675b8a7..a806dfe54d23 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -552,8 +552,7 @@ static int __init do_eepro_probe(struct net_device *dev)
        {
                unsigned short int WS[32]=WakeupSeq;
-                if (check_region(WakeupPort, 2)==0) {
+                if (request_region(WakeupPort, 2, "eepro wakeup")) {
                        if (net_debug>5)
                                printk(KERN_DEBUG "Waking UP\n");
@@ -563,7 +562,10 @@ static int __init do_eepro_probe(struct net_device *dev)
                                outb_p(WS[i],WakeupPort);
                                if (net_debug>5) printk(KERN_DEBUG ": %#x ",WS[i]);
                        }
-                } else printk(KERN_WARNING "Checkregion Failed!\n");
+                        release_region(WakeupPort, 2);
+                } else
+                        printk(KERN_WARNING "PnP wakeup region busy!\n");
        }
 #endif
@@ -705,7 +707,7 @@ static void __init eepro_print_info (struct net_device *dev)
                                        dev->name, (unsigned)dev->base_addr);
                        break;
                case LAN595FX:
-                        printk("%s: Intel EtherExpress Pro/10+ ISA\n at %#x,", 
+                        printk("%s: Intel EtherExpress Pro/10+ ISA\n at %#x,",
                                        dev->name, (unsigned)dev->base_addr);
                        break;
                case LAN595TX:
@@ -713,7 +715,7 @@ static void __init eepro_print_info (struct net_device *dev)
                                        dev->name, (unsigned)dev->base_addr);
                        break;
                case LAN595:
-                        printk("%s: Intel 82595-based lan card at %#x,", 
+                        printk("%s: Intel 82595-based lan card at %#x,",
                                        dev->name, (unsigned)dev->base_addr);
        }
@@ -726,7 +728,7 @@ static void __init eepro_print_info (struct net_device *dev)
        if (dev->irq > 2)
                printk(", IRQ %d, %s.\n", dev->irq, ifmap[dev->if_port]);
-        else 
+        else
                printk(", %s.\n", ifmap[dev->if_port]);
        if (net_debug > 3) {
@@ -756,7 +758,7 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
        int err;
        /* Grab the region so we can find another board if autoIRQ fails. */
-        if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) { 
+        if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) {
                if (!autoprobe)
                        printk(KERN_WARNING "EEPRO: io-port 0x%04x in use \n",
                                ioaddr);
@@ -838,15 +840,15 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
                /* Mask off INT number */
                int count = lp->word[1] & 7;
                unsigned irqMask = lp->word[7];
- 
                while (count--)
                        irqMask &= irqMask - 1;
- 
                count = ffs(irqMask);
- 
                if (count)
                        dev->irq = count - 1;
- 
                if (dev->irq < 2) {
                        printk(KERN_ERR " Duh! illegal interrupt vector stored in EEPROM.\n");
                        goto exit;
@@ -854,7 +856,7 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
                        dev->irq = 9;
                }
        }
- 
        dev->open               = eepro_open;
        dev->stop               = eepro_close;
        dev->hard_start_xmit    = eepro_send_packet;
@@ -863,7 +865,7 @@ static int __init eepro_probe1(struct net_device *dev, int autoprobe)
        dev->tx_timeout         = eepro_tx_timeout;
        dev->watchdog_timeo     = TX_TIMEOUT;
        dev->ethtool_ops        = &eepro_ethtool_ops;
- 
        /* print boot time info */
        eepro_print_info(dev);
@@ -1047,8 +1049,8 @@ static int eepro_open(struct net_device *dev)
        /* Initialize the RCV and XMT upper and lower limits */
-        outb(lp->rcv_lower_limit >> 8, ioaddr + RCV_LOWER_LIMIT_REG); 
+        outb(lp->rcv_lower_limit >> 8, ioaddr + RCV_LOWER_LIMIT_REG);
-        outb(lp->rcv_upper_limit >> 8, ioaddr + RCV_UPPER_LIMIT_REG); 
+        outb(lp->rcv_upper_limit >> 8, ioaddr + RCV_UPPER_LIMIT_REG);
        outb(lp->xmt_lower_limit >> 8, ioaddr + lp->xmt_lower_limit_reg);
        outb(lp->xmt_upper_limit >> 8, ioaddr + lp->xmt_upper_limit_reg);
@@ -1065,12 +1067,12 @@ static int eepro_open(struct net_device *dev)
        eepro_clear_int(ioaddr);
        /* Initialize RCV */
-        outw(lp->rcv_lower_limit, ioaddr + RCV_BAR); 
+        outw(lp->rcv_lower_limit, ioaddr + RCV_BAR);
        lp->rx_start = lp->rcv_lower_limit;
-        outw(lp->rcv_upper_limit | 0xfe, ioaddr + RCV_STOP); 
+        outw(lp->rcv_upper_limit | 0xfe, ioaddr + RCV_STOP);
        /* Initialize XMT */
-        outw(lp->xmt_lower_limit, ioaddr + lp->xmt_bar); 
+        outw(lp->xmt_lower_limit, ioaddr + lp->xmt_bar);
        lp->tx_start = lp->tx_end = lp->xmt_lower_limit;
        lp->tx_last = 0;
@@ -1411,7 +1413,7 @@ set_multicast_list(struct net_device *dev)
                                outb(0x08, ioaddr + STATUS_REG);
                                if (i & 0x20) { /* command ABORTed */
-                                        printk(KERN_NOTICE "%s: multicast setup failed.\n", 
+                                        printk(KERN_NOTICE "%s: multicast setup failed.\n",
                                                dev->name);
                                        break;
                                } else if ((i & 0x0f) == 0x03)  { /* MC-Done */
@@ -1512,7 +1514,7 @@ hardware_send_packet(struct net_device *dev, void *buf, short length)
                end = last + (((length + 3) >> 1) << 1) + XMT_HEADER;
        if (end >= lp->xmt_upper_limit + 2) { /* the transmit buffer is wrapped around */
-                if ((lp->xmt_upper_limit + 2 - last) <= XMT_HEADER) {   
+                if ((lp->xmt_upper_limit + 2 - last) <= XMT_HEADER) {
                                /* Arrrr!!!, must keep the xmt header together,
                                several days were lost to chase this one down. */
                        last = lp->xmt_lower_limit;
@@ -1643,7 +1645,7 @@ eepro_rx(struct net_device *dev)
                        else if (rcv_status & 0x0800)
                                lp->stats.rx_crc_errors++;
-                        printk(KERN_DEBUG "%s: event = %#x, status = %#x, next = %#x, size = %#x\n", 
+                        printk(KERN_DEBUG "%s: event = %#x, status = %#x, next = %#x, size = %#x\n",
                                dev->name, rcv_event, rcv_status, rcv_next_frame, rcv_size);
                }
@@ -1674,10 +1676,10 @@ eepro_transmit_interrupt(struct net_device *dev)
 {
        struct eepro_local *lp = netdev_priv(dev);
        short ioaddr = dev->base_addr;
-        short boguscount = 25; 
+        short boguscount = 25;
        short xmt_status;
-        while ((lp->tx_start != lp->tx_end) && boguscount--) { 
+        while ((lp->tx_start != lp->tx_end) && boguscount--) {
                outw(lp->tx_start, ioaddr + HOST_ADDRESS_REG);
                xmt_status = inw(ioaddr+IO_PORT);
@@ -1723,7 +1725,7 @@ static int eepro_ethtool_get_settings(struct net_device *dev,
 {
        struct eepro_local      *lp = (struct eepro_local *)dev->priv;
-        cmd->supported =        SUPPORTED_10baseT_Half | 
+        cmd->supported =        SUPPORTED_10baseT_Half |
                                SUPPORTED_10baseT_Full |
                                SUPPORTED_Autoneg;
        cmd->advertising =      ADVERTISED_10baseT_Half |
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c
index bbac720cca63..140b7cdb1f7e 100644
--- a/drivers/net/irda/smsc-ircc2.c
+++ b/drivers/net/irda/smsc-ircc2.c
@@ -638,21 +638,14 @@ static void smsc_ircc_setup_qos(struct smsc_ircc_cb *self)
 */
 static void smsc_ircc_init_chip(struct smsc_ircc_cb *self)
 {
-        int iobase, ir_mode, ctrl, fast;
+        int iobase = self->io.fir_base;
-        IRDA_ASSERT(self != NULL, return;);
-        iobase = self->io.fir_base;
-        ir_mode = IRCC_CFGA_IRDA_SIR_A;
-        ctrl = 0;
-        fast = 0;
        register_bank(iobase, 0);
        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
        outb(0x00, iobase + IRCC_MASTER);
        register_bank(iobase, 1);
-        outb(((inb(iobase + IRCC_SCE_CFGA) & 0x87) | ir_mode),
+        outb(((inb(iobase + IRCC_SCE_CFGA) & 0x87) | IRCC_CFGA_IRDA_SIR_A),
             iobase + IRCC_SCE_CFGA);
 #ifdef smsc_669 /* Uses pin 88/89 for Rx/Tx */
@@ -666,10 +659,10 @@ static void smsc_ircc_init_chip(struct smsc_ircc_cb *self)
        outb(SMSC_IRCC2_FIFO_THRESHOLD, iobase + IRCC_FIFO_THRESHOLD);
        register_bank(iobase, 4);
-        outb((inb(iobase + IRCC_CONTROL) & 0x30) | ctrl, iobase + IRCC_CONTROL);
+        outb((inb(iobase + IRCC_CONTROL) & 0x30), iobase + IRCC_CONTROL);
        register_bank(iobase, 0);
-        outb(fast, iobase + IRCC_LCR_A);
+        outb(0, iobase + IRCC_LCR_A);
        smsc_ircc_set_sir_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
@@ -1556,6 +1549,46 @@ static int ircc_is_receiving(struct smsc_ircc_cb *self)
 }
 #endif /* unused */
+static int smsc_ircc_request_irq(struct smsc_ircc_cb *self)
+{
+        int error;
+        error = request_irq(self->io.irq, smsc_ircc_interrupt, 0,
+                            self->netdev->name, self->netdev);
+        if (error)
+                IRDA_DEBUG(0, "%s(), unable to allocate irq=%d, err=%d\n",
+                           __FUNCTION__, self->io.irq, error);
+        return error;
+}
+static void smsc_ircc_start_interrupts(struct smsc_ircc_cb *self)
+{
+        unsigned long flags;
+        spin_lock_irqsave(&self->lock, flags);
+        self->io.speed = 0;
+        smsc_ircc_change_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
+        spin_unlock_irqrestore(&self->lock, flags);
+}
+static void smsc_ircc_stop_interrupts(struct smsc_ircc_cb *self)
+{
+        int iobase = self->io.fir_base;
+        unsigned long flags;
+        spin_lock_irqsave(&self->lock, flags);
+        register_bank(iobase, 0);
+        outb(0, iobase + IRCC_IER);
+        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
+        outb(0x00, iobase + IRCC_MASTER);
+        spin_unlock_irqrestore(&self->lock, flags);
+}
 /*
 * Function smsc_ircc_net_open (dev)
@@ -1567,7 +1600,6 @@ static int smsc_ircc_net_open(struct net_device *dev)
 {
        struct smsc_ircc_cb *self;
        char hwname[16];
-        unsigned long flags;
        IRDA_DEBUG(1, "%s\n", __FUNCTION__);
@@ -1575,6 +1607,11 @@ static int smsc_ircc_net_open(struct net_device *dev)
        self = netdev_priv(dev);
        IRDA_ASSERT(self != NULL, return 0;);
+        if (self->io.suspended) {
+                IRDA_DEBUG(0, "%s(), device is suspended\n", __FUNCTION__);
+                return -EAGAIN;
+        }
        if (request_irq(self->io.irq, smsc_ircc_interrupt, 0, dev->name,
                        (void *) dev)) {
                IRDA_DEBUG(0, "%s(), unable to allocate irq=%d\n",
@@ -1582,11 +1619,7 @@ static int smsc_ircc_net_open(struct net_device *dev)
                return -EAGAIN;
        }
-        spin_lock_irqsave(&self->lock, flags);
+        smsc_ircc_start_interrupts(self);
-        /*smsc_ircc_sir_start(self);*/
-        self->io.speed = 0;
-        smsc_ircc_change_speed(self, SMSC_IRCC2_C_IRDA_FALLBACK_SPEED);
-        spin_unlock_irqrestore(&self->lock, flags);
        /* Give self a hardware name */
        /* It would be cool to offer the chip revision here - Jean II */
@@ -1639,7 +1672,12 @@ static int smsc_ircc_net_close(struct net_device *dev)
                irlap_close(self->irlap);
        self->irlap = NULL;
-        free_irq(self->io.irq, dev);
+        smsc_ircc_stop_interrupts(self);
+        /* if we are called from smsc_ircc_resume we don't have IRQ reserved */
+        if (!self->io.suspended)
+                free_irq(self->io.irq, dev);
        disable_dma(self->io.dma);
        free_dma(self->io.dma);
@@ -1650,11 +1688,18 @@ static int smsc_ircc_suspend(struct device *dev, pm_message_t state)
 {
        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
-        IRDA_MESSAGE("%s, Suspending\n", driver_name);
        if (!self->io.suspended) {
-                smsc_ircc_net_close(self->netdev);
+                IRDA_DEBUG(1, "%s, Suspending\n", driver_name);
+                rtnl_lock();
+                if (netif_running(self->netdev)) {
+                        netif_device_detach(self->netdev);
+                        smsc_ircc_stop_interrupts(self);
+                        free_irq(self->io.irq, self->netdev);
+                        disable_dma(self->io.dma);
+                }
                self->io.suspended = 1;
+                rtnl_unlock();
        }
        return 0;
@@ -1665,11 +1710,25 @@ static int smsc_ircc_resume(struct device *dev)
        struct smsc_ircc_cb *self = dev_get_drvdata(dev);
        if (self->io.suspended) {
+                IRDA_DEBUG(1, "%s, Waking up\n", driver_name);
-                smsc_ircc_net_open(self->netdev);
+                rtnl_lock();
+                smsc_ircc_init_chip(self);
+                if (netif_running(self->netdev)) {
+                        if (smsc_ircc_request_irq(self)) {
+                                /*
+                                 * Don't fail resume process, just kill this
+                                 * network interface
+                                 */
+                                unregister_netdevice(self->netdev);
+                        } else {
+                                enable_dma(self->io.dma);
+                                smsc_ircc_start_interrupts(self);
+                                netif_device_attach(self->netdev);
+                        }
+                }
                self->io.suspended = 0;
+                rtnl_unlock();
-                IRDA_MESSAGE("%s, Waking up\n", driver_name);
        }
        return 0;
 }
@@ -1682,9 +1741,6 @@ static int smsc_ircc_resume(struct device *dev)
 */
 static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
 {
-        int iobase;
-        unsigned long flags;
        IRDA_DEBUG(1, "%s\n", __FUNCTION__);
        IRDA_ASSERT(self != NULL, return -1;);
@@ -1694,22 +1750,7 @@ static int __exit smsc_ircc_close(struct smsc_ircc_cb *self)
        /* Remove netdevice */
        unregister_netdev(self->netdev);
-        /* Make sure the irq handler is not exectuting */
+        smsc_ircc_stop_interrupts(self);
-        spin_lock_irqsave(&self->lock, flags);
-        /* Stop interrupts */
-        iobase = self->io.fir_base;
-        register_bank(iobase, 0);
-        outb(0, iobase + IRCC_IER);
-        outb(IRCC_MASTER_RESET, iobase + IRCC_MASTER);
-        outb(0x00, iobase + IRCC_MASTER);
-#if 0
-        /* Reset to SIR mode */
-        register_bank(iobase, 1);
-        outb(IRCC_CFGA_IRDA_SIR_A|IRCC_CFGA_TX_POLARITY, iobase + IRCC_SCE_CFGA);
-        outb(IRCC_CFGB_IR, iobase + IRCC_SCE_CFGB);
-#endif
-        spin_unlock_irqrestore(&self->lock, flags);
        /* Release the PORTS that this driver is using */
        IRDA_DEBUG(0, "%s(), releasing 0x%03x\n",  __FUNCTION__,
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index f17c05cbe44b..99a776a51fb5 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -1896,7 +1896,7 @@ void smt_swap_para(struct smt_header *sm, int len, int direction)
 static void smt_string_swap(char *data, const char *format, int len)
 {
-        const char      *open_paren = 0 ;
+        const char      *open_paren = NULL ;
        int     x ;
        while (len > 0  && *format) {
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index ac9ce6509eee..817f200742c3 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -230,12 +230,12 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg)
 #define SMC_CAN_USE_16BIT       1
 #define SMC_CAN_USE_32BIT       0
-#define SMC_inb(a, r)           inb((a) + (r) - 0xa0000000)
+#define SMC_inb(a, r)           inb((u32)a) + (r))
-#define SMC_inw(a, r)           inw((a) + (r) - 0xa0000000)
+#define SMC_inw(a, r)           inw(((u32)a) + (r))
-#define SMC_outb(v, a, r)       outb(v, (a) + (r) - 0xa0000000)
+#define SMC_outb(v, a, r)       outb(v, ((u32)a) + (r))
-#define SMC_outw(v, a, r)       outw(v, (a) + (r) - 0xa0000000)
+#define SMC_outw(v, a, r)       outw(v, ((u32)a) + (r))
-#define SMC_insw(a, r, p, l)    insw((a) + (r) - 0xa0000000, p, l)
+#define SMC_insw(a, r, p, l)    insw(((u32)a) + (r), p, l)
-#define SMC_outsw(a, r, p, l)   outsw((a) + (r) - 0xa0000000, p, l)
+#define SMC_outsw(a, r, p, l)   outsw(((u32)a) + (r), p, l)
 #define set_irq_type(irq, type) do {} while(0)
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 4937a5ad4b2c..6a60c5970cb5 100644
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -137,7 +137,7 @@ islpci_mgmt_rx_fill(struct net_device *ndev)
                                                       PCI_DMA_FROMDEVICE);
                        if (!buf->pci_addr) {
                                printk(KERN_WARNING
-                                       "Failed to make memory DMA'able\n.");
+                                       "Failed to make memory DMA'able.\n");
                                return -ENOMEM;
                        }
                }
diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
index a62a4345b466..2d4639d6841f 100644
--- a/drivers/pci/hotplug/cpcihp_generic.c
+++ b/drivers/pci/hotplug/cpcihp_generic.c
@@ -39,6 +39,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
+#include <linux/string.h>
 #include "cpci_hotplug.h"
 #define DRIVER_VERSION  "0.1"
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
index 790abadd816c..f7cb00da38df 100644
--- a/drivers/pci/hotplug/cpcihp_zt5550.c
+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
+#include <linux/signal.h>       /* SA_SHIRQ */
 #include "cpci_hotplug.h"
 #include "cpcihp_zt5550.h"
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 8e47fa66e25e..060d74775d7b 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -37,6 +37,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "pci_hotplug.h"
 #include "../pci.h"
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 0392e004258f..aabf1e70b528 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -1077,7 +1077,7 @@ static int enable_slot(struct hotplug_slot *hs)
        if (rc) {
                err("Adding this card exceeds the limitations of this bus.\n");
                err("(i.e., >1 133MHz cards running on same bus, or "
-                     ">2 66 PCI cards running on same bus\n.");
+                     ">2 66 PCI cards running on same bus.\n");
                err("Try hot-adding into another bus\n");
                rc = -EINVAL;
                goto error_nopower;
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index 33b539b34f7e..ff17d8e07e94 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -113,7 +113,7 @@ int pciehp_unconfigure_device(struct pci_func* func)
 */
 int pciehp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num)
 {
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_64)
+#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_IO_APIC)
        int rc;
        u16 temp_word;
        struct pci_dev fakedev;
diff --git a/drivers/pci/hotplug/pciehprm_nonacpi.c b/drivers/pci/hotplug/pciehprm_nonacpi.c
index 3622965f8961..33b2c69a0829 100644
--- a/drivers/pci/hotplug/pciehprm_nonacpi.c
+++ b/drivers/pci/hotplug/pciehprm_nonacpi.c
@@ -33,10 +33,13 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 #ifdef CONFIG_IA64
 #include <asm/iosapic.h>
 #endif
 #include "pciehp.h"
 #include "pciehprm.h"
 #include "pciehprm_nonacpi.h"
diff --git a/drivers/pci/hotplug/rpadlpar_core.c b/drivers/pci/hotplug/rpadlpar_core.c
index ad1017da8656..fcb66b9a0e28 100644
--- a/drivers/pci/hotplug/rpadlpar_core.c
+++ b/drivers/pci/hotplug/rpadlpar_core.c
@@ -16,10 +16,13 @@
 */
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/string.h>
 #include <asm/pci-bridge.h>
 #include <asm/semaphore.h>
 #include <asm/rtas.h>
 #include <asm/vio.h>
 #include "../pci.h"
 #include "rpaphp.h"
 #include "rpadlpar.h"
diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index 46c157d26a2f..f7c12d7dfcfc 100644
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -23,11 +23,13 @@
 *
 */
 #include <linux/pci.h>
+#include <linux/string.h>
 #include <asm/pci-bridge.h>
 #include <asm/rtas.h>
 #include <asm/machdep.h>
-#include "../pci.h"             /* for pci_add_new_bus */
+#include "../pci.h"             /* for pci_add_new_bus */
 #include "rpaphp.h"
 static struct pci_bus *find_bus_among_children(struct pci_bus *bus,
diff --git a/drivers/pci/hotplug/rpaphp_slot.c b/drivers/pci/hotplug/rpaphp_slot.c
index 0e8815495083..daa89ae57123 100644
--- a/drivers/pci/hotplug/rpaphp_slot.c
+++ b/drivers/pci/hotplug/rpaphp_slot.c
@@ -27,6 +27,9 @@
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
 #include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <asm/rtas.h>
 #include "rpaphp.h"
diff --git a/drivers/pci/hotplug/shpchp.h b/drivers/pci/hotplug/shpchp.h
index abe2cf411e68..08ad26a0cae7 100644
--- a/drivers/pci/hotplug/shpchp.h
+++ b/drivers/pci/hotplug/shpchp.h
@@ -32,6 +32,8 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/sched.h>        /* signal_pending(), struct timer_list */
 #include "pci_hotplug.h"
 #if !defined(MODULE)
diff --git a/drivers/pci/hotplug/shpchprm_nonacpi.c b/drivers/pci/hotplug/shpchprm_nonacpi.c
index d70fe5408417..c6b40998eeb3 100644
--- a/drivers/pci/hotplug/shpchprm_nonacpi.c
+++ b/drivers/pci/hotplug/shpchprm_nonacpi.c
@@ -32,6 +32,8 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include "shpchp.h"
 int shpchprm_get_physical_slot_number(struct controller *ctrl, u32 *sun, u8 busnum, u8 devnum)
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 8972e6a3aac0..ae986e590b48 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -8,6 +8,8 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/mempolicy.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "pci.h"
 /*
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 61b855c99e39..e74d75843047 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -15,6 +15,7 @@
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <linux/string.h>
 #include <asm/dma.h>    /* isa_dma_bridge_buggy */
 #include "pci.h"
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 14f05d22bb70..467a4ceccf10 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -11,6 +11,8 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/pm.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/pcieport_if.h>
 #include "portdrv.h"
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index 3c565ce7f77b..02260141dc81 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/pm.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/pcieport_if.h>
 #include "portdrv.h"
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index bbd9c2323d8c..5627ce1d2b32 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -356,7 +356,7 @@ static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int
 /*
 * PIIX4 ACPI: Two IO regions pointed to by longwords at
 *      0x40 (64 bytes of ACPI registers)
- *      0x90 (32 bytes of SMB registers)
+ *      0x90 (16 bytes of SMB registers)
 * and a few strange programmable PIIX4 device resources.
 */
 static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
@@ -366,7 +366,7 @@ static void __devinit quirk_piix4_acpi(struct pci_dev *dev)
        pci_read_config_dword(dev, 0x40, &region);
        quirk_io_region(dev, region, 64, PCI_BRIDGE_RESOURCES, "PIIX4 ACPI");
        pci_read_config_dword(dev, 0x90, &region);
-        quirk_io_region(dev, region, 32, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB");
+        quirk_io_region(dev, region, 16, PCI_BRIDGE_RESOURCES+1, "PIIX4 SMB");
        /* Device resource A has enables for some of the other ones */
        pci_read_config_dword(dev, 0x5c, &res_a);
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 49bd21702314..598a115cd00e 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -9,6 +9,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 #include "pci.h"
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index fc87e7e2b6b8..00960a379b9c 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -779,7 +779,7 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
        if (!s->cb_dev || !s->cb_dev->bus)
                return -ENODEV;
-#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
+#if defined(CONFIG_X86)
        /* If this is the root bus, the risk of hitting
         * some strange system devices which aren't protected
         * by either ACPI resource tables or properly requested
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c
index 94442ffd4aed..cbb2749db178 100644
--- a/drivers/pnp/manager.c
+++ b/drivers/pnp/manager.c
@@ -12,6 +12,8 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/pnp.h>
+#include <linux/slab.h>
+#include <linux/bitmap.h>
 #include "base.h"
 DECLARE_MUTEX(pnp_res_mutex);
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index b0ca65b68645..5e38cd7335f7 100644
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -7,6 +7,8 @@
 #include <linux/ctype.h>
 #include <linux/pnp.h>
 #include <linux/pnpbios.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c
index fc7a213e591f..c570a9f6ce9c 100644
--- a/drivers/s390/char/con3270.c
+++ b/drivers/s390/char/con3270.c
@@ -213,6 +213,9 @@ con3270_update(struct con3270 *cp)
        struct string *s, *n;
        int rc;
+        if (cp->view.dev)
+                raw3270_activate_view(&cp->view);
        wrq = xchg(&cp->write, 0);
        if (!wrq) {
                con3270_set_timer(cp, 1);
@@ -489,8 +492,6 @@ con3270_write(struct console *co, const char *str, unsigned int count)
        unsigned char c;
        cp = condev;
-        if (cp->view.dev)
-                raw3270_activate_view(&cp->view);
        spin_lock_irqsave(&cp->view.lock, flags);
        while (count-- > 0) {
                c = *str++;
@@ -620,7 +621,7 @@ con3270_init(void)
                     (void (*)(unsigned long)) con3270_read_tasklet,
                     (unsigned long) condev->read);
-        raw3270_add_view(&condev->view, &con3270_fn, 0);
+        raw3270_add_view(&condev->view, &con3270_fn, 1);
        INIT_LIST_HEAD(&condev->freemem);
        for (i = 0; i < CON3270_STRING_PAGES; i++) {
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c
index 60afcdcf91c2..735a7fcdeff5 100644
--- a/drivers/s390/char/fs3270.c
+++ b/drivers/s390/char/fs3270.c
@@ -33,8 +33,11 @@ struct fs3270 {
        int read_command;               /* ccw command to use for reads. */
        int write_command;              /* ccw command to use for writes. */
        int attention;                  /* Got attention. */
-        struct raw3270_request *clear;  /* single clear request. */
+        int active;                     /* Fullscreen view is active. */
-        wait_queue_head_t attn_wait;    /* Attention wait queue. */
+        struct raw3270_request *init;   /* single init request. */
+        wait_queue_head_t wait;         /* Init & attention wait queue. */
+        struct idal_buffer *rdbuf;      /* full-screen-deactivate buffer */
+        size_t rdbuf_size;              /* size of data returned by RDBUF */
 };
 static void
@@ -43,58 +46,172 @@ fs3270_wake_up(struct raw3270_request *rq, void *data)
        wake_up((wait_queue_head_t *) data);
 }
+static inline int
+fs3270_working(struct fs3270 *fp)
+{
+        /*
+         * The fullscreen view is in working order if the view
+         * has been activated AND the initial request is finished.
+         */
+        return fp->active && raw3270_request_final(fp->init);
+}
 static int
 fs3270_do_io(struct raw3270_view *view, struct raw3270_request *rq)
 {
-        wait_queue_head_t wq;
+        struct fs3270 *fp;
        int rc;
-        init_waitqueue_head(&wq);
+        fp = (struct fs3270 *) view;
        rq->callback = fs3270_wake_up;
-        rq->callback_data = &wq;
+        rq->callback_data = &fp->wait;
-        rc = raw3270_start(view, rq);
-        if (rc)
+        do {
-                return rc;
+                if (!fs3270_working(fp)) {
-        /* Started sucessfully. Now wait for completion. */
+                        /* Fullscreen view isn't ready yet. */
-        wait_event(wq, raw3270_request_final(rq));
+                        rc = wait_event_interruptible(fp->wait,
-        return rq->rc;
+                                                      fs3270_working(fp));
+                        if (rc != 0)
+                                break;
+                }
+                rc = raw3270_start(view, rq);
+                if (rc == 0) {
+                        /* Started sucessfully. Now wait for completion. */
+                        wait_event(fp->wait, raw3270_request_final(rq));
+                }
+        } while (rc == -EACCES);
+        return rc;
 }
+/*
+ * Switch to the fullscreen view.
+ */
 static void
 fs3270_reset_callback(struct raw3270_request *rq, void *data)
 {
+        struct fs3270 *fp;
+        fp = (struct fs3270 *) rq->view;
        raw3270_request_reset(rq);
+        wake_up(&fp->wait);
+}
+static void
+fs3270_restore_callback(struct raw3270_request *rq, void *data)
+{
+        struct fs3270 *fp;
+        fp = (struct fs3270 *) rq->view;
+        if (rq->rc != 0 || rq->rescnt != 0) {
+                if (fp->fs_pid)
+                        kill_proc(fp->fs_pid, SIGHUP, 1);
+        }
+        fp->rdbuf_size = 0;
+        raw3270_request_reset(rq);
+        wake_up(&fp->wait);
 }
-/*
- * Switch to the fullscreen view.
- */
 static int
 fs3270_activate(struct raw3270_view *view)
 {
        struct fs3270 *fp;
+        char *cp;
+        int rc;
        fp = (struct fs3270 *) view;
-        raw3270_request_set_cmd(fp->clear, TC_EWRITEA);
-        fp->clear->callback = fs3270_reset_callback;
+        /* If an old init command is still running just return. */
-        return raw3270_start(view, fp->clear);
+        if (!raw3270_request_final(fp->init))
+                return 0;
+        if (fp->rdbuf_size == 0) {
+                /* No saved buffer. Just clear the screen. */
+                raw3270_request_set_cmd(fp->init, TC_EWRITEA);
+                fp->init->callback = fs3270_reset_callback;
+        } else {
+                /* Restore fullscreen buffer saved by fs3270_deactivate. */
+                raw3270_request_set_cmd(fp->init, TC_EWRITEA);
+                raw3270_request_set_idal(fp->init, fp->rdbuf);
+                fp->init->ccw.count = fp->rdbuf_size;
+                cp = fp->rdbuf->data[0];
+                cp[0] = TW_KR;
+                cp[1] = TO_SBA;
+                cp[2] = cp[6];
+                cp[3] = cp[7];
+                cp[4] = TO_IC;
+                cp[5] = TO_SBA;
+                cp[6] = 0x40;
+                cp[7] = 0x40;
+                fp->init->rescnt = 0;
+                fp->init->callback = fs3270_restore_callback;
+        }
+        rc = fp->init->rc = raw3270_start_locked(view, fp->init);
+        if (rc)
+                fp->init->callback(fp->init, NULL);
+        else
+                fp->active = 1;
+        return rc;
 }
 /*
 * Shutdown fullscreen view.
 */
 static void
+fs3270_save_callback(struct raw3270_request *rq, void *data)
+{
+        struct fs3270 *fp;
+        fp = (struct fs3270 *) rq->view;
+        /* Correct idal buffer element 0 address. */
+        fp->rdbuf->data[0] -= 5;
+        fp->rdbuf->size += 5;
+        /*
+         * If the rdbuf command failed or the idal buffer is
+         * to small for the amount of data returned by the
+         * rdbuf command, then we have no choice but to send
+         * a SIGHUP to the application.
+         */
+        if (rq->rc != 0 || rq->rescnt == 0) {
+                if (fp->fs_pid)
+                        kill_proc(fp->fs_pid, SIGHUP, 1);
+                fp->rdbuf_size = 0;
+        } else
+                fp->rdbuf_size = fp->rdbuf->size - rq->rescnt;
+        raw3270_request_reset(rq);
+        wake_up(&fp->wait);
+}
+static void
 fs3270_deactivate(struct raw3270_view *view)
 {
-        // FIXME: is this a good idea? The user program using fullscreen 3270
-        // will die just because a console message appeared. On the other
-        // hand the fullscreen device is unoperational now.
        struct fs3270 *fp;
        fp = (struct fs3270 *) view;
-        if (fp->fs_pid != 0)
+        fp->active = 0;
-                kill_proc(fp->fs_pid, SIGHUP, 1);
-        fp->fs_pid = 0;
+        /* If an old init command is still running just return. */
+        if (!raw3270_request_final(fp->init))
+                return;
+        /* Prepare read-buffer request. */
+        raw3270_request_set_cmd(fp->init, TC_RDBUF);
+        /*
+         * Hackish: skip first 5 bytes of the idal buffer to make
+         * room for the TW_KR/TO_SBA/<address>/<address>/TO_IC sequence
+         * in the activation command.
+         */
+        fp->rdbuf->data[0] += 5;
+        fp->rdbuf->size -= 5;
+        raw3270_request_set_idal(fp->init, fp->rdbuf);
+        fp->init->rescnt = 0;
+        fp->init->callback = fs3270_save_callback;
+        /* Start I/O to read in the 3270 buffer. */
+        fp->init->rc = raw3270_start_locked(view, fp->init);
+        if (fp->init->rc)
+                fp->init->callback(fp->init, NULL);
 }
 static int
@@ -103,7 +220,7 @@ fs3270_irq(struct fs3270 *fp, struct raw3270_request *rq, struct irb *irb)
        /* Handle ATTN. Set indication and wake waiters for attention. */
        if (irb->scsw.dstat & DEV_STAT_ATTENTION) {
                fp->attention = 1;
-                wake_up(&fp->attn_wait);
+                wake_up(&fp->wait);
        }
        if (rq) {
@@ -125,7 +242,7 @@ fs3270_read(struct file *filp, char *data, size_t count, loff_t *off)
        struct fs3270 *fp;
        struct raw3270_request *rq;
        struct idal_buffer *ib;
-        int rc;
+        ssize_t rc;
        
        if (count == 0 || count > 65535)
                return -EINVAL;
@@ -133,7 +250,7 @@ fs3270_read(struct file *filp, char *data, size_t count, loff_t *off)
        if (!fp)
                return -ENODEV;
        ib = idal_buffer_alloc(count, 0);
-        if (!ib)
+        if (IS_ERR(ib))
                return -ENOMEM;
        rq = raw3270_request_alloc(0);
        if (!IS_ERR(rq)) {
@@ -141,10 +258,19 @@ fs3270_read(struct file *filp, char *data, size_t count, loff_t *off)
                        fp->read_command = 6;
                raw3270_request_set_cmd(rq, fp->read_command ? : 2);
                raw3270_request_set_idal(rq, ib);
-                wait_event(fp->attn_wait, fp->attention);
+                rc = wait_event_interruptible(fp->wait, fp->attention);
-                rc = fs3270_do_io(&fp->view, rq);
+                fp->attention = 0;
-                if (rc == 0 && idal_buffer_to_user(ib, data, count))
+                if (rc == 0) {
-                        rc = -EFAULT;
+                        rc = fs3270_do_io(&fp->view, rq);
+                        if (rc == 0) {
+                                count -= rq->rescnt;
+                                if (idal_buffer_to_user(ib, data, count) != 0)
+                                        rc = -EFAULT;
+                                else
+                                        rc = count;
+                        }
+                }
                raw3270_request_free(rq);
        } else
                rc = PTR_ERR(rq);
@@ -162,13 +288,13 @@ fs3270_write(struct file *filp, const char *data, size_t count, loff_t *off)
        struct raw3270_request *rq;
        struct idal_buffer *ib;
        int write_command;
-        int rc;
+        ssize_t rc;
        fp = filp->private_data;
        if (!fp)
                return -ENODEV;
        ib = idal_buffer_alloc(count, 0);
-        if (!ib)
+        if (IS_ERR(ib))
                return -ENOMEM;
        rq = raw3270_request_alloc(0);
        if (!IS_ERR(rq)) {
@@ -179,6 +305,8 @@ fs3270_write(struct file *filp, const char *data, size_t count, loff_t *off)
                        raw3270_request_set_cmd(rq, write_command);
                        raw3270_request_set_idal(rq, ib);
                        rc = fs3270_do_io(&fp->view, rq);
+                        if (rc == 0)
+                                rc = count - rq->rescnt;
                } else
                        rc = -EFAULT;
                raw3270_request_free(rq);
@@ -232,7 +360,7 @@ fs3270_ioctl(struct inode *inode, struct file *filp,
 }
 /*
- * Allocate tty3270 structure.
+ * Allocate fs3270 structure.
 */
 static struct fs3270 *
 fs3270_alloc_view(void)
@@ -243,8 +371,8 @@ fs3270_alloc_view(void)
        if (!fp)
                return ERR_PTR(-ENOMEM);
        memset(fp, 0, sizeof(struct fs3270));
-        fp->clear = raw3270_request_alloc(0);
+        fp->init = raw3270_request_alloc(0);
-        if (!IS_ERR(fp->clear)) {
+        if (IS_ERR(fp->init)) {
                kfree(fp);
                return ERR_PTR(-ENOMEM);
        }
@@ -252,12 +380,17 @@ fs3270_alloc_view(void)
 }
 /*
- * Free tty3270 structure.
+ * Free fs3270 structure.
 */
 static void
 fs3270_free_view(struct raw3270_view *view)
 {
-        raw3270_request_free(((struct fs3270 *) view)->clear);
+        struct fs3270 *fp;
+        fp = (struct fs3270 *) view;
+        if (fp->rdbuf)
+                idal_buffer_free(fp->rdbuf);
+        raw3270_request_free(((struct fs3270 *) view)->init);
        kfree(view);
 }
@@ -285,11 +418,20 @@ static int
 fs3270_open(struct inode *inode, struct file *filp)
 {
        struct fs3270 *fp;
+        struct idal_buffer *ib;
        int minor, rc;
        if (imajor(filp->f_dentry->d_inode) != IBM_FS3270_MAJOR)
                return -ENODEV;
        minor = iminor(filp->f_dentry->d_inode);
+        /* Check for minor 0 multiplexer. */
+        if (minor == 0) {
+                if (!current->signal->tty)
+                        return -ENODEV;
+                if (current->signal->tty->driver->major != IBM_TTY3270_MAJOR)
+                        return -ENODEV;
+                minor = current->signal->tty->index + RAW3270_FIRSTMINOR;
+        }
        /* Check if some other program is already using fullscreen mode. */
        fp = (struct fs3270 *) raw3270_find_view(&fs3270_fn, minor);
        if (!IS_ERR(fp)) {
@@ -301,7 +443,7 @@ fs3270_open(struct inode *inode, struct file *filp)
        if (IS_ERR(fp))
                return PTR_ERR(fp);
-        init_waitqueue_head(&fp->attn_wait);
+        init_waitqueue_head(&fp->wait);
        fp->fs_pid = current->pid;
        rc = raw3270_add_view(&fp->view, &fs3270_fn, minor);
        if (rc) {
@@ -309,8 +451,18 @@ fs3270_open(struct inode *inode, struct file *filp)
                return rc;
        }
+        /* Allocate idal-buffer. */
+        ib = idal_buffer_alloc(2*fp->view.rows*fp->view.cols + 5, 0);
+        if (IS_ERR(ib)) {
+                raw3270_put_view(&fp->view);
+                raw3270_del_view(&fp->view);
+                return PTR_ERR(fp);
+        }
+        fp->rdbuf = ib;
        rc = raw3270_activate_view(&fp->view);
        if (rc) {
+                raw3270_put_view(&fp->view);
                raw3270_del_view(&fp->view);
                return rc;
        }
@@ -329,8 +481,12 @@ fs3270_close(struct inode *inode, struct file *filp)
        fp = filp->private_data;
        filp->private_data = 0;
-        if (fp)
+        if (fp) {
+                fp->fs_pid = 0;
+                raw3270_reset(&fp->view);
+                raw3270_put_view(&fp->view);
                raw3270_del_view(&fp->view);
+        }
        return 0;
 }
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 328d9cbc56a3..d66946443dfc 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -25,6 +25,12 @@
 #include "raw3270.h"
+#include <linux/major.h>
+#include <linux/kdev_t.h>
+#include <linux/device.h>
+struct class *class3270;
 /* The main 3270 data structure. */
 struct raw3270 {
        struct list_head list;
@@ -41,6 +47,8 @@ struct raw3270 {
        struct timer_list timer;        /* Device timer. */
        unsigned char *ascebc;          /* ascii -> ebcdic table */
+        struct class_device *clttydev;  /* 3270-class tty device ptr */
+        struct class_device *cltubdev;  /* 3270-class tub device ptr */
 };
 /* raw3270->flags */
@@ -317,6 +325,22 @@ raw3270_start(struct raw3270_view *view, struct raw3270_request *rq)
 }
 int
+raw3270_start_locked(struct raw3270_view *view, struct raw3270_request *rq)
+{
+        struct raw3270 *rp;
+        int rc;
+        rp = view->dev;
+        if (!rp || rp->view != view)
+                rc = -EACCES;
+        else if (!test_bit(RAW3270_FLAGS_READY, &rp->flags))
+                rc = -ENODEV;
+        else
+                rc =  __raw3270_start(rp, view, rq);
+        return rc;
+}
+int
 raw3270_start_irq(struct raw3270_view *view, struct raw3270_request *rq)
 {
        struct raw3270 *rp;
@@ -744,6 +768,22 @@ raw3270_reset_device(struct raw3270 *rp)
        return rc;
 }
+int
+raw3270_reset(struct raw3270_view *view)
+{
+        struct raw3270 *rp;
+        int rc;
+        rp = view->dev;
+        if (!rp || rp->view != view)
+                rc = -EACCES;
+        else if (!test_bit(RAW3270_FLAGS_READY, &rp->flags))
+                rc = -ENODEV;
+        else
+                rc = raw3270_reset_device(view->dev);
+        return rc;
+}
 /*
 * Setup new 3270 device.
 */
@@ -774,11 +814,12 @@ raw3270_setup_device(struct ccw_device *cdev, struct raw3270 *rp, char *ascebc)
        /*
         * Add device to list and find the smallest unused minor
-         * number for it.
+         * number for it. Note: there is no device with minor 0,
+         * see special case for fs3270.c:fs3270_open().
         */
        down(&raw3270_sem);
        /* Keep the list sorted. */
-        minor = 0;
+        minor = RAW3270_FIRSTMINOR;
        rp->minor = -1;
        list_for_each(l, &raw3270_devices) {
                tmp = list_entry(l, struct raw3270, list);
@@ -789,7 +830,7 @@ raw3270_setup_device(struct ccw_device *cdev, struct raw3270 *rp, char *ascebc)
                }
                minor++;
        }
-        if (rp->minor == -1 && minor < RAW3270_MAXDEVS) {
+        if (rp->minor == -1 && minor < RAW3270_MAXDEVS + RAW3270_FIRSTMINOR) {
                rp->minor = minor;
                list_add_tail(&rp->list, &raw3270_devices);
        }
@@ -941,11 +982,12 @@ raw3270_deactivate_view(struct raw3270_view *view)
                list_add_tail(&view->list, &rp->view_list);
                /* Try to activate another view. */
                if (test_bit(RAW3270_FLAGS_READY, &rp->flags)) {
-                        list_for_each_entry(view, &rp->view_list, list)
+                        list_for_each_entry(view, &rp->view_list, list) {
-                                if (view->fn->activate(view) == 0) {
+                                rp->view = view;
-                                        rp->view = view;
+                                if (view->fn->activate(view) == 0)
                                        break;
-                                }
+                                rp->view = 0;
+                        }
                }
        }
        spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
@@ -961,6 +1003,8 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
        struct raw3270 *rp;
        int rc;
+        if (minor <= 0)
+                return -ENODEV;
        down(&raw3270_sem);
        rc = -ENODEV;
        list_for_each_entry(rp, &raw3270_devices, list) {
@@ -976,7 +1020,7 @@ raw3270_add_view(struct raw3270_view *view, struct raw3270_fn *fn, int minor)
                        view->cols = rp->cols;
                        view->ascebc = rp->ascebc;
                        spin_lock_init(&view->lock);
-                        list_add_tail(&view->list, &rp->view_list);
+                        list_add(&view->list, &rp->view_list);
                        rc = 0;
                }
                spin_unlock_irqrestore(get_ccwdev_lock(rp->cdev), flags);
@@ -1039,7 +1083,7 @@ raw3270_del_view(struct raw3270_view *view)
        if (!rp->view && test_bit(RAW3270_FLAGS_READY, &rp->flags)) {
                /* Try to activate another view. */
                list_for_each_entry(nv, &rp->view_list, list) {
-                        if (nv->fn->activate(view) == 0) {
+                        if (nv->fn->activate(nv) == 0) {
                                rp->view = nv;
                                break;
                        }
@@ -1063,6 +1107,12 @@ raw3270_delete_device(struct raw3270 *rp)
        /* Remove from device chain. */
        down(&raw3270_sem);
+        if (rp->clttydev)
+                class_device_destroy(class3270,
+                                     MKDEV(IBM_TTY3270_MAJOR, rp->minor));
+        if (rp->cltubdev)
+                class_device_destroy(class3270,
+                                     MKDEV(IBM_FS3270_MAJOR, rp->minor));
        list_del_init(&rp->list);
        up(&raw3270_sem);
@@ -1129,6 +1179,16 @@ raw3270_create_attributes(struct raw3270 *rp)
 {
        //FIXME: check return code
        sysfs_create_group(&rp->cdev->dev.kobj, &raw3270_attr_group);
+        rp->clttydev =
+                class_device_create(class3270,
+                                    MKDEV(IBM_TTY3270_MAJOR, rp->minor),
+                                    &rp->cdev->dev, "tty%s",
+                                    rp->cdev->dev.bus_id);
+        rp->cltubdev =
+                class_device_create(class3270,
+                                    MKDEV(IBM_FS3270_MAJOR, rp->minor),
+                                    &rp->cdev->dev, "tub%s",
+                                    rp->cdev->dev.bus_id);
 }
 /*
@@ -1189,13 +1249,13 @@ raw3270_set_online (struct ccw_device *cdev)
                return PTR_ERR(rp);
        rc = raw3270_reset_device(rp);
        if (rc)
-                return rc;
+                goto failure;
        rc = raw3270_size_device(rp);
        if (rc)
-                return rc;
+                goto failure;
        rc = raw3270_reset_device(rp);
        if (rc)
-                return rc;
+                goto failure;
        raw3270_create_attributes(rp);
        set_bit(RAW3270_FLAGS_READY, &rp->flags);
        down(&raw3270_sem);
@@ -1203,6 +1263,10 @@ raw3270_set_online (struct ccw_device *cdev)
                np->notifier(rp->minor, 1);
        up(&raw3270_sem);
        return 0;
+failure:
+        raw3270_delete_device(rp);
+        return rc;
 }
 /*
@@ -1217,6 +1281,14 @@ raw3270_remove (struct ccw_device *cdev)
        struct raw3270_notifier *np;
        rp = cdev->dev.driver_data;
+        /*
+         * _remove is the opposite of _probe; it's probe that
+         * should set up rp.  raw3270_remove gets entered for
+         * devices even if they haven't been varied online.
+         * Thus, rp may validly be NULL here.
+         */
+        if (rp == NULL)
+                return;
        clear_bit(RAW3270_FLAGS_READY, &rp->flags);
        sysfs_remove_group(&cdev->dev.kobj, &raw3270_attr_group);
@@ -1301,6 +1373,7 @@ raw3270_init(void)
        if (rc == 0) {
                /* Create attributes for early (= console) device. */
                down(&raw3270_sem);
+                class3270 = class_create(THIS_MODULE, "3270");
                list_for_each_entry(rp, &raw3270_devices, list) {
                        get_device(&rp->cdev->dev);
                        raw3270_create_attributes(rp);
@@ -1314,6 +1387,7 @@ static void
 raw3270_exit(void)
 {
        ccw_driver_unregister(&raw3270_ccw_driver);
+        class_destroy(class3270);
 }
 MODULE_LICENSE("GPL");
@@ -1335,7 +1409,9 @@ EXPORT_SYMBOL(raw3270_find_view);
 EXPORT_SYMBOL(raw3270_activate_view);
 EXPORT_SYMBOL(raw3270_deactivate_view);
 EXPORT_SYMBOL(raw3270_start);
+EXPORT_SYMBOL(raw3270_start_locked);
 EXPORT_SYMBOL(raw3270_start_irq);
+EXPORT_SYMBOL(raw3270_reset);
 EXPORT_SYMBOL(raw3270_register_notifier);
 EXPORT_SYMBOL(raw3270_unregister_notifier);
 EXPORT_SYMBOL(raw3270_wait_queue);
diff --git a/drivers/s390/char/raw3270.h b/drivers/s390/char/raw3270.h
index ed5d4eb9f623..b635bf8e7775 100644
--- a/drivers/s390/char/raw3270.h
+++ b/drivers/s390/char/raw3270.h
@@ -21,6 +21,7 @@
 /* Local Channel Commands */
 #define TC_WRITE        0x01            /* Write */
+#define TC_RDBUF        0x02            /* Read Buffer */
 #define TC_EWRITE       0x05            /* Erase write */
 #define TC_READMOD      0x06            /* Read modified */
 #define TC_EWRITEA      0x0d            /* Erase write alternate */
@@ -76,7 +77,8 @@
 #define TW_KR           0xc2            /* Keyboard restore */
 #define TW_PLUSALARM    0x04            /* Add this bit for alarm */
-#define RAW3270_MAXDEVS 256
+#define RAW3270_FIRSTMINOR      1       /* First minor number */
+#define RAW3270_MAXDEVS         255     /* Max number of 3270 devices */
 /* For TUBGETMOD and TUBSETMOD. Should include. */
 struct raw3270_iocb {
@@ -166,7 +168,10 @@ void raw3270_del_view(struct raw3270_view *);
 void raw3270_deactivate_view(struct raw3270_view *);
 struct raw3270_view *raw3270_find_view(struct raw3270_fn *, int);
 int raw3270_start(struct raw3270_view *, struct raw3270_request *);
+int raw3270_start_locked(struct raw3270_view *, struct raw3270_request *);
 int raw3270_start_irq(struct raw3270_view *, struct raw3270_request *);
+int raw3270_reset(struct raw3270_view *);
+struct raw3270_view *raw3270_view(struct raw3270_view *);
 /* Reference count inliner for view structures. */
 static inline void
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 7db5ebce7f0f..4b9069370388 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -653,18 +653,12 @@ tty3270_activate(struct raw3270_view *view)
        tp->update_flags = TTY_UPDATE_ALL;
        tty3270_set_timer(tp, 1);
        spin_unlock_irqrestore(&tp->view.lock, flags);
-        start_tty(tp->tty);
        return 0;
 }
 static void
 tty3270_deactivate(struct raw3270_view *view)
 {
-        struct tty3270 *tp;
-        tp = (struct tty3270 *) view;
-        if (tp && tp->tty)
-                stop_tty(tp->tty);
 }
 static int
@@ -716,13 +710,13 @@ tty3270_alloc_view(void)
                                  tp->freemem_pages[pages], PAGE_SIZE);
        }
        tp->write = raw3270_request_alloc(TTY3270_OUTPUT_BUFFER_SIZE);
-        if (!tp->write)
+        if (IS_ERR(tp->write))
                goto out_pages;
        tp->read = raw3270_request_alloc(0);
-        if (!tp->read)
+        if (IS_ERR(tp->read))
                goto out_write;
        tp->kreset = raw3270_request_alloc(1);
-        if (!tp->kreset)
+        if (IS_ERR(tp->kreset))
                goto out_read;
        tp->kbd = kbd_alloc();
        if (!tp->kbd)
@@ -845,7 +839,8 @@ tty3270_del_views(void)
        int i;
        for (i = 0; i < tty3270_max_index; i++) {
-                tp = (struct tty3270 *) raw3270_find_view(&tty3270_fn, i);
+                tp = (struct tty3270 *)
+                        raw3270_find_view(&tty3270_fn, i + RAW3270_FIRSTMINOR);
                if (!IS_ERR(tp))
                        raw3270_del_view(&tp->view);
        }
@@ -871,7 +866,9 @@ tty3270_open(struct tty_struct *tty, struct file * filp)
        if (tty->count > 1)
                return 0;
        /* Check if the tty3270 is already there. */
-        tp = (struct tty3270 *) raw3270_find_view(&tty3270_fn, tty->index);
+        tp = (struct tty3270 *)
+                raw3270_find_view(&tty3270_fn,
+                                  tty->index + RAW3270_FIRSTMINOR);
        if (!IS_ERR(tp)) {
                tty->driver_data = tp;
                tty->winsize.ws_row = tp->view.rows - 2;
@@ -903,7 +900,8 @@ tty3270_open(struct tty_struct *tty, struct file * filp)
                     (void (*)(unsigned long)) tty3270_read_tasklet,
                     (unsigned long) tp->read);
-        rc = raw3270_add_view(&tp->view, &tty3270_fn, tty->index);
+        rc = raw3270_add_view(&tp->view, &tty3270_fn,
+                              tty->index + RAW3270_FIRSTMINOR);
        if (rc) {
                tty3270_free_view(tp);
                return rc;
@@ -911,8 +909,8 @@ tty3270_open(struct tty_struct *tty, struct file * filp)
        rc = tty3270_alloc_screen(tp);
        if (rc) {
-                raw3270_del_view(&tp->view);
                raw3270_put_view(&tp->view);
+                raw3270_del_view(&tp->view);
                return rc;
        }
@@ -1780,7 +1778,7 @@ tty3270_init(void)
        struct tty_driver *driver;
        int ret;
-        driver = alloc_tty_driver(256);
+        driver = alloc_tty_driver(RAW3270_MAXDEVS);
        if (!driver)
                return -ENOMEM;
@@ -1794,6 +1792,7 @@ tty3270_init(void)
        driver->driver_name = "ttyTUB";
        driver->name = "ttyTUB";
        driver->major = IBM_TTY3270_MAJOR;
+        driver->minor_start = RAW3270_FIRSTMINOR;
        driver->type = TTY_DRIVER_TYPE_SYSTEM;
        driver->subtype = SYSTEM_TYPE_TTY;
        driver->init_termios = tty_std_termios;
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 8cc4f1a940dc..c05b069c2996 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -30,10 +30,13 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/slab.h>
+#include <linux/timex.h>        /* get_clock() */
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/cmb.h>
+#include <asm/div64.h>
 #include "cio.h"
 #include "css.h"
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 9adc11e8b8bc..811c9d150637 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -22,6 +22,7 @@
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
+#include <asm/param.h>          /* HZ */
 #include "cio.h"
 #include "css.h"
@@ -252,6 +253,23 @@ cutype_show (struct device *dev, struct device_attribute *attr, char *buf)
 }
 static ssize_t
+modalias_show (struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct ccw_device *cdev = to_ccwdev(dev);
+        struct ccw_device_id *id = &(cdev->id);
+        int ret;
+        ret = sprintf(buf, "ccw:t%04Xm%02x",
+                        id->cu_type, id->cu_model);
+        if (id->dev_type != 0)
+                ret += sprintf(buf + ret, "dt%04Xdm%02X\n",
+                                id->dev_type, id->dev_model);
+        else
+                ret += sprintf(buf + ret, "dtdm\n");
+        return ret;
+}
+static ssize_t
 online_show (struct device *dev, struct device_attribute *attr, char *buf)
 {
        struct ccw_device *cdev = to_ccwdev(dev);
@@ -448,6 +466,7 @@ static DEVICE_ATTR(chpids, 0444, chpids_show, NULL);
 static DEVICE_ATTR(pimpampom, 0444, pimpampom_show, NULL);
 static DEVICE_ATTR(devtype, 0444, devtype_show, NULL);
 static DEVICE_ATTR(cutype, 0444, cutype_show, NULL);
+static DEVICE_ATTR(modalias, 0444, modalias_show, NULL);
 static DEVICE_ATTR(online, 0644, online_show, online_store);
 extern struct device_attribute dev_attr_cmb_enable;
 static DEVICE_ATTR(availability, 0444, available_show, NULL);
@@ -471,6 +490,7 @@ subchannel_add_files (struct device *dev)
 static struct attribute * ccwdev_attrs[] = {
        &dev_attr_devtype.attr,
        &dev_attr_cutype.attr,
+        &dev_attr_modalias.attr,
        &dev_attr_online.attr,
        &dev_attr_cmb_enable.attr,
        &dev_attr_availability.attr,
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index fbe4202a3f6f..c1c89f4fd4e3 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -11,6 +11,8 @@
 #include <linux/module.h>
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/string.h>
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index fe8187d6f58b..e2a5657d5fdb 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -41,6 +41,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/dma-mapping.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -192,7 +193,6 @@ static void ahci_port_stop(struct ata_port *ap);
 static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
 static void ahci_qc_prep(struct ata_queued_cmd *qc);
 static u8 ahci_check_status(struct ata_port *ap);
-static u8 ahci_check_err(struct ata_port *ap);
 static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
 static void ahci_remove_one (struct pci_dev *pdev);
@@ -221,7 +221,6 @@ static const struct ata_port_operations ahci_ops = {
        .check_status           = ahci_check_status,
        .check_altstatus        = ahci_check_status,
-        .check_err              = ahci_check_err,
        .dev_select             = ata_noop_dev_select,
        .tf_read                = ahci_tf_read,
@@ -458,13 +457,6 @@ static u8 ahci_check_status(struct ata_port *ap)
        return readl(mmio + PORT_TFDATA) & 0xFF;
 }
-static u8 ahci_check_err(struct ata_port *ap)
-{
-        void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr;
-        return (readl(mmio + PORT_TFDATA) >> 8) & 0xFF;
-}
 static void ahci_tf_read(struct ata_port *ap, struct ata_taskfile *tf)
 {
        struct ahci_port_priv *pp = ap->private_data;
@@ -609,7 +601,7 @@ static void ahci_eng_timeout(struct ata_port *ap)
                 * not being called from the SCSI EH.
                 */
                qc->scsidone = scsi_finish_command;
-                ata_qc_complete(qc, ATA_ERR);
+                ata_qc_complete(qc, AC_ERR_OTHER);
        }
        spin_unlock_irqrestore(&host_set->lock, flags);
@@ -638,7 +630,7 @@ static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
        if (status & PORT_IRQ_FATAL) {
                ahci_intr_error(ap, status);
                if (qc)
-                        ata_qc_complete(qc, ATA_ERR);
+                        ata_qc_complete(qc, AC_ERR_OTHER);
        }
        return 1;
@@ -683,10 +675,10 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
                        if (!ahci_host_intr(ap, qc))
                                if (ata_ratelimit()) {
                                        struct pci_dev *pdev =
-                                          to_pci_dev(ap->host_set->dev);
+                                                to_pci_dev(ap->host_set->dev);
-                                        printk(KERN_WARNING
+                                        dev_printk(KERN_WARNING, &pdev->dev,
-                                          "ahci(%s): unhandled interrupt on port %u\n",
+                                          "unhandled interrupt on port %u\n",
-                                          pci_name(pdev), i);
+                                          i);
                                }
                        VPRINTK("port %u\n", i);
@@ -694,10 +686,9 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
                        VPRINTK("port %u (no irq)\n", i);
                        if (ata_ratelimit()) {
                                struct pci_dev *pdev =
-                                  to_pci_dev(ap->host_set->dev);
+                                        to_pci_dev(ap->host_set->dev);
-                                printk(KERN_WARNING
+                                dev_printk(KERN_WARNING, &pdev->dev,
-                                  "ahci(%s): interrupt on disabled port %u\n",
+                                        "interrupt on disabled port %u\n", i);
-                                  pci_name(pdev), i);
                        }
                }
@@ -769,8 +760,8 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
        tmp = readl(mmio + HOST_CTL);
        if (tmp & HOST_RESET) {
-                printk(KERN_ERR DRV_NAME "(%s): controller reset failed (0x%x)\n",
+                dev_printk(KERN_ERR, &pdev->dev,
-                        pci_name(pdev), tmp);
+                           "controller reset failed (0x%x)\n", tmp);
                return -EIO;
        }
@@ -798,22 +789,22 @@ static int ahci_host_init(struct ata_probe_ent *probe_ent)
                if (rc) {
                        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
                        if (rc) {
-                                printk(KERN_ERR DRV_NAME "(%s): 64-bit DMA enable failed\n",
+                                dev_printk(KERN_ERR, &pdev->dev,
-                                        pci_name(pdev));
+                                           "64-bit DMA enable failed\n");
                                return rc;
                        }
                }
        } else {
                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                if (rc) {
-                        printk(KERN_ERR DRV_NAME "(%s): 32-bit DMA enable failed\n",
+                        dev_printk(KERN_ERR, &pdev->dev,
-                                pci_name(pdev));
+                                   "32-bit DMA enable failed\n");
                        return rc;
                }
                rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
                if (rc) {
-                        printk(KERN_ERR DRV_NAME "(%s): 32-bit consistent DMA enable failed\n",
+                        dev_printk(KERN_ERR, &pdev->dev,
-                                pci_name(pdev));
+                                   "32-bit consistent DMA enable failed\n");
                        return rc;
                }
        }
@@ -916,10 +907,10 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent)
        else
                scc_s = "unknown";
-        printk(KERN_INFO DRV_NAME "(%s) AHCI %02x%02x.%02x%02x "
+        dev_printk(KERN_INFO, &pdev->dev,
+                "AHCI %02x%02x.%02x%02x "
                "%u slots %u ports %s Gbps 0x%x impl %s mode\n"
                ,
-                pci_name(pdev),
                (vers >> 24) & 0xff,
                (vers >> 16) & 0xff,
@@ -932,11 +923,11 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent)
                impl,
                scc_s);
-        printk(KERN_INFO DRV_NAME "(%s) flags: "
+        dev_printk(KERN_INFO, &pdev->dev,
+                "flags: "
                "%s%s%s%s%s%s"
                "%s%s%s%s%s%s%s\n"
                ,
-                pci_name(pdev),
                cap & (1 << 31) ? "64bit " : "",
                cap & (1 << 30) ? "ncq " : "",
@@ -969,7 +960,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        VPRINTK("ENTER\n");
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index be021478f416..7f8aa1b552ce 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -45,6 +45,7 @@
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -621,18 +622,19 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        static int printed_version;
        struct ata_port_info *port_info[2];
-        unsigned int combined = 0, n_ports = 1;
+        unsigned int combined = 0;
        unsigned int pata_chan = 0, sata_chan = 0;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev,
+                           "version " DRV_VERSION "\n");
        /* no hotplugging support (FIXME) */
        if (!in_module_init)
                return -ENODEV;
        port_info[0] = &piix_port_info[ent->driver_data];
-        port_info[1] = NULL;
+        port_info[1] = &piix_port_info[ent->driver_data];
        if (port_info[0]->host_flags & PIIX_FLAG_AHCI) {
                u8 tmp;
@@ -670,12 +672,13 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                port_info[sata_chan] = &piix_port_info[ent->driver_data];
                port_info[sata_chan]->host_flags |= ATA_FLAG_SLAVE_POSS;
                port_info[pata_chan] = &piix_port_info[ich5_pata];
-                n_ports++;
-                printk(KERN_WARNING DRV_NAME ": combined mode detected\n");
+                dev_printk(KERN_WARNING, &pdev->dev,
+                           "combined mode detected (p=%u, s=%u)\n",
+                           pata_chan, sata_chan);
        }
-        return ata_pci_init_one(pdev, port_info, n_ports);
+        return ata_pci_init_one(pdev, port_info, 2);
 }
 static int __init piix_init(void)
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 3d62c9bcbff7..00d6a6657ebc 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -180,19 +180,12 @@ static void idescsi_input_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsigne
                        return;
                }
                count = min(pc->sg->length - pc->b_count, bcount);
-                if (PageHighMem(pc->sg->page)) {
+                buf = kmap_atomic(pc->sg->page, KM_IRQ0);
-                        unsigned long flags;
+                drive->hwif->atapi_input_bytes(drive,
+                                buf + pc->b_count + pc->sg->offset, count);
-                        local_irq_save(flags);
+                kunmap_atomic(buf, KM_IRQ0);
-                        buf = kmap_atomic(pc->sg->page, KM_IRQ0) + pc->sg->offset;
+                bcount -= count;
-                        drive->hwif->atapi_input_bytes(drive, buf + pc->b_count, count);
+                pc->b_count += count;
-                        kunmap_atomic(buf - pc->sg->offset, KM_IRQ0);
-                        local_irq_restore(flags);
-                } else {
-                        buf = page_address(pc->sg->page) + pc->sg->offset;
-                        drive->hwif->atapi_input_bytes(drive, buf + pc->b_count, count);
-                }
-                bcount -= count; pc->b_count += count;
                if (pc->b_count == pc->sg->length) {
                        pc->sg++;
                        pc->b_count = 0;
@@ -212,19 +205,12 @@ static void idescsi_output_buffers (ide_drive_t *drive, idescsi_pc_t *pc, unsign
                        return;
                }
                count = min(pc->sg->length - pc->b_count, bcount);
-                if (PageHighMem(pc->sg->page)) {
+                buf = kmap_atomic(pc->sg->page, KM_IRQ0);
-                        unsigned long flags;
+                drive->hwif->atapi_output_bytes(drive,
+                                buf + pc->b_count + pc->sg->offset, count);
-                        local_irq_save(flags);
+                kunmap_atomic(buf, KM_IRQ0);
-                        buf = kmap_atomic(pc->sg->page, KM_IRQ0) + pc->sg->offset;
+                bcount -= count;
-                        drive->hwif->atapi_output_bytes(drive, buf + pc->b_count, count);
+                pc->b_count += count;
-                        kunmap_atomic(buf - pc->sg->offset, KM_IRQ0);
-                        local_irq_restore(flags);
-                } else {
-                        buf = page_address(pc->sg->page) + pc->sg->offset;
-                        drive->hwif->atapi_output_bytes(drive, buf + pc->b_count, count);
-                }
-                bcount -= count; pc->b_count += count;
                if (pc->b_count == pc->sg->length) {
                        pc->sg++;
                        pc->b_count = 0;
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 5ca97605ff35..8be7dc0b47b8 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -372,7 +372,7 @@ static void ata_tf_read_pio(struct ata_port *ap, struct ata_taskfile *tf)
        struct ata_ioports *ioaddr = &ap->ioaddr;
        tf->command = ata_check_status(ap);
-        tf->feature = ata_chk_err(ap);
+        tf->feature = inb(ioaddr->error_addr);
        tf->nsect = inb(ioaddr->nsect_addr);
        tf->lbal = inb(ioaddr->lbal_addr);
        tf->lbam = inb(ioaddr->lbam_addr);
@@ -406,7 +406,7 @@ static void ata_tf_read_mmio(struct ata_port *ap, struct ata_taskfile *tf)
        struct ata_ioports *ioaddr = &ap->ioaddr;
        tf->command = ata_check_status(ap);
-        tf->feature = ata_chk_err(ap);
+        tf->feature = readb((void __iomem *)ioaddr->error_addr);
        tf->nsect = readb((void __iomem *)ioaddr->nsect_addr);
        tf->lbal = readb((void __iomem *)ioaddr->lbal_addr);
        tf->lbam = readb((void __iomem *)ioaddr->lbam_addr);
@@ -527,30 +527,6 @@ u8 ata_altstatus(struct ata_port *ap)
 /**
- *      ata_chk_err - Read device error reg
- *      @ap: port where the device is
- *
- *      Reads ATA taskfile error register for
- *      currently-selected device and return its value.
- *
- *      Note: may NOT be used as the check_err() entry in
- *      ata_port_operations.
- *
- *      LOCKING:
- *      Inherited from caller.
- */
-u8 ata_chk_err(struct ata_port *ap)
-{
-        if (ap->ops->check_err)
-                return ap->ops->check_err(ap);
-        if (ap->flags & ATA_FLAG_MMIO) {
-                return readb((void __iomem *) ap->ioaddr.error_addr);
-        }
-        return inb(ap->ioaddr.error_addr);
-}
-/**
 *      ata_tf_to_fis - Convert ATA taskfile to SATA FIS structure
 *      @tf: Taskfile to convert
 *      @fis: Buffer into which data will output
@@ -902,8 +878,8 @@ static u8 ata_dev_try_classify(struct ata_port *ap, unsigned int device)
        memset(&tf, 0, sizeof(tf));
-        err = ata_chk_err(ap);
        ap->ops->tf_read(ap, &tf);
+        err = tf.feature;
        dev->class = ATA_DEV_NONE;
@@ -1140,7 +1116,6 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device)
        unsigned int major_version;
        u16 tmp;
        unsigned long xfer_modes;
-        u8 status;
        unsigned int using_edd;
        DECLARE_COMPLETION(wait);
        struct ata_queued_cmd *qc;
@@ -1194,8 +1169,11 @@ retry:
        else
                wait_for_completion(&wait);
-        status = ata_chk_status(ap);
+        spin_lock_irqsave(&ap->host_set->lock, flags);
-        if (status & ATA_ERR) {
+        ap->ops->tf_read(ap, &qc->tf);
+        spin_unlock_irqrestore(&ap->host_set->lock, flags);
+        if (qc->tf.command & ATA_ERR) {
                /*
                 * arg!  EDD works for all test cases, but seems to return
                 * the ATA signature for some ATAPI devices.  Until the
@@ -1208,7 +1186,7 @@ retry:
                 * to have this problem.
                 */
                if ((using_edd) && (qc->tf.command == ATA_CMD_ID_ATA)) {
-                        u8 err = ata_chk_err(ap);
+                        u8 err = qc->tf.feature;
                        if (err & ATA_ABORTED) {
                                dev->class = ATA_DEV_ATAPI;
                                qc->cursg = 0;
@@ -2685,7 +2663,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
 *      None.  (grabs host lock)
 */
-void ata_poll_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
+void ata_poll_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)
 {
        struct ata_port *ap = qc->ap;
        unsigned long flags;
@@ -2693,7 +2671,7 @@ void ata_poll_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
        spin_lock_irqsave(&ap->host_set->lock, flags);
        ap->flags &= ~ATA_FLAG_NOINTR;
        ata_irq_on(ap);
-        ata_qc_complete(qc, drv_stat);
+        ata_qc_complete(qc, err_mask);
        spin_unlock_irqrestore(&ap->host_set->lock, flags);
 }
@@ -2790,7 +2768,7 @@ static int ata_pio_complete (struct ata_port *ap)
        ap->hsm_task_state = HSM_ST_IDLE;
-        ata_poll_qc_complete(qc, drv_stat);
+        ata_poll_qc_complete(qc, 0);
        /* another command may start at this point */
@@ -3158,18 +3136,15 @@ static void ata_pio_block(struct ata_port *ap)
 static void ata_pio_error(struct ata_port *ap)
 {
        struct ata_queued_cmd *qc;
-        u8 drv_stat;
+        printk(KERN_WARNING "ata%u: PIO error\n", ap->id);
        qc = ata_qc_from_tag(ap, ap->active_tag);
        assert(qc != NULL);
-        drv_stat = ata_chk_status(ap);
-        printk(KERN_WARNING "ata%u: PIO error, drv_stat 0x%x\n",
-               ap->id, drv_stat);
        ap->hsm_task_state = HSM_ST_IDLE;
-        ata_poll_qc_complete(qc, drv_stat | ATA_ERR);
+        ata_poll_qc_complete(qc, AC_ERR_ATA_BUS);
 }
 static void ata_pio_task(void *_data)
@@ -3292,7 +3267,7 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc)
                       ap->id, qc->tf.command, drv_stat, host_stat);
                /* complete taskfile transaction */
-                ata_qc_complete(qc, drv_stat);
+                ata_qc_complete(qc, ac_err_mask(drv_stat));
                break;
        }
@@ -3397,7 +3372,7 @@ struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
        return qc;
 }
-int ata_qc_complete_noop(struct ata_queued_cmd *qc, u8 drv_stat)
+int ata_qc_complete_noop(struct ata_queued_cmd *qc, unsigned int err_mask)
 {
        return 0;
 }
@@ -3456,7 +3431,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
 *      spin_lock_irqsave(host_set lock)
 */
-void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
+void ata_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)
 {
        int rc;
@@ -3473,7 +3448,7 @@ void ata_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
        qc->flags &= ~ATA_QCFLAG_ACTIVE;
        /* call completion callback */
-        rc = qc->complete_fn(qc, drv_stat);
+        rc = qc->complete_fn(qc, err_mask);
        /* if callback indicates not to complete command (non-zero),
         * return immediately
@@ -3911,7 +3886,7 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
                ap->ops->irq_clear(ap);
                /* complete taskfile transaction */
-                ata_qc_complete(qc, status);
+                ata_qc_complete(qc, ac_err_mask(status));
                break;
        default:
@@ -4006,7 +3981,7 @@ static void atapi_packet_task(void *_data)
        /* sleep-wait for BSY to clear */
        DPRINTK("busy wait\n");
        if (ata_busy_sleep(ap, ATA_TMOUT_CDB_QUICK, ATA_TMOUT_CDB))
-                goto err_out;
+                goto err_out_status;
        /* make sure DRQ is set */
        status = ata_chk_status(ap);
@@ -4043,8 +4018,10 @@ static void atapi_packet_task(void *_data)
        return;
+err_out_status:
+        status = ata_chk_status(ap);
 err_out:
-        ata_poll_qc_complete(qc, ATA_ERR);
+        ata_poll_qc_complete(qc, __ac_err_mask(status));
 }
@@ -4550,11 +4527,11 @@ ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int
        return probe_ent;
 }
-static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, struct ata_port_info **port, int port_num)
+static struct ata_probe_ent *ata_pci_init_legacy_port(struct pci_dev *pdev, struct ata_port_info *port, int port_num)
 {
        struct ata_probe_ent *probe_ent;
-        probe_ent = ata_probe_ent_alloc(pci_dev_to_dev(pdev), port[0]);
+        probe_ent = ata_probe_ent_alloc(pci_dev_to_dev(pdev), port);
        if (!probe_ent)
                return NULL;
@@ -4701,9 +4678,9 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
        if (legacy_mode) {
                if (legacy_mode & (1 << 0))
-                        probe_ent = ata_pci_init_legacy_port(pdev, port, 0);
+                        probe_ent = ata_pci_init_legacy_port(pdev, port[0], 0);
                if (legacy_mode & (1 << 1))
-                        probe_ent2 = ata_pci_init_legacy_port(pdev, port, 1);
+                        probe_ent2 = ata_pci_init_legacy_port(pdev, port[1], 1);
        } else {
                if (n_ports == 2)
                        probe_ent = ata_pci_init_native_mode(pdev, port, ATA_PORT_PRIMARY | ATA_PORT_SECONDARY);
@@ -4867,7 +4844,6 @@ EXPORT_SYMBOL_GPL(ata_tf_to_fis);
 EXPORT_SYMBOL_GPL(ata_tf_from_fis);
 EXPORT_SYMBOL_GPL(ata_check_status);
 EXPORT_SYMBOL_GPL(ata_altstatus);
-EXPORT_SYMBOL_GPL(ata_chk_err);
 EXPORT_SYMBOL_GPL(ata_exec_command);
 EXPORT_SYMBOL_GPL(ata_port_start);
 EXPORT_SYMBOL_GPL(ata_port_stop);
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 89a04b1a5a0e..1e3792f86fcf 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -560,7 +560,7 @@ void ata_gen_ata_desc_sense(struct ata_queued_cmd *qc)
         * Use ata_to_sense_error() to map status register bits
         * onto sense key, asc & ascq.
         */
-        if (unlikely(tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ))) {
+        if (tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
                ata_to_sense_error(qc->ap->id, tf->command, tf->feature,
                                   &sb[1], &sb[2], &sb[3]);
                sb[1] &= 0x0f;
@@ -635,7 +635,7 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc)
         * Use ata_to_sense_error() to map status register bits
         * onto sense key, asc & ascq.
         */
-        if (unlikely(tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ))) {
+        if (tf->command & (ATA_BUSY | ATA_DF | ATA_ERR | ATA_DRQ)) {
                ata_to_sense_error(qc->ap->id, tf->command, tf->feature,
                                   &sb[2], &sb[12], &sb[13]);
                sb[2] &= 0x0f;
@@ -644,7 +644,11 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc)
        sb[0] = 0x70;
        sb[7] = 0x0a;
-        if (tf->flags & ATA_TFLAG_LBA && !(tf->flags & ATA_TFLAG_LBA48)) {
+        if (tf->flags & ATA_TFLAG_LBA48) {
+                /* TODO: find solution for LBA48 descriptors */
+        }
+        else if (tf->flags & ATA_TFLAG_LBA) {
                /* A small (28b) LBA will fit in the 32b info field */
                sb[0] |= 0x80;          /* set valid bit */
                sb[3] = tf->device & 0x0f;
@@ -652,6 +656,10 @@ void ata_gen_fixed_sense(struct ata_queued_cmd *qc)
                sb[5] = tf->lbam;
                sb[6] = tf->lbal;
        }
+        else {
+                /* TODO: C/H/S */
+        }
 }
 /**
@@ -1199,10 +1207,12 @@ nothing_to_do:
        return 1;
 }
-static int ata_scsi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
+static int ata_scsi_qc_complete(struct ata_queued_cmd *qc,
+                                unsigned int err_mask)
 {
        struct scsi_cmnd *cmd = qc->scsicmd;
-        int need_sense = drv_stat & (ATA_ERR | ATA_BUSY | ATA_DRQ);
+        u8 *cdb = cmd->cmnd;
+        int need_sense = (err_mask != 0);
        /* For ATA pass thru (SAT) commands, generate a sense block if
         * user mandated it or if there's an error.  Note that if we
@@ -1211,8 +1221,8 @@ static int ata_scsi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
         * whether the command completed successfully or not. If there
         * was no error, SK, ASC and ASCQ will all be zero.
         */
-        if (((cmd->cmnd[0] == ATA_16) || (cmd->cmnd[0] == ATA_12)) &&
+        if (((cdb[0] == ATA_16) || (cdb[0] == ATA_12)) &&
-            ((cmd->cmnd[2] & 0x20) || need_sense)) {
+            ((cdb[2] & 0x20) || need_sense)) {
                ata_gen_ata_desc_sense(qc);
        } else {
                if (!need_sense) {
@@ -1995,21 +2005,13 @@ void atapi_request_sense(struct ata_port *ap, struct ata_device *dev,
        DPRINTK("EXIT\n");
 }
-static int atapi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
+static int atapi_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask)
 {
        struct scsi_cmnd *cmd = qc->scsicmd;
-        VPRINTK("ENTER, drv_stat == 0x%x\n", drv_stat);
+        VPRINTK("ENTER, err_mask 0x%X\n", err_mask);
-        if (unlikely(drv_stat & (ATA_BUSY | ATA_DRQ)))
-                /* FIXME: not quite right; we don't want the
-                 * translation of taskfile registers into
-                 * a sense descriptors, since that's only
-                 * correct for ATA, not ATAPI
-                 */
-                ata_gen_ata_desc_sense(qc);
-        else if (unlikely(drv_stat & ATA_ERR)) {
+        if (unlikely(err_mask & AC_ERR_DEV)) {
                DPRINTK("request check condition\n");
                /* FIXME: command completion with check condition
@@ -2026,6 +2028,14 @@ static int atapi_qc_complete(struct ata_queued_cmd *qc, u8 drv_stat)
                return 1;
        }
+        else if (unlikely(err_mask))
+                /* FIXME: not quite right; we don't want the
+                 * translation of taskfile registers into
+                 * a sense descriptors, since that's only
+                 * correct for ATA, not ATAPI
+                 */
+                ata_gen_ata_desc_sense(qc);
        else {
                u8 *scsicmd = cmd->cmnd;
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 65c264b91136..10ecd9e15e4f 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -39,7 +39,7 @@ struct ata_scsi_args {
 /* libata-core.c */
 extern int atapi_enabled;
-extern int ata_qc_complete_noop(struct ata_queued_cmd *qc, u8 drv_stat);
+extern int ata_qc_complete_noop(struct ata_queued_cmd *qc, unsigned int err_mask);
 extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,
                                      struct ata_device *dev);
 extern void ata_rwcmd_protocol(struct ata_queued_cmd *qc);
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index b235556b7b65..bdccf73cf9fe 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -730,7 +730,7 @@ static void start_phase(struct mesh_state *ms)
                 * issue a SEQ_MSGOUT to get the mesh to drop ACK.
                 */
                if ((in_8(&mr->bus_status0) & BS0_ATN) == 0) {
-                        dlog(ms, "bus0 was %.2x explictly asserting ATN", mr->bus_status0);
+                        dlog(ms, "bus0 was %.2x explicitly asserting ATN", mr->bus_status0);
                        out_8(&mr->bus_status0, BS0_ATN); /* explicit ATN */
                        mesh_flush_io(mr);
                        udelay(1);
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c
index af99feb9d237..665017eda8a6 100644
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@ -40,6 +40,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <asm/io.h>
@@ -451,7 +452,7 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set)
                struct adma_port_priv *pp;
                struct ata_queued_cmd *qc;
                void __iomem *chan = ADMA_REGS(mmio_base, port_no);
-                u8 drv_stat = 0, status = readb(chan + ADMA_STATUS);
+                u8 status = readb(chan + ADMA_STATUS);
                if (status == 0)
                        continue;
@@ -464,11 +465,14 @@ static inline unsigned int adma_intr_pkt(struct ata_host_set *host_set)
                        continue;
                qc = ata_qc_from_tag(ap, ap->active_tag);
                if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
+                        unsigned int err_mask = 0;
                        if ((status & (aPERR | aPSD | aUIRQ)))
-                                drv_stat = ATA_ERR;
+                                err_mask = AC_ERR_OTHER;
                        else if (pp->pkt[0] != cDONE)
-                                drv_stat = ATA_ERR;
+                                err_mask = AC_ERR_OTHER;
-                        ata_qc_complete(qc, drv_stat);
+                        ata_qc_complete(qc, err_mask);
                }
        }
        return handled;
@@ -498,7 +502,7 @@ static inline unsigned int adma_intr_mmio(struct ata_host_set *host_set)
                
                                /* complete taskfile transaction */
                                pp->state = adma_state_idle;
-                                ata_qc_complete(qc, status);
+                                ata_qc_complete(qc, ac_err_mask(status));
                                handled = 1;
                        }
                }
@@ -623,16 +627,14 @@ static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
        if (rc) {
-                printk(KERN_ERR DRV_NAME
+                dev_printk(KERN_ERR, &pdev->dev,
-                        "(%s): 32-bit DMA enable failed\n",
+                        "32-bit DMA enable failed\n");
-                        pci_name(pdev));
                return rc;
        }
        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
        if (rc) {
-                printk(KERN_ERR DRV_NAME
+                dev_printk(KERN_ERR, &pdev->dev,
-                        "(%s): 32-bit consistent DMA enable failed\n",
+                        "32-bit consistent DMA enable failed\n");
-                        pci_name(pdev));
                return rc;
        }
        return 0;
@@ -648,7 +650,7 @@ static int adma_ata_init_one(struct pci_dev *pdev,
        int rc, port_no;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c
index 422e0b6f603a..46dbdee79f77 100644
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -29,6 +29,7 @@
 #include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/dma-mapping.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -258,7 +259,6 @@ struct mv_host_priv {
 static void mv_irq_clear(struct ata_port *ap);
 static u32 mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in);
 static void mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val);
-static u8 mv_check_err(struct ata_port *ap);
 static void mv_phy_reset(struct ata_port *ap);
 static void mv_host_stop(struct ata_host_set *host_set);
 static int mv_port_start(struct ata_port *ap);
@@ -296,7 +296,6 @@ static const struct ata_port_operations mv_ops = {
        .tf_load                = ata_tf_load,
        .tf_read                = ata_tf_read,
        .check_status           = ata_check_status,
-        .check_err              = mv_check_err,
        .exec_command           = ata_exec_command,
        .dev_select             = ata_std_dev_select,
@@ -1067,6 +1066,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
        struct ata_queued_cmd *qc;
        u32 hc_irq_cause;
        int shift, port, port0, hard_port, handled;
+        unsigned int err_mask;
        u8 ata_status = 0;
        if (hc == 0) {
@@ -1102,15 +1102,15 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
                        handled++;
                }
+                err_mask = ac_err_mask(ata_status);
                shift = port << 1;              /* (port * 2) */
                if (port >= MV_PORTS_PER_HC) {
                        shift++;        /* skip bit 8 in the HC Main IRQ reg */
                }
                if ((PORT0_ERR << shift) & relevant) {
                        mv_err_intr(ap);
-                        /* OR in ATA_ERR to ensure libata knows we took one */
+                        err_mask |= AC_ERR_OTHER;
-                        ata_status = readb((void __iomem *)
-                                           ap->ioaddr.status_addr) | ATA_ERR;
                        handled++;
                }
                
@@ -1120,7 +1120,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
                                VPRINTK("port %u IRQ found for qc, "
                                        "ata_status 0x%x\n", port,ata_status);
                                /* mark qc status appropriately */
-                                ata_qc_complete(qc, ata_status);
+                                ata_qc_complete(qc, err_mask);
                        }
                }
        }
@@ -1185,22 +1185,6 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance,
 }
 /**
- *      mv_check_err - Return the error shadow register to caller.
- *      @ap: ATA channel to manipulate
- *
- *      Marvell requires DMA to be stopped before accessing shadow
- *      registers.  So we do that, then return the needed register.
- *
- *      LOCKING:
- *      Inherited from caller.  FIXME: protect mv_stop_dma with lock?
- */
-static u8 mv_check_err(struct ata_port *ap)
-{
-        mv_stop_dma(ap);                /* can't read shadow regs if DMA on */
-        return readb((void __iomem *) ap->ioaddr.error_addr);
-}
-/**
 *      mv_phy_reset - Perform eDMA reset followed by COMRESET
 *      @ap: ATA channel to manipulate
 *
@@ -1312,7 +1296,7 @@ static void mv_eng_timeout(struct ata_port *ap)
                 */
                spin_lock_irqsave(&ap->host_set->lock, flags);
                qc->scsidone = scsi_finish_command;
-                ata_qc_complete(qc, ATA_ERR);
+                ata_qc_complete(qc, AC_ERR_OTHER);
                spin_unlock_irqrestore(&ap->host_set->lock, flags);
        }
 }
@@ -1454,9 +1438,9 @@ static void mv_print_info(struct ata_probe_ent *probe_ent)
        else
                scc_s = "unknown";
-        printk(KERN_INFO DRV_NAME 
+        dev_printk(KERN_INFO, &pdev->dev,
-               "(%s) %u slots %u ports %s mode IRQ via %s\n",
+               "%u slots %u ports %s mode IRQ via %s\n",
-               pci_name(pdev), (unsigned)MV_MAX_Q_DEPTH, probe_ent->n_ports, 
+               (unsigned)MV_MAX_Q_DEPTH, probe_ent->n_ports, 
               scc_s, (MV_HP_FLAG_MSI & hpriv->hp_flags) ? "MSI" : "INTx");
 }
@@ -1477,9 +1461,8 @@ static int mv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        void __iomem *mmio_base;
        int pci_dev_busy = 0, rc;
-        if (!printed_version++) {
+        if (!printed_version++)
-                printk(KERN_INFO DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");
-        }
        rc = pci_enable_device(pdev);
        if (rc) {
diff --git a/drivers/scsi/sata_nv.c b/drivers/scsi/sata_nv.c
index 1a56d6c79ddd..d573888eda76 100644
--- a/drivers/scsi/sata_nv.c
+++ b/drivers/scsi/sata_nv.c
@@ -61,6 +61,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -383,7 +384,7 @@ static int nv_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                        return -ENODEV;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 63911f16b6ec..b41c977d6fab 100644
--- a/drivers/scsi/sata_promise.c
+++ b/drivers/scsi/sata_promise.c
@@ -38,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -399,7 +400,8 @@ static void pdc_eng_timeout(struct ata_port *ap)
        case ATA_PROT_DMA:
        case ATA_PROT_NODATA:
                printk(KERN_ERR "ata%u: command timeout\n", ap->id);
-                ata_qc_complete(qc, ata_wait_idle(ap) | ATA_ERR);
+                drv_stat = ata_wait_idle(ap);
+                ata_qc_complete(qc, __ac_err_mask(drv_stat));
                break;
        default:
@@ -408,7 +410,7 @@ static void pdc_eng_timeout(struct ata_port *ap)
                printk(KERN_ERR "ata%u: unknown timeout, cmd 0x%x stat 0x%x\n",
                       ap->id, qc->tf.command, drv_stat);
-                ata_qc_complete(qc, drv_stat);
+                ata_qc_complete(qc, ac_err_mask(drv_stat));
                break;
        }
@@ -420,24 +422,21 @@ out:
 static inline unsigned int pdc_host_intr( struct ata_port *ap,
                                          struct ata_queued_cmd *qc)
 {
-        u8 status;
+        unsigned int handled = 0, err_mask = 0;
-        unsigned int handled = 0, have_err = 0;
        u32 tmp;
        void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL;
        tmp = readl(mmio);
        if (tmp & PDC_ERR_MASK) {
-                have_err = 1;
+                err_mask = AC_ERR_DEV;
                pdc_reset_port(ap);
        }
        switch (qc->tf.protocol) {
        case ATA_PROT_DMA:
        case ATA_PROT_NODATA:
-                status = ata_wait_idle(ap);
+                err_mask |= ac_err_mask(ata_wait_idle(ap));
-                if (have_err)
+                ata_qc_complete(qc, err_mask);
-                        status |= ATA_ERR;
-                ata_qc_complete(qc, status);
                handled = 1;
                break;
@@ -635,7 +634,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
        int rc;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        /*
         * If this driver happens to only be useful on Apple's K2, then
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c
index 1aaf3304d397..9938dae782b6 100644
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@ -35,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <asm/io.h>
@@ -400,11 +401,12 @@ static inline unsigned int qs_intr_pkt(struct ata_host_set *host_set)
                                qc = ata_qc_from_tag(ap, ap->active_tag);
                                if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
                                        switch (sHST) {
-                                        case 0: /* sucessful CPB */
+                                        case 0: /* successful CPB */
                                        case 3: /* device error */
                                                pp->state = qs_state_idle;
                                                qs_enter_reg_mode(qc->ap);
-                                                ata_qc_complete(qc, sDST);
+                                                ata_qc_complete(qc,
+                                                        ac_err_mask(sDST));
                                                break;
                                        default:
                                                break;
@@ -441,7 +443,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host_set *host_set)
                                /* complete taskfile transaction */
                                pp->state = qs_state_idle;
-                                ata_qc_complete(qc, status);
+                                ata_qc_complete(qc, ac_err_mask(status));
                                handled = 1;
                        }
                }
@@ -599,25 +601,22 @@ static int qs_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
                if (rc) {
                        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
                        if (rc) {
-                                printk(KERN_ERR DRV_NAME
+                                dev_printk(KERN_ERR, &pdev->dev,
-                                        "(%s): 64-bit DMA enable failed\n",
+                                           "64-bit DMA enable failed\n");
-                                        pci_name(pdev));
                                return rc;
                        }
                }
        } else {
                rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
                if (rc) {
-                        printk(KERN_ERR DRV_NAME
+                        dev_printk(KERN_ERR, &pdev->dev,
-                                "(%s): 32-bit DMA enable failed\n",
+                                "32-bit DMA enable failed\n");
-                                pci_name(pdev));
                        return rc;
                }
                rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
                if (rc) {
-                        printk(KERN_ERR DRV_NAME
+                        dev_printk(KERN_ERR, &pdev->dev,
-                                "(%s): 32-bit consistent DMA enable failed\n",
+                                "32-bit consistent DMA enable failed\n");
-                                pci_name(pdev));
                        return rc;
                }
        }
@@ -634,7 +633,7 @@ static int qs_ata_init_one(struct pci_dev *pdev,
        int rc, port_no;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
diff --git a/drivers/scsi/sata_sil.c b/drivers/scsi/sata_sil.c
index 3a056173fb95..435f7e0085ec 100644
--- a/drivers/scsi/sata_sil.c
+++ b/drivers/scsi/sata_sil.c
@@ -41,6 +41,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -386,7 +387,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        u8 cls;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        /*
         * If this driver happens to only be useful on Apple's K2, then
@@ -463,8 +464,8 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                        writeb(cls, mmio_base + SIL_FIFO_W3);
                }
        } else
-                printk(KERN_WARNING DRV_NAME "(%s): cache line size not set.  Driver may not function\n",
+                dev_printk(KERN_WARNING, &pdev->dev,
-                        pci_name(pdev));
+                         "cache line size not set.  Driver may not function\n");
        if (ent->driver_data == sil_3114) {
                irq_mask = SIL_MASK_4PORT;
diff --git a/drivers/scsi/sata_sil24.c b/drivers/scsi/sata_sil24.c
index 51855d3bac64..c66548025657 100644
--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c
@@ -35,6 +35,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
+#include <linux/device.h>
 #include <scsi/scsi_host.h>
 #include "scsi.h"
 #include <linux/libata.h>
@@ -225,7 +226,6 @@ struct sil24_host_priv {
 };
 static u8 sil24_check_status(struct ata_port *ap);
-static u8 sil24_check_err(struct ata_port *ap);
 static u32 sil24_scr_read(struct ata_port *ap, unsigned sc_reg);
 static void sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val);
 static void sil24_tf_read(struct ata_port *ap, struct ata_taskfile *tf);
@@ -280,7 +280,6 @@ static const struct ata_port_operations sil24_ops = {
        .check_status           = sil24_check_status,
        .check_altstatus        = sil24_check_status,
-        .check_err              = sil24_check_err,
        .dev_select             = ata_noop_dev_select,
        .tf_read                = sil24_tf_read,
@@ -363,12 +362,6 @@ static u8 sil24_check_status(struct ata_port *ap)
        return pp->tf.command;
 }
-static u8 sil24_check_err(struct ata_port *ap)
-{
-        struct sil24_port_priv *pp = ap->private_data;
-        return pp->tf.feature;
-}
 static int sil24_scr_map[] = {
        [SCR_CONTROL]   = 0,
        [SCR_STATUS]    = 1,
@@ -506,7 +499,7 @@ static void sil24_eng_timeout(struct ata_port *ap)
        qc = ata_qc_from_tag(ap, ap->active_tag);
        if (!qc) {
-                printk(KERN_ERR "ata%u: BUG: tiemout without command\n",
+                printk(KERN_ERR "ata%u: BUG: timeout without command\n",
                       ap->id);
                return;
        }
@@ -520,7 +513,7 @@ static void sil24_eng_timeout(struct ata_port *ap)
         */
        printk(KERN_ERR "ata%u: command timeout\n", ap->id);
        qc->scsidone = scsi_finish_command;
-        ata_qc_complete(qc, ATA_ERR);
+        ata_qc_complete(qc, AC_ERR_OTHER);
        sil24_reset_controller(ap);
 }
@@ -531,6 +524,7 @@ static void sil24_error_intr(struct ata_port *ap, u32 slot_stat)
        struct sil24_port_priv *pp = ap->private_data;
        void __iomem *port = (void __iomem *)ap->ioaddr.cmd_addr;
        u32 irq_stat, cmd_err, sstatus, serror;
+        unsigned int err_mask;
        irq_stat = readl(port + PORT_IRQ_STAT);
        writel(irq_stat, port + PORT_IRQ_STAT);         /* clear irq */
@@ -558,17 +552,18 @@ static void sil24_error_intr(struct ata_port *ap, u32 slot_stat)
                 * Device is reporting error, tf registers are valid.
                 */
                sil24_update_tf(ap);
+                err_mask = ac_err_mask(pp->tf.command);
        } else {
                /*
                 * Other errors.  libata currently doesn't have any
                 * mechanism to report these errors.  Just turn on
                 * ATA_ERR.
                 */
-                pp->tf.command = ATA_ERR;
+                err_mask = AC_ERR_OTHER;
        }
        if (qc)
-                ata_qc_complete(qc, pp->tf.command);
+                ata_qc_complete(qc, err_mask);
        sil24_reset_controller(ap);
 }
@@ -593,7 +588,7 @@ static inline void sil24_host_intr(struct ata_port *ap)
                sil24_update_tf(ap);
                if (qc)
-                        ata_qc_complete(qc, pp->tf.command);
+                        ata_qc_complete(qc, ac_err_mask(pp->tf.command));
        } else
                sil24_error_intr(ap, slot_stat);
 }
@@ -696,7 +691,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        int i, rc;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
@@ -756,14 +751,14 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         */
        rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
        if (rc) {
-                printk(KERN_ERR DRV_NAME "(%s): 32-bit DMA enable failed\n",
+                dev_printk(KERN_ERR, &pdev->dev,
-                       pci_name(pdev));
+                           "32-bit DMA enable failed\n");
                goto out_free;
        }
        rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
        if (rc) {
-                printk(KERN_ERR DRV_NAME "(%s): 32-bit consistent DMA enable failed\n",
+                dev_printk(KERN_ERR, &pdev->dev,
-                       pci_name(pdev));
+                           "32-bit consistent DMA enable failed\n");
                goto out_free;
        }
@@ -799,9 +794,8 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                                        break;
                        }
                        if (tmp & PORT_CS_PORT_RST)
-                                printk(KERN_ERR DRV_NAME
+                                dev_printk(KERN_ERR, &pdev->dev,
-                                       "(%s): failed to clear port RST\n",
+                                           "failed to clear port RST\n");
-                                       pci_name(pdev));
                }
                /* Zero error counters. */
@@ -830,9 +824,8 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                /* Reset itself */
                if (__sil24_reset_controller(port))
-                        printk(KERN_ERR DRV_NAME
+                        dev_printk(KERN_ERR, &pdev->dev,
-                               "(%s): failed to reset controller\n",
+                                   "failed to reset controller\n");
-                               pci_name(pdev));
        }
        /* Turn on interrupts */
diff --git a/drivers/scsi/sata_sis.c b/drivers/scsi/sata_sis.c
index 057f7b98b6c4..42288be0e561 100644
--- a/drivers/scsi/sata_sis.c
+++ b/drivers/scsi/sata_sis.c
@@ -38,6 +38,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -237,6 +238,7 @@ static void sis_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
 static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+        static int printed_version;
        struct ata_probe_ent *probe_ent = NULL;
        int rc;
        u32 genctl;
@@ -245,6 +247,9 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        u8 pmr;
        u8 port2_start;
+        if (!printed_version++)
+                dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
                return rc;
@@ -288,16 +293,18 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        pci_read_config_byte(pdev, SIS_PMR, &pmr);
        if (ent->device != 0x182) {
                if ((pmr & SIS_PMR_COMBINED) == 0) {
-                        printk(KERN_INFO "sata_sis: Detected SiS 180/181 chipset in SATA mode\n");
+                        dev_printk(KERN_INFO, &pdev->dev,
+                                   "Detected SiS 180/181 chipset in SATA mode\n");
                        port2_start = 64;
                }
                else {
-                        printk(KERN_INFO "sata_sis: Detected SiS 180/181 chipset in combined mode\n");
+                        dev_printk(KERN_INFO, &pdev->dev,
+                                   "Detected SiS 180/181 chipset in combined mode\n");
                        port2_start=0;
                }
        }
        else {
-                printk(KERN_INFO "sata_sis: Detected SiS 182 chipset\n");
+                dev_printk(KERN_INFO, &pdev->dev, "Detected SiS 182 chipset\n");
                port2_start = 0x20;
        }
diff --git a/drivers/scsi/sata_svw.c b/drivers/scsi/sata_svw.c
index 46208f52d0e1..db615ff794d8 100644
--- a/drivers/scsi/sata_svw.c
+++ b/drivers/scsi/sata_svw.c
@@ -44,6 +44,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -362,7 +363,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e
        int i;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        /*
         * If this driver happens to only be useful on Apple's K2, then
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index af08f4f650c1..0ec21e09f5d8 100644
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -38,6 +38,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/sched.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -718,7 +719,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
                        VPRINTK("ata%u: read hdma, 0x%x 0x%x\n", ap->id,
                                readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
                        /* get drive status; clear intr; complete txn */
-                        ata_qc_complete(qc, ata_wait_idle(ap));
+                        ata_qc_complete(qc, ac_err_mask(ata_wait_idle(ap)));
                        pdc20621_pop_hdma(qc);
                }
@@ -756,7 +757,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
                        VPRINTK("ata%u: write ata, 0x%x 0x%x\n", ap->id,
                                readl(mmio + 0x104), readl(mmio + PDC_HDMA_CTLSTAT));
                        /* get drive status; clear intr; complete txn */
-                        ata_qc_complete(qc, ata_wait_idle(ap));
+                        ata_qc_complete(qc, ac_err_mask(ata_wait_idle(ap)));
                        pdc20621_pop_hdma(qc);
                }
                handled = 1;
@@ -766,7 +767,7 @@ static inline unsigned int pdc20621_host_intr( struct ata_port *ap,
                status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
                DPRINTK("BUS_NODATA (drv_stat 0x%X)\n", status);
-                ata_qc_complete(qc, status);
+                ata_qc_complete(qc, ac_err_mask(status));
                handled = 1;
        } else {
@@ -881,7 +882,7 @@ static void pdc_eng_timeout(struct ata_port *ap)
        case ATA_PROT_DMA:
        case ATA_PROT_NODATA:
                printk(KERN_ERR "ata%u: command timeout\n", ap->id);
-                ata_qc_complete(qc, ata_wait_idle(ap) | ATA_ERR);
+                ata_qc_complete(qc, __ac_err_mask(ata_wait_idle(ap)));
                break;
        default:
@@ -890,7 +891,7 @@ static void pdc_eng_timeout(struct ata_port *ap)
                printk(KERN_ERR "ata%u: unknown timeout, cmd 0x%x stat 0x%x\n",
                       ap->id, qc->tf.command, drv_stat);
-                ata_qc_complete(qc, drv_stat);
+                ata_qc_complete(qc, ac_err_mask(drv_stat));
                break;
        }
@@ -1385,7 +1386,7 @@ static int pdc_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *
        int rc;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        /*
         * If this driver happens to only be useful on Apple's K2, then
diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index d68dc7d3422c..a5e245c098e1 100644
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -32,6 +32,7 @@
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -178,12 +179,16 @@ static void uli_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val)
 static int uli_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
+        static int printed_version;
        struct ata_probe_ent *probe_ent;
        struct ata_port_info *ppi;
        int rc;
        unsigned int board_idx = (unsigned int) ent->driver_data;
        int pci_dev_busy = 0;
+        if (!printed_version++)
+                dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
                return rc;
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c
index 80e291a909a9..b3ecdbe400e9 100644
--- a/drivers/scsi/sata_via.c
+++ b/drivers/scsi/sata_via.c
@@ -41,6 +41,7 @@
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -259,15 +260,15 @@ static void svia_configure(struct pci_dev *pdev)
        u8 tmp8;
        pci_read_config_byte(pdev, PCI_INTERRUPT_LINE, &tmp8);
-        printk(KERN_INFO DRV_NAME "(%s): routed to hard irq line %d\n",
+        dev_printk(KERN_INFO, &pdev->dev, "routed to hard irq line %d\n",
-               pci_name(pdev),
               (int) (tmp8 & 0xf0) == 0xf0 ? 0 : tmp8 & 0x0f);
        /* make sure SATA channels are enabled */
        pci_read_config_byte(pdev, SATA_CHAN_ENAB, &tmp8);
        if ((tmp8 & ALL_PORTS) != ALL_PORTS) {
-                printk(KERN_DEBUG DRV_NAME "(%s): enabling SATA channels (0x%x)\n",
+                dev_printk(KERN_DEBUG, &pdev->dev,
-                       pci_name(pdev), (int) tmp8);
+                           "enabling SATA channels (0x%x)\n",
+                           (int) tmp8);
                tmp8 |= ALL_PORTS;
                pci_write_config_byte(pdev, SATA_CHAN_ENAB, tmp8);
        }
@@ -275,8 +276,9 @@ static void svia_configure(struct pci_dev *pdev)
        /* make sure interrupts for each channel sent to us */
        pci_read_config_byte(pdev, SATA_INT_GATE, &tmp8);
        if ((tmp8 & ALL_PORTS) != ALL_PORTS) {
-                printk(KERN_DEBUG DRV_NAME "(%s): enabling SATA channel interrupts (0x%x)\n",
+                dev_printk(KERN_DEBUG, &pdev->dev,
-                       pci_name(pdev), (int) tmp8);
+                           "enabling SATA channel interrupts (0x%x)\n",
+                           (int) tmp8);
                tmp8 |= ALL_PORTS;
                pci_write_config_byte(pdev, SATA_INT_GATE, tmp8);
        }
@@ -284,8 +286,9 @@ static void svia_configure(struct pci_dev *pdev)
        /* make sure native mode is enabled */
        pci_read_config_byte(pdev, SATA_NATIVE_MODE, &tmp8);
        if ((tmp8 & NATIVE_MODE_ALL) != NATIVE_MODE_ALL) {
-                printk(KERN_DEBUG DRV_NAME "(%s): enabling SATA channel native mode (0x%x)\n",
+                dev_printk(KERN_DEBUG, &pdev->dev,
-                       pci_name(pdev), (int) tmp8);
+                           "enabling SATA channel native mode (0x%x)\n",
+                           (int) tmp8);
                tmp8 |= NATIVE_MODE_ALL;
                pci_write_config_byte(pdev, SATA_NATIVE_MODE, tmp8);
        }
@@ -303,7 +306,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        u8 tmp8;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
@@ -318,8 +321,9 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        if (board_id == vt6420) {
                pci_read_config_byte(pdev, SATA_PATA_SHARING, &tmp8);
                if (tmp8 & SATA_2DEV) {
-                        printk(KERN_ERR DRV_NAME "(%s): SATA master/slave not supported (0x%x)\n",
+                        dev_printk(KERN_ERR, &pdev->dev,
-                        pci_name(pdev), (int) tmp8);
+                                   "SATA master/slave not supported (0x%x)\n",
+                                   (int) tmp8);
                        rc = -EIO;
                        goto err_out_regions;
                }
@@ -332,10 +336,11 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        for (i = 0; i < ARRAY_SIZE(svia_bar_sizes); i++)
                if ((pci_resource_start(pdev, i) == 0) ||
                    (pci_resource_len(pdev, i) < bar_sizes[i])) {
-                        printk(KERN_ERR DRV_NAME "(%s): invalid PCI BAR %u (sz 0x%lx, val 0x%lx)\n",
+                        dev_printk(KERN_ERR, &pdev->dev,
-                               pci_name(pdev), i,
+                                   "invalid PCI BAR %u (sz 0x%lx, val 0x%lx)\n",
-                               pci_resource_start(pdev, i),
+                                   i,
-                               pci_resource_len(pdev, i));
+                                   pci_resource_start(pdev, i),
+                                   pci_resource_len(pdev, i));
                        rc = -ENODEV;
                        goto err_out_regions;
                }
@@ -353,8 +358,7 @@ static int svia_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                probe_ent = vt6421_init_probe_ent(pdev);
        if (!probe_ent) {
-                printk(KERN_ERR DRV_NAME "(%s): out of memory\n",
+                dev_printk(KERN_ERR, &pdev->dev, "out of memory\n");
-                       pci_name(pdev));
                rc = -ENOMEM;
                goto err_out_regions;
        }
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c
index 54273e0063c7..bb84ba0c7e83 100644
--- a/drivers/scsi/sata_vsc.c
+++ b/drivers/scsi/sata_vsc.c
@@ -42,6 +42,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -295,7 +296,7 @@ static int __devinit vsc_sata_init_one (struct pci_dev *pdev, const struct pci_d
        int rc;
        if (!printed_version++)
-                printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+                dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
        rc = pci_enable_device(pdev);
        if (rc)
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 771e97ef136e..b856e140e65f 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -26,6 +26,7 @@
 */
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/sched.h>        /* workqueue stuff, HZ */
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_transport.h>
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 8bb8222ea589..d2caa35059d9 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -19,6 +19,9 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 #include <linux/module.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c
index e753ba27dc59..a1a58e1d5ad3 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.c
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c
@@ -37,6 +37,9 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+#include <linux/slab.h>
 #include "sym_glue.h"
 #include "sym_nvram.h"
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.h b/drivers/scsi/sym53c8xx_2/sym_hipd.h
index 3131a6bf7ab7..3a264a408216 100644
--- a/drivers/scsi/sym53c8xx_2/sym_hipd.h
+++ b/drivers/scsi/sym53c8xx_2/sym_hipd.h
@@ -37,6 +37,8 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+#include <linux/gfp.h>
 #ifndef SYM_HIPD_H
 #define SYM_HIPD_H
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c
index f88fdd480685..771676abee60 100644
--- a/drivers/serial/ioc4_serial.c
+++ b/drivers/serial/ioc4_serial.c
@@ -308,6 +308,8 @@ struct ioc4_serial {
 typedef void ioc4_intr_func_f(void *, uint32_t);
 typedef ioc4_intr_func_f *ioc4_intr_func_t;
+static unsigned int Num_of_ioc4_cards;
 /* defining this will get you LOTS of great debug info */
 //#define DEBUG_INTERRUPTS
 #define DPRINT_CONFIG(_x...)    ;
@@ -317,7 +319,8 @@ typedef ioc4_intr_func_f *ioc4_intr_func_t;
 #define WAKEUP_CHARS    256
 /* number of characters we want to transmit to the lower level at a time */
-#define IOC4_MAX_CHARS  128
+#define IOC4_MAX_CHARS  256
+#define IOC4_FIFO_CHARS 255
 /* Device name we're using */
 #define DEVICE_NAME     "ttyIOC"
@@ -1038,6 +1041,7 @@ static int inline ioc4_attach_local(struct ioc4_driver_data *idd)
                        return -ENOMEM;
                }
                memset(port, 0, sizeof(struct ioc4_port));
+                spin_lock_init(&port->ip_lock);
                /* we need to remember the previous ones, to point back to
                 * them farther down - setting up the ring buffers.
@@ -1691,12 +1695,14 @@ ioc4_change_speed(struct uart_port *the_port,
                baud = 9600;
        if (!the_port->fifosize)
-                the_port->fifosize = IOC4_MAX_CHARS;
+                the_port->fifosize = IOC4_FIFO_CHARS;
        the_port->timeout = ((the_port->fifosize * HZ * bits) / (baud / 10));
        the_port->timeout += HZ / 50;   /* Add .02 seconds of slop */
        the_port->ignore_status_mask = N_ALL_INPUT;
+        info->tty->low_latency = 1;
        if (I_IGNPAR(info->tty))
                the_port->ignore_status_mask &= ~(N_PARITY_ERROR
                                                | N_FRAMING_ERROR);
@@ -1742,7 +1748,6 @@ ioc4_change_speed(struct uart_port *the_port,
 */
 static inline int ic4_startup_local(struct uart_port *the_port)
 {
-        int retval = 0;
        struct ioc4_port *port;
        struct uart_info *info;
@@ -1754,9 +1759,6 @@ static inline int ic4_startup_local(struct uart_port *the_port)
                return -1;
        info = the_port->info;
-        if (info->flags & UIF_INITIALIZED) {
-                return retval;
-        }
        if (info->tty) {
                set_bit(TTY_IO_ERROR, &info->tty->flags);
@@ -1775,7 +1777,6 @@ static inline int ic4_startup_local(struct uart_port *the_port)
        /* set the speed of the serial port */
        ioc4_change_speed(the_port, info->tty->termios, (struct termios *)0);
-        info->flags |= UIF_INITIALIZED;
        return 0;
 }
@@ -1785,9 +1786,13 @@ static inline int ic4_startup_local(struct uart_port *the_port)
 */
 static void ioc4_cb_output_lowat(struct ioc4_port *port)
 {
+        unsigned long pflags;
        /* ip_lock is set on the call here */
        if (port->ip_port) {
+                spin_lock_irqsave(&port->ip_port->lock, pflags);
                transmit_chars(port->ip_port);
+                spin_unlock_irqrestore(&port->ip_port->lock, pflags);
        }
 }
@@ -2064,8 +2069,7 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
         * available data as long as it returns some.
         */
        /* Re-arm the timer */
-        writel(port->ip_rx_cons | IOC4_SRCIR_ARM,
+        writel(port->ip_rx_cons | IOC4_SRCIR_ARM, &port->ip_serial_regs->srcir);
-                        &port->ip_serial_regs->srcir);
        prod_ptr = readl(&port->ip_serial_regs->srpir) & PROD_CONS_MASK;
        cons_ptr = port->ip_rx_cons;
@@ -2299,6 +2303,7 @@ static inline int do_read(struct uart_port *the_port, unsigned char *buf,
        }
        return total;
 }
 /**
 * receive_chars - upper level read. Called with ip_lock.
 * @the_port: port to read from
@@ -2307,9 +2312,11 @@ static void receive_chars(struct uart_port *the_port)
 {
        struct tty_struct *tty;
        unsigned char ch[IOC4_MAX_CHARS];
-        int read_count, request_count;
+        int read_count, request_count = IOC4_MAX_CHARS;
        struct uart_icount *icount;
        struct uart_info *info = the_port->info;
+        int flip = 0;
+        unsigned long pflags;
        /* Make sure all the pointers are "good" ones */
        if (!info)
@@ -2317,16 +2324,17 @@ static void receive_chars(struct uart_port *the_port)
        if (!info->tty)
                return;
+        spin_lock_irqsave(&the_port->lock, pflags);
        tty = info->tty;
-        request_count = TTY_FLIPBUF_SIZE - tty->flip.count - 1;
+        if (request_count > TTY_FLIPBUF_SIZE - tty->flip.count)
+                request_count = TTY_FLIPBUF_SIZE - tty->flip.count;
        if (request_count > 0) {
-                if (request_count > IOC4_MAX_CHARS - 2)
-                        request_count = IOC4_MAX_CHARS - 2;
                icount = &the_port->icount;
                read_count = do_read(the_port, ch, request_count);
                if (read_count > 0) {
+                        flip = 1;
                        memcpy(tty->flip.char_buf_ptr, ch, read_count);
                        memset(tty->flip.flag_buf_ptr, TTY_NORMAL, read_count);
                        tty->flip.char_buf_ptr += read_count;
@@ -2335,7 +2343,11 @@ static void receive_chars(struct uart_port *the_port)
                        icount->rx += read_count;
                }
        }
-        tty_flip_buffer_push(tty);
+        spin_unlock_irqrestore(&the_port->lock, pflags);
+        if (flip)
+                tty_flip_buffer_push(tty);
 }
 /**
@@ -2393,18 +2405,14 @@ static void ic4_shutdown(struct uart_port *the_port)
        info = the_port->info;
-        if (!(info->flags & UIF_INITIALIZED))
-                return;
        wake_up_interruptible(&info->delta_msr_wait);
        if (info->tty)
                set_bit(TTY_IO_ERROR, &info->tty->flags);
-        spin_lock_irqsave(&port->ip_lock, port_flags);
+        spin_lock_irqsave(&the_port->lock, port_flags);
        set_notification(port, N_ALL, 0);
-        info->flags &= ~UIF_INITIALIZED;
+        spin_unlock_irqrestore(&the_port->lock, port_flags);
-        spin_unlock_irqrestore(&port->ip_lock, port_flags);
 }
 /**
@@ -2463,12 +2471,10 @@ static unsigned int ic4_get_mctrl(struct uart_port *the_port)
 static void ic4_start_tx(struct uart_port *the_port)
 {
        struct ioc4_port *port = get_ioc4_port(the_port);
-        unsigned long flags;
        if (port) {
-                spin_lock_irqsave(&port->ip_lock, flags);
+                set_notification(port, N_OUTPUT_LOWAT, 1);
-                transmit_chars(the_port);
+                enable_intrs(port, port->ip_hooks->intr_tx_mt);
-                spin_unlock_irqrestore(&port->ip_lock, flags);
        }
 }
@@ -2510,9 +2516,9 @@ static int ic4_startup(struct uart_port *the_port)
        }
        /* Start up the serial port */
-        spin_lock_irqsave(&port->ip_lock, port_flags);
+        spin_lock_irqsave(&the_port->lock, port_flags);
        retval = ic4_startup_local(the_port);
-        spin_unlock_irqrestore(&port->ip_lock, port_flags);
+        spin_unlock_irqrestore(&the_port->lock, port_flags);
        return retval;
 }
@@ -2527,12 +2533,11 @@ static void
 ic4_set_termios(struct uart_port *the_port,
                struct termios *termios, struct termios *old_termios)
 {
-        struct ioc4_port *port = get_ioc4_port(the_port);
        unsigned long port_flags;
-        spin_lock_irqsave(&port->ip_lock, port_flags);
+        spin_lock_irqsave(&the_port->lock, port_flags);
        ioc4_change_speed(the_port, termios, old_termios);
-        spin_unlock_irqrestore(&port->ip_lock, port_flags);
+        spin_unlock_irqrestore(&the_port->lock, port_flags);
 }
 /**
@@ -2607,24 +2612,25 @@ ioc4_serial_core_attach(struct pci_dev *pdev)
                                __FUNCTION__, (void *)the_port,
                                (void *)port));
-                spin_lock_init(&the_port->lock);
                /* membase, iobase and mapbase just need to be non-0 */
                the_port->membase = (unsigned char __iomem *)1;
-                the_port->line = the_port->iobase = ii;
+                the_port->iobase = (pdev->bus->number << 16) |  ii;
+                the_port->line = (Num_of_ioc4_cards << 2) | ii;
                the_port->mapbase = 1;
                the_port->type = PORT_16550A;
-                the_port->fifosize = IOC4_MAX_CHARS;
+                the_port->fifosize = IOC4_FIFO_CHARS;
                the_port->ops = &ioc4_ops;
                the_port->irq = control->ic_irq;
                the_port->dev = &pdev->dev;
+                spin_lock_init(&the_port->lock);
                if (uart_add_one_port(&ioc4_uart, the_port) < 0) {
                        printk(KERN_WARNING
-                                       "%s: unable to add port %d\n",
+                           "%s: unable to add port %d bus %d\n",
-                                       __FUNCTION__, the_port->line);
+                               __FUNCTION__, the_port->line, pdev->bus->number);
                } else {
                        DPRINT_CONFIG(
-                                    ("IOC4 serial driver port %d irq = %d\n",
+                            ("IOC4 serial port %d irq = %d, bus %d\n",
-                                       the_port->line, the_port->irq));
+                               the_port->line, the_port->irq, pdev->bus->number));
                }
                /* all ports are rs232 for now */
                ioc4_set_proto(port, PROTO_RS232);
@@ -2734,6 +2740,8 @@ ioc4_serial_attach_one(struct ioc4_driver_data *idd)
        if ((ret = ioc4_serial_core_attach(idd->idd_pdev)))
                goto out4;
+        Num_of_ioc4_cards++;
        return ret;
        /* error exits that give back resources */
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index efe79b1fd431..aec83f577ce6 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -1100,6 +1100,8 @@ mpsc_start_rx(struct mpsc_port_info *pi)
 {
        pr_debug("mpsc_start_rx[%d]: Starting...\n", pi->port.line);
+        /* Issue a Receive Abort to clear any receive errors */
+        writel(MPSC_CHR_2_RA, pi->mpsc_base + MPSC_CHR_2);
        if (pi->rcv_data) {
                mpsc_enter_hunt(pi);
                mpsc_sdma_cmd(pi, SDMA_SDCM_ERD);
diff --git a/drivers/sh/superhyway/superhyway.c b/drivers/sh/superhyway/superhyway.c
index f056276b08a1..28757cb9d246 100644
--- a/drivers/sh/superhyway/superhyway.c
+++ b/drivers/sh/superhyway/superhyway.c
@@ -16,6 +16,8 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/superhyway.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 static int superhyway_devices;
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 45efeed1fcc3..49815ec4b842 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -14,6 +14,9 @@
 * This file is licenced under the GPL.
 */
+#include <linux/signal.h>       /* SA_INTERRUPT */
+#include <linux/jiffies.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c
index bf1d5ab4aa3a..7ce1d9ef0289 100644
--- a/drivers/usb/host/ohci-pci.c
+++ b/drivers/usb/host/ohci-pci.c
@@ -14,6 +14,8 @@
 * This file is licenced under the GPL.
 */
 
+#include <linux/jiffies.h>
 #ifdef CONFIG_PPC_PMAC
 #include <asm/machdep.h>
 #include <asm/pmac_feature.h>
diff --git a/drivers/usb/host/ohci-pxa27x.c b/drivers/usb/host/ohci-pxa27x.c
index d287dcccd415..f4a4aeda40b7 100644
--- a/drivers/usb/host/ohci-pxa27x.c
+++ b/drivers/usb/host/ohci-pxa27x.c
@@ -20,6 +20,7 @@
 */
 #include <linux/device.h>
+#include <linux/signal.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c
index a00672c96644..dca5ee93a4ef 100644
--- a/drivers/usb/input/pid.c
+++ b/drivers/usb/input/pid.c
@@ -198,7 +198,7 @@ static int hid_pid_upload_effect(struct input_dev *dev,
                }
                effect->id = id;
-                dev_dbg(&pid_private->hid->dev->dev, "effect ID is %d\n.", id);
+                dev_dbg(&pid_private->hid->dev->dev, "effect ID is %d.\n", id);
                pid_private->effects[id].owner = current->pid;
                pid_private->effects[id].flags = (1 << FF_PID_FLAGS_USED);
                spin_unlock_irqrestore(&pid_private->lock, flags);
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7e297947a2b2..7192b770bfb6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -494,7 +494,7 @@ config FB_TGA
 config FB_VESA
        bool "VESA VGA graphics support"
-        depends on (FB = y) && (X86 || X86_64)
+        depends on (FB = y) && X86
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -712,7 +712,7 @@ config FB_RIVA_DEBUG
 config FB_I810
        tristate "Intel 810/815 support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64
+        depends on FB && EXPERIMENTAL && PCI && X86_32
        select AGP
        select AGP_INTEL
        select FB_MODE_HELPERS
@@ -761,7 +761,7 @@ config FB_I810_I2C
 config FB_INTEL
        tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64
+        depends on FB && EXPERIMENTAL && PCI && X86_32
        select AGP
        select AGP_INTEL
        select FB_MODE_HELPERS
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 7e731691e2a9..6a9ae2b3d1ab 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -28,7 +28,7 @@ config VGA_CONSOLE
 config VIDEO_SELECT
        bool "Video mode selection support"
-        depends on  (X86 || X86_64) && VGA_CONSOLE
+        depends on  X86 && VGA_CONSOLE
        ---help---
          This enables support for text mode selection on kernel startup. If
          you want to take advantage of some high-resolution text mode your
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index 809fee2140ac..56cd199605f4 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -579,6 +579,7 @@ static void vga_set_palette(struct vc_data *vc, unsigned char *table)
 {
        int i, j;
+        vga_w(state.vgabase, VGA_PEL_MSK, 0xff);
        for (i = j = 0; i < 16; i++) {
                vga_w(state.vgabase, VGA_PEL_IW, table[i]);
                vga_w(state.vgabase, VGA_PEL_D, vc->vc_palette[j++] >> 2);
@@ -721,6 +722,7 @@ static void vga_pal_blank(struct vgastate *state)
 {
        int i;
+        vga_w(state->vgabase, VGA_PEL_MSK, 0xff);
        for (i = 0; i < 16; i++) {
                vga_w(state->vgabase, VGA_PEL_IW, i);
                vga_w(state->vgabase, VGA_PEL_D, 0);
diff --git a/drivers/w1/w1_family.c b/drivers/w1/w1_family.c
index 88c517a4c178..9e293e139a0e 100644
--- a/drivers/w1/w1_family.c
+++ b/drivers/w1/w1_family.c
@@ -21,6 +21,7 @@
 #include <linux/spinlock.h>
 #include <linux/list.h>
+#include <linux/sched.h>        /* schedule_timeout() */
 #include <linux/delay.h>
 #include "w1_family.h"
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index 04ca8840acf1..87c29d7b6c17 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/zorro.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 #include "zorro.h"
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index d3c05dfe20d2..0f2b40605b06 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -16,6 +16,8 @@
 #include <linux/init.h>
 #include <linux/zorro.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
 #include <asm/setup.h>
 #include <asm/amigahw.h>