Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

18 files changed, 925 insertions, 360 deletions

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 4373adb2119a..9d9490e22e07 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -26,6 +26,10 @@
 #define PCI_DEVICE_ID_INTEL_82965GME_IG     0x2A12
 #define PCI_DEVICE_ID_INTEL_82945GME_HB     0x27AC
 #define PCI_DEVICE_ID_INTEL_82945GME_IG     0x27AE
+#define PCI_DEVICE_ID_INTEL_IGDGM_HB        0xA010
+#define PCI_DEVICE_ID_INTEL_IGDGM_IG        0xA011
+#define PCI_DEVICE_ID_INTEL_IGDG_HB         0xA000
+#define PCI_DEVICE_ID_INTEL_IGDG_IG         0xA001
 #define PCI_DEVICE_ID_INTEL_G33_HB          0x29C0
 #define PCI_DEVICE_ID_INTEL_G33_IG          0x29C2
 #define PCI_DEVICE_ID_INTEL_Q35_HB          0x29B0
@@ -60,7 +64,12 @@
 
 #define IS_G33 (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_G33_HB || \
                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q35_HB || \
-                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q33_HB)
+                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q33_HB || \
+                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDGM_HB || \
+                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDG_HB)
+
+#define IS_IGD (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDGM_HB || \
+                agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGDG_HB)
 
 #define IS_G4X (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IGD_E_HB || \
                 agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_Q45_HB || \
@@ -510,7 +519,7 @@ static void intel_i830_init_gtt_entries(void)
                         size = 512;
                 }
                 size += 4; /* add in BIOS popup space */
-        } else if (IS_G33) {
+        } else if (IS_G33 && !IS_IGD) {
         /* G33's GTT size defined in gmch_ctrl */
                 switch (gmch_ctrl & G33_PGETBL_SIZE_MASK) {
                 case G33_PGETBL_SIZE_1M:
@@ -526,7 +535,7 @@ static void intel_i830_init_gtt_entries(void)
                         size = 512;
                 }
                 size += 4;
-        } else if (IS_G4X) {
+        } else if (IS_G4X || IS_IGD) {
                 /* On 4 series hardware, GTT stolen is separate from graphics
                  * stolen, ignore it in stolen gtt entries counting.  However,
                  * 4KB of the stolen memory doesn't get mapped to the GTT.
@@ -2161,6 +2170,10 @@ static const struct intel_driver_description {
                 NULL, &intel_g33_driver },
         { PCI_DEVICE_ID_INTEL_Q33_HB, PCI_DEVICE_ID_INTEL_Q33_IG, 0, "Q33",
                 NULL, &intel_g33_driver },
+        { PCI_DEVICE_ID_INTEL_IGDGM_HB, PCI_DEVICE_ID_INTEL_IGDGM_IG, 0, "IGD",
+                NULL, &intel_g33_driver },
+        { PCI_DEVICE_ID_INTEL_IGDG_HB, PCI_DEVICE_ID_INTEL_IGDG_IG, 0, "IGD",
+                NULL, &intel_g33_driver },
         { PCI_DEVICE_ID_INTEL_GM45_HB, PCI_DEVICE_ID_INTEL_GM45_IG, 0,
             "Mobile Intel® GM45 Express", NULL, &intel_i965_driver },
         { PCI_DEVICE_ID_INTEL_IGD_E_HB, PCI_DEVICE_ID_INTEL_IGD_E_IG, 0,
@@ -2355,6 +2368,8 @@ static struct pci_device_id agp_intel_pci_table[] = {
         ID(PCI_DEVICE_ID_INTEL_82945G_HB),
         ID(PCI_DEVICE_ID_INTEL_82945GM_HB),
         ID(PCI_DEVICE_ID_INTEL_82945GME_HB),
+        ID(PCI_DEVICE_ID_INTEL_IGDGM_HB),
+        ID(PCI_DEVICE_ID_INTEL_IGDG_HB),
         ID(PCI_DEVICE_ID_INTEL_82946GZ_HB),
         ID(PCI_DEVICE_ID_INTEL_82G35_HB),
         ID(PCI_DEVICE_ID_INTEL_82965Q_HB),
diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c
index a53496828b76..54481a887769 100644
--- a/drivers/char/hvc_iucv.c
+++ b/drivers/char/hvc_iucv.c
@@ -13,10 +13,11 @@
 
 #include <linux/types.h>
 #include <asm/ebcdic.h>
+#include <linux/ctype.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/mempool.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/tty.h>
 #include <linux/wait.h>
 #include <net/iucv/iucv.h>
@@ -95,6 +96,12 @@ static unsigned long hvc_iucv_devices = 1;
 /* Array of allocated hvc iucv tty lines... */
 static struct hvc_iucv_private *hvc_iucv_table[MAX_HVC_IUCV_LINES];
 #define IUCV_HVC_CON_IDX        (0)
+/* List of z/VM user ID filter entries (struct iucv_vmid_filter) */
+#define MAX_VMID_FILTER         (500)
+static size_t hvc_iucv_filter_size;
+static void *hvc_iucv_filter;
+static const char *hvc_iucv_filter_string;
+static DEFINE_RWLOCK(hvc_iucv_filter_lock);
 
 /* Kmem cache and mempool for iucv_tty_buffer elements */
 static struct kmem_cache *hvc_iucv_buffer_cache;
@@ -618,6 +625,27 @@ static void hvc_iucv_notifier_del(struct hvc_struct *hp, int id)
 }
 
 /**
+ * hvc_iucv_filter_connreq() - Filter connection request based on z/VM user ID
+ * @ipvmid:     Originating z/VM user ID (right padded with blanks)
+ *
+ * Returns 0 if the z/VM user ID @ipvmid is allowed to connection, otherwise
+ * non-zero.
+ */
+static int hvc_iucv_filter_connreq(u8 ipvmid[8])
+{
+        size_t i;
+
+        /* Note: default policy is ACCEPT if no filter is set */
+        if (!hvc_iucv_filter_size)
+                return 0;
+
+        for (i = 0; i < hvc_iucv_filter_size; i++)
+                if (0 == memcmp(ipvmid, hvc_iucv_filter + (8 * i), 8))
+                        return 0;
+        return 1;
+}
+
+/**
  * hvc_iucv_path_pending() - IUCV handler to process a connection request.
  * @path:       Pending path (struct iucv_path)
  * @ipvmid:     z/VM system identifier of originator
@@ -641,6 +669,7 @@ static	int hvc_iucv_path_pending(struct iucv_path *path,
 {
         struct hvc_iucv_private *priv;
         u8 nuser_data[16];
+        u8 vm_user_id[9];
         int i, rc;
 
         priv = NULL;
@@ -653,6 +682,20 @@ static	int hvc_iucv_path_pending(struct iucv_path *path,
         if (!priv)
                 return -ENODEV;
 
+        /* Enforce that ipvmid is allowed to connect to us */
+        read_lock(&hvc_iucv_filter_lock);
+        rc = hvc_iucv_filter_connreq(ipvmid);
+        read_unlock(&hvc_iucv_filter_lock);
+        if (rc) {
+                iucv_path_sever(path, ipuser);
+                iucv_path_free(path);
+                memcpy(vm_user_id, ipvmid, 8);
+                vm_user_id[8] = 0;
+                pr_info("A connection request from z/VM user ID %s "
+                        "was refused\n", vm_user_id);
+                return 0;
+        }
+
         spin_lock(&priv->lock);
 
         /* If the terminal is already connected or being severed, then sever
@@ -877,6 +920,171 @@ static int __init hvc_iucv_alloc(int id, unsigned int is_console)
 }
 
 /**
+ * hvc_iucv_parse_filter() - Parse filter for a single z/VM user ID
+ * @filter:     String containing a comma-separated list of z/VM user IDs
+ */
+static const char *hvc_iucv_parse_filter(const char *filter, char *dest)
+{
+        const char *nextdelim, *residual;
+        size_t len;
+
+        nextdelim = strchr(filter, ',');
+        if (nextdelim) {
+                len = nextdelim - filter;
+                residual = nextdelim + 1;
+        } else {
+                len = strlen(filter);
+                residual = filter + len;
+        }
+
+        if (len == 0)
+                return ERR_PTR(-EINVAL);
+
+        /* check for '\n' (if called from sysfs) */
+        if (filter[len - 1] == '\n')
+                len--;
+
+        if (len > 8)
+                return ERR_PTR(-EINVAL);
+
+        /* pad with blanks and save upper case version of user ID */
+        memset(dest, ' ', 8);
+        while (len--)
+                dest[len] = toupper(filter[len]);
+        return residual;
+}
+
+/**
+ * hvc_iucv_setup_filter() - Set up z/VM user ID filter
+ * @filter:     String consisting of a comma-separated list of z/VM user IDs
+ *
+ * The function parses the @filter string and creates an array containing
+ * the list of z/VM user ID filter entries.
+ * Return code 0 means success, -EINVAL if the filter is syntactically
+ * incorrect, -ENOMEM if there was not enough memory to allocate the
+ * filter list array, or -ENOSPC if too many z/VM user IDs have been specified.
+ */
+static int hvc_iucv_setup_filter(const char *val)
+{
+        const char *residual;
+        int err;
+        size_t size, count;
+        void *array, *old_filter;
+
+        count = strlen(val);
+        if (count == 0 || (count == 1 && val[0] == '\n')) {
+                size  = 0;
+                array = NULL;
+                goto out_replace_filter;        /* clear filter */
+        }
+
+        /* count user IDs in order to allocate sufficient memory */
+        size = 1;
+        residual = val;
+        while ((residual = strchr(residual, ',')) != NULL) {
+                residual++;
+                size++;
+        }
+
+        /* check if the specified list exceeds the filter limit */
+        if (size > MAX_VMID_FILTER)
+                return -ENOSPC;
+
+        array = kzalloc(size * 8, GFP_KERNEL);
+        if (!array)
+                return -ENOMEM;
+
+        count = size;
+        residual = val;
+        while (*residual && count) {
+                residual = hvc_iucv_parse_filter(residual,
+                                                 array + ((size - count) * 8));
+                if (IS_ERR(residual)) {
+                        err = PTR_ERR(residual);
+                        kfree(array);
+                        goto out_err;
+                }
+                count--;
+        }
+
+out_replace_filter:
+        write_lock_bh(&hvc_iucv_filter_lock);
+        old_filter = hvc_iucv_filter;
+        hvc_iucv_filter_size = size;
+        hvc_iucv_filter = array;
+        write_unlock_bh(&hvc_iucv_filter_lock);
+        kfree(old_filter);
+
+        err = 0;
+out_err:
+        return err;
+}
+
+/**
+ * param_set_vmidfilter() - Set z/VM user ID filter parameter
+ * @val:        String consisting of a comma-separated list of z/VM user IDs
+ * @kp:         Kernel parameter pointing to hvc_iucv_filter array
+ *
+ * The function sets up the z/VM user ID filter specified as comma-separated
+ * list of user IDs in @val.
+ * Note: If it is called early in the boot process, @val is stored and
+ *       parsed later in hvc_iucv_init().
+ */
+static int param_set_vmidfilter(const char *val, struct kernel_param *kp)
+{
+        int rc;
+
+        if (!MACHINE_IS_VM || !hvc_iucv_devices)
+                return -ENODEV;
+
+        if (!val)
+                return -EINVAL;
+
+        rc = 0;
+        if (slab_is_available())
+                rc = hvc_iucv_setup_filter(val);
+        else
+                hvc_iucv_filter_string = val;   /* defer... */
+        return rc;
+}
+
+/**
+ * param_get_vmidfilter() - Get z/VM user ID filter
+ * @buffer:     Buffer to store z/VM user ID filter,
+ *              (buffer size assumption PAGE_SIZE)
+ * @kp:         Kernel parameter pointing to the hvc_iucv_filter array
+ *
+ * The function stores the filter as a comma-separated list of z/VM user IDs
+ * in @buffer. Typically, sysfs routines call this function for attr show.
+ */
+static int param_get_vmidfilter(char *buffer, struct kernel_param *kp)
+{
+        int rc;
+        size_t index, len;
+        void *start, *end;
+
+        if (!MACHINE_IS_VM || !hvc_iucv_devices)
+                return -ENODEV;
+
+        rc = 0;
+        read_lock_bh(&hvc_iucv_filter_lock);
+        for (index = 0; index < hvc_iucv_filter_size; index++) {
+                start = hvc_iucv_filter + (8 * index);
+                end   = memchr(start, ' ', 8);
+                len   = (end) ? end - start : 8;
+                memcpy(buffer + rc, start, len);
+                rc += len;
+                buffer[rc++] = ',';
+        }
+        read_unlock_bh(&hvc_iucv_filter_lock);
+        if (rc)
+                buffer[--rc] = '\0';    /* replace last comma and update rc */
+        return rc;
+}
+
+#define param_check_vmidfilter(name, p) __param_check(name, p, void)
+
+/**
  * hvc_iucv_init() - z/VM IUCV HVC device driver initialization
  */
 static int __init hvc_iucv_init(void)
@@ -884,24 +1092,53 @@ static int __init hvc_iucv_init(void)
         int rc;
         unsigned int i;
 
+        if (!hvc_iucv_devices)
+                return -ENODEV;
+
         if (!MACHINE_IS_VM) {
-                pr_info("The z/VM IUCV HVC device driver cannot "
+                pr_notice("The z/VM IUCV HVC device driver cannot "
                            "be used without z/VM\n");
-                return -ENODEV;
+                rc = -ENODEV;
+                goto out_error;
         }
 
-        if (!hvc_iucv_devices)
-                return -ENODEV;
+        if (hvc_iucv_devices > MAX_HVC_IUCV_LINES) {
+                pr_err("%lu is not a valid value for the hvc_iucv= "
+                        "kernel parameter\n", hvc_iucv_devices);
+                rc = -EINVAL;
+                goto out_error;
+        }
 
-        if (hvc_iucv_devices > MAX_HVC_IUCV_LINES)
-                return -EINVAL;
+        /* parse hvc_iucv_allow string and create z/VM user ID filter list */
+        if (hvc_iucv_filter_string) {
+                rc = hvc_iucv_setup_filter(hvc_iucv_filter_string);
+                switch (rc) {
+                case 0:
+                        break;
+                case -ENOMEM:
+                        pr_err("Allocating memory failed with "
+                                "reason code=%d\n", 3);
+                        goto out_error;
+                case -EINVAL:
+                        pr_err("hvc_iucv_allow= does not specify a valid "
+                                "z/VM user ID list\n");
+                        goto out_error;
+                case -ENOSPC:
+                        pr_err("hvc_iucv_allow= specifies too many "
+                                "z/VM user IDs\n");
+                        goto out_error;
+                default:
+                        goto out_error;
+                }
+        }
 
         hvc_iucv_buffer_cache = kmem_cache_create(KMSG_COMPONENT,
                                            sizeof(struct iucv_tty_buffer),
                                            0, 0, NULL);
         if (!hvc_iucv_buffer_cache) {
                 pr_err("Allocating memory failed with reason code=%d\n", 1);
-                return -ENOMEM;
+                rc = -ENOMEM;
+                goto out_error;
         }
 
         hvc_iucv_mempool = mempool_create_slab_pool(MEMPOOL_MIN_NR,
@@ -909,7 +1146,8 @@ static int __init hvc_iucv_init(void)
         if (!hvc_iucv_mempool) {
                 pr_err("Allocating memory failed with reason code=%d\n", 2);
                 kmem_cache_destroy(hvc_iucv_buffer_cache);
-                return -ENOMEM;
+                rc = -ENOMEM;
+                goto out_error;
         }
 
         /* register the first terminal device as console
@@ -953,6 +1191,8 @@ out_error_hvc:
 out_error_memory:
         mempool_destroy(hvc_iucv_mempool);
         kmem_cache_destroy(hvc_iucv_buffer_cache);
+out_error:
+        hvc_iucv_devices = 0; /* ensure that we do not provide any device */
         return rc;
 }
 
@@ -968,3 +1208,4 @@ static	int __init hvc_iucv_config(char *val)
 
 device_initcall(hvc_iucv_init);
 __setup("hvc_iucv=", hvc_iucv_config);
+core_param(hvc_iucv_allow, hvc_iucv_filter, vmidfilter, 0640);
diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 8822eca58ffa..5fab6470f4b2 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -20,6 +20,20 @@ config HW_RANDOM
 
           If unsure, say Y.
 
+config HW_RANDOM_TIMERIOMEM
+        tristate "Timer IOMEM HW Random Number Generator support"
+        depends on HW_RANDOM && HAS_IOMEM
+        ---help---
+          This driver provides kernel-side support for a generic Random
+          Number Generator used by reading a 'dumb' iomem address that
+          is to be read no faster than, for example, once a second;
+          the default FPGA bitstream on the TS-7800 has such functionality.
+
+          To compile this driver as a module, choose M here: the
+          module will be called timeriomem-rng.
+
+          If unsure, say Y.
+
 config HW_RANDOM_INTEL
         tristate "Intel HW Random Number Generator support"
         depends on HW_RANDOM && (X86 || IA64) && PCI
diff --git a/drivers/char/hw_random/Makefile b/drivers/char/hw_random/Makefile
index b6effb7522c2..e81d21a5f28f 100644
--- a/drivers/char/hw_random/Makefile
+++ b/drivers/char/hw_random/Makefile
@@ -4,6 +4,7 @@
 
 obj-$(CONFIG_HW_RANDOM) += rng-core.o
 rng-core-y := core.o
+obj-$(CONFIG_HW_RANDOM_TIMERIOMEM) += timeriomem-rng.o
 obj-$(CONFIG_HW_RANDOM_INTEL) += intel-rng.o
 obj-$(CONFIG_HW_RANDOM_AMD) += amd-rng.o
 obj-$(CONFIG_HW_RANDOM_GEODE) += geode-rng.o
diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c
new file mode 100644
index 000000000000..10ad41be5897
--- /dev/null
+++ b/drivers/char/hw_random/timeriomem-rng.c
@@ -0,0 +1,151 @@
+/*
+ * drivers/char/hw_random/timeriomem-rng.c
+ *
+ * Copyright (C) 2009 Alexander Clouter <alex@digriz.org.uk>
+ *
+ * Derived from drivers/char/hw_random/omap-rng.c
+ *   Copyright 2005 (c) MontaVista Software, Inc.
+ *   Author: Deepak Saxena <dsaxena@plexity.net>
+ *
+ * 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.
+ *
+ * Overview:
+ *   This driver is useful for platforms that have an IO range that provides
+ *   periodic random data from a single IO memory address.  All the platform
+ *   has to do is provide the address and 'wait time' that new data becomes
+ *   available.
+ *
+ * TODO: add support for reading sizes other than 32bits and masking
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/hw_random.h>
+#include <linux/io.h>
+#include <linux/timeriomem-rng.h>
+#include <linux/jiffies.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/completion.h>
+
+static struct timeriomem_rng_data *timeriomem_rng_data;
+
+static void timeriomem_rng_trigger(unsigned long);
+static DEFINE_TIMER(timeriomem_rng_timer, timeriomem_rng_trigger, 0, 0);
+
+/*
+ * have data return 1, however return 0 if we have nothing
+ */
+static int timeriomem_rng_data_present(struct hwrng *rng, int wait)
+{
+        if (rng->priv == 0)
+                return 1;
+
+        if (!wait || timeriomem_rng_data->present)
+                return timeriomem_rng_data->present;
+
+        wait_for_completion(&timeriomem_rng_data->completion);
+
+        return 1;
+}
+
+static int timeriomem_rng_data_read(struct hwrng *rng, u32 *data)
+{
+        unsigned long cur;
+        s32 delay;
+
+        *data = readl(timeriomem_rng_data->address);
+
+        if (rng->priv != 0) {
+                cur = jiffies;
+
+                delay = cur - timeriomem_rng_timer.expires;
+                delay = rng->priv - (delay % rng->priv);
+
+                timeriomem_rng_timer.expires = cur + delay;
+                timeriomem_rng_data->present = 0;
+
+                init_completion(&timeriomem_rng_data->completion);
+                add_timer(&timeriomem_rng_timer);
+        }
+
+        return 4;
+}
+
+static void timeriomem_rng_trigger(unsigned long dummy)
+{
+        timeriomem_rng_data->present = 1;
+        complete(&timeriomem_rng_data->completion);
+}
+
+static struct hwrng timeriomem_rng_ops = {
+        .name           = "timeriomem",
+        .data_present   = timeriomem_rng_data_present,
+        .data_read      = timeriomem_rng_data_read,
+        .priv           = 0,
+};
+
+static int __init timeriomem_rng_probe(struct platform_device *pdev)
+{
+        int ret;
+
+        timeriomem_rng_data = pdev->dev.platform_data;
+
+        if (timeriomem_rng_data->period != 0
+                && usecs_to_jiffies(timeriomem_rng_data->period) > 0) {
+                timeriomem_rng_timer.expires = jiffies;
+
+                timeriomem_rng_ops.priv = usecs_to_jiffies(
+                                                timeriomem_rng_data->period);
+        }
+        timeriomem_rng_data->present = 1;
+
+        ret = hwrng_register(&timeriomem_rng_ops);
+        if (ret) {
+                dev_err(&pdev->dev, "problem registering\n");
+                return ret;
+        }
+
+        dev_info(&pdev->dev, "32bits from 0x%p @ %dus\n",
+                        timeriomem_rng_data->address,
+                        timeriomem_rng_data->period);
+
+        return 0;
+}
+
+static int __devexit timeriomem_rng_remove(struct platform_device *pdev)
+{
+        del_timer_sync(&timeriomem_rng_timer);
+        hwrng_unregister(&timeriomem_rng_ops);
+
+        return 0;
+}
+
+static struct platform_driver timeriomem_rng_driver = {
+        .driver = {
+                .name           = "timeriomem_rng",
+                .owner          = THIS_MODULE,
+        },
+        .probe          = timeriomem_rng_probe,
+        .remove         = __devexit_p(timeriomem_rng_remove),
+};
+
+static int __init timeriomem_rng_init(void)
+{
+        return platform_driver_register(&timeriomem_rng_driver);
+}
+
+static void __exit timeriomem_rng_exit(void)
+{
+        platform_driver_unregister(&timeriomem_rng_driver);
+}
+
+module_init(timeriomem_rng_init);
+module_exit(timeriomem_rng_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Alexander Clouter <alex@digriz.org.uk>");
+MODULE_DESCRIPTION("Timer IOMEM H/W RNG driver");
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index dc073e167abc..5608a1e5a3b3 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -4311,10 +4311,17 @@ static void hdlcdev_rx(MGSLPC_INFO *info, char *buf, int size)
         dev->stats.rx_bytes += size;
 
         netif_rx(skb);
-
-        dev->last_rx = jiffies;
 }
 
+static const struct net_device_ops hdlcdev_ops = {
+        .ndo_open       = hdlcdev_open,
+        .ndo_stop       = hdlcdev_close,
+        .ndo_change_mtu = hdlc_change_mtu,
+        .ndo_start_xmit = hdlc_start_xmit,
+        .ndo_do_ioctl   = hdlcdev_ioctl,
+        .ndo_tx_timeout = hdlcdev_tx_timeout,
+};
+
 /**
  * called by device driver when adding device instance
  * do generic HDLC initialization
@@ -4341,11 +4348,8 @@ static int hdlcdev_init(MGSLPC_INFO *info)
         dev->irq       = info->irq_level;
 
         /* network layer callbacks and settings */
-        dev->do_ioctl       = hdlcdev_ioctl;
-        dev->open           = hdlcdev_open;
-        dev->stop           = hdlcdev_close;
-        dev->tx_timeout     = hdlcdev_tx_timeout;
-        dev->watchdog_timeo = 10*HZ;
+        dev->netdev_ops     = &hdlcdev_ops;
+        dev->watchdog_timeo = 10 * HZ;
         dev->tx_queue_len   = 50;
 
         /* generic HDLC layer callbacks and settings */
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 7c13581ca9cd..7c43ae782b26 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -241,6 +241,10 @@
 #include <linux/percpu.h>
 #include <linux/cryptohash.h>
 
+#ifdef CONFIG_GENERIC_HARDIRQS
+# include <linux/irq.h>
+#endif
+
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
@@ -558,7 +562,7 @@ struct timer_rand_state {
         unsigned dont_count_entropy:1;
 };
 
-#ifndef CONFIG_SPARSE_IRQ
+#ifndef CONFIG_GENERIC_HARDIRQS
 
 static struct timer_rand_state *irq_timer_state[NR_IRQS];
 
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index f4374437a033..fd3dced97776 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -888,12 +888,7 @@ found:
 
 static int sonypi_misc_fasync(int fd, struct file *filp, int on)
 {
-        int retval;
-
-        retval = fasync_helper(fd, filp, on, &sonypi_device.fifo_async);
-        if (retval < 0)
-                return retval;
-        return 0;
+        return fasync_helper(fd, filp, on, &sonypi_device.fifo_async);
 }
 
 static int sonypi_misc_release(struct inode *inode, struct file *file)
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c
index b8063d4cad32..0057a8f58cb1 100644
--- a/drivers/char/synclink.c
+++ b/drivers/char/synclink.c
@@ -8007,10 +8007,17 @@ static void hdlcdev_rx(struct mgsl_struct *info, char *buf, int size)
         dev->stats.rx_bytes += size;
 
         netif_rx(skb);
-
-        dev->last_rx = jiffies;
 }
 
+static const struct net_device_ops hdlcdev_ops = {
+        .ndo_open       = hdlcdev_open,
+        .ndo_stop       = hdlcdev_close,
+        .ndo_change_mtu = hdlc_change_mtu,
+        .ndo_start_xmit = hdlc_start_xmit,
+        .ndo_do_ioctl   = hdlcdev_ioctl,
+        .ndo_tx_timeout = hdlcdev_tx_timeout,
+};
+
 /**
  * called by device driver when adding device instance
  * do generic HDLC initialization
@@ -8038,11 +8045,8 @@ static int hdlcdev_init(struct mgsl_struct *info)
         dev->dma       = info->dma_level;
 
         /* network layer callbacks and settings */
-        dev->do_ioctl       = hdlcdev_ioctl;
-        dev->open           = hdlcdev_open;
-        dev->stop           = hdlcdev_close;
-        dev->tx_timeout     = hdlcdev_tx_timeout;
-        dev->watchdog_timeo = 10*HZ;
+        dev->netdev_ops     = &hdlcdev_ops;
+        dev->watchdog_timeo = 10 * HZ;
         dev->tx_queue_len   = 50;
 
         /* generic HDLC layer callbacks and settings */
diff --git a/drivers/char/synclink_gt.c b/drivers/char/synclink_gt.c
index f329f459817c..efb3dc928a43 100644
--- a/drivers/char/synclink_gt.c
+++ b/drivers/char/synclink_gt.c
@@ -1763,10 +1763,17 @@ static void hdlcdev_rx(struct slgt_info *info, char *buf, int size)
         dev->stats.rx_bytes += size;
 
         netif_rx(skb);
-
-        dev->last_rx = jiffies;
 }
 
+static const struct net_device_ops hdlcdev_ops = {
+        .ndo_open       = hdlcdev_open,
+        .ndo_stop       = hdlcdev_close,
+        .ndo_change_mtu = hdlc_change_mtu,
+        .ndo_start_xmit = hdlc_start_xmit,
+        .ndo_do_ioctl   = hdlcdev_ioctl,
+        .ndo_tx_timeout = hdlcdev_tx_timeout,
+};
+
 /**
  * called by device driver when adding device instance
  * do generic HDLC initialization
@@ -1794,11 +1801,8 @@ static int hdlcdev_init(struct slgt_info *info)
         dev->irq       = info->irq_level;
 
         /* network layer callbacks and settings */
-        dev->do_ioctl       = hdlcdev_ioctl;
-        dev->open           = hdlcdev_open;
-        dev->stop           = hdlcdev_close;
-        dev->tx_timeout     = hdlcdev_tx_timeout;
-        dev->watchdog_timeo = 10*HZ;
+        dev->netdev_ops     = &hdlcdev_ops;
+        dev->watchdog_timeo = 10 * HZ;
         dev->tx_queue_len   = 50;
 
         /* generic HDLC layer callbacks and settings */
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c
index 7b0c5b2dd263..8eb6c89a980e 100644
--- a/drivers/char/synclinkmp.c
+++ b/drivers/char/synclinkmp.c
@@ -1907,10 +1907,17 @@ static void hdlcdev_rx(SLMP_INFO *info, char *buf, int size)
         dev->stats.rx_bytes += size;
 
         netif_rx(skb);
-
-        dev->last_rx = jiffies;
 }
 
+static const struct net_device_ops hdlcdev_ops = {
+        .ndo_open       = hdlcdev_open,
+        .ndo_stop       = hdlcdev_close,
+        .ndo_change_mtu = hdlc_change_mtu,
+        .ndo_start_xmit = hdlc_start_xmit,
+        .ndo_do_ioctl   = hdlcdev_ioctl,
+        .ndo_tx_timeout = hdlcdev_tx_timeout,
+};
+
 /**
  * called by device driver when adding device instance
  * do generic HDLC initialization
@@ -1938,11 +1945,8 @@ static int hdlcdev_init(SLMP_INFO *info)
         dev->irq       = info->irq_level;
 
         /* network layer callbacks and settings */
-        dev->do_ioctl       = hdlcdev_ioctl;
-        dev->open           = hdlcdev_open;
-        dev->stop           = hdlcdev_close;
-        dev->tx_timeout     = hdlcdev_tx_timeout;
-        dev->watchdog_timeo = 10*HZ;
+        dev->netdev_ops     = &hdlcdev_ops;
+        dev->watchdog_timeo = 10 * HZ;
         dev->tx_queue_len   = 50;
 
         /* generic HDLC layer callbacks and settings */
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index 9c47dc48c9fd..ccdd828adcef 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -429,134 +429,148 @@ out:
 #define TPM_DIGEST_SIZE 20
 #define TPM_ERROR_SIZE 10
 #define TPM_RET_CODE_IDX 6
-#define TPM_GET_CAP_RET_SIZE_IDX 10
-#define TPM_GET_CAP_RET_UINT32_1_IDX 14
-#define TPM_GET_CAP_RET_UINT32_2_IDX 18
-#define TPM_GET_CAP_RET_UINT32_3_IDX 22
-#define TPM_GET_CAP_RET_UINT32_4_IDX 26
-#define TPM_GET_CAP_PERM_DISABLE_IDX 16
-#define TPM_GET_CAP_PERM_INACTIVE_IDX 18
-#define TPM_GET_CAP_RET_BOOL_1_IDX 14
-#define TPM_GET_CAP_TEMP_INACTIVE_IDX 16
-
-#define TPM_CAP_IDX 13
-#define TPM_CAP_SUBCAP_IDX 21
 
 enum tpm_capabilities {
-        TPM_CAP_FLAG = 4,
-        TPM_CAP_PROP = 5,
+        TPM_CAP_FLAG = cpu_to_be32(4),
+        TPM_CAP_PROP = cpu_to_be32(5),
+        CAP_VERSION_1_1 = cpu_to_be32(0x06),
+        CAP_VERSION_1_2 = cpu_to_be32(0x1A)
 };
 
 enum tpm_sub_capabilities {
-        TPM_CAP_PROP_PCR = 0x1,
-        TPM_CAP_PROP_MANUFACTURER = 0x3,
-        TPM_CAP_FLAG_PERM = 0x8,
-        TPM_CAP_FLAG_VOL = 0x9,
-        TPM_CAP_PROP_OWNER = 0x11,
-        TPM_CAP_PROP_TIS_TIMEOUT = 0x15,
-        TPM_CAP_PROP_TIS_DURATION = 0x20,
-};
+        TPM_CAP_PROP_PCR = cpu_to_be32(0x101),
+        TPM_CAP_PROP_MANUFACTURER = cpu_to_be32(0x103),
+        TPM_CAP_FLAG_PERM = cpu_to_be32(0x108),
+        TPM_CAP_FLAG_VOL = cpu_to_be32(0x109),
+        TPM_CAP_PROP_OWNER = cpu_to_be32(0x111),
+        TPM_CAP_PROP_TIS_TIMEOUT = cpu_to_be32(0x115),
+        TPM_CAP_PROP_TIS_DURATION = cpu_to_be32(0x120),
 
-/*
- * This is a semi generic GetCapability command for use
- * with the capability type TPM_CAP_PROP or TPM_CAP_FLAG
- * and their associated sub_capabilities.
- */
-
-static const u8 tpm_cap[] = {
-        0, 193,                 /* TPM_TAG_RQU_COMMAND */
-        0, 0, 0, 22,            /* length */
-        0, 0, 0, 101,           /* TPM_ORD_GetCapability */
-        0, 0, 0, 0,             /* TPM_CAP_<TYPE> */
-        0, 0, 0, 4,             /* TPM_CAP_SUB_<TYPE> size */
-        0, 0, 1, 0              /* TPM_CAP_SUB_<TYPE> */
 };
 
-static ssize_t transmit_cmd(struct tpm_chip *chip, u8 *data, int len,
-                            char *desc)
+static ssize_t transmit_cmd(struct tpm_chip *chip, struct tpm_cmd_t *cmd,
+                            int len, const char *desc)
 {
         int err;
 
-        len = tpm_transmit(chip, data, len);
+        len = tpm_transmit(chip,(u8 *) cmd, len);
         if (len <  0)
                 return len;
         if (len == TPM_ERROR_SIZE) {
-                err = be32_to_cpu(*((__be32 *) (data + TPM_RET_CODE_IDX)));
+                err = be32_to_cpu(cmd->header.out.return_code);
                 dev_dbg(chip->dev, "A TPM error (%d) occurred %s\n", err, desc);
                 return err;
         }
         return 0;
 }
 
+#define TPM_INTERNAL_RESULT_SIZE 200
+#define TPM_TAG_RQU_COMMAND cpu_to_be16(193)
+#define TPM_ORD_GET_CAP cpu_to_be32(101)
+
+static const struct tpm_input_header tpm_getcap_header = {
+        .tag = TPM_TAG_RQU_COMMAND,
+        .length = cpu_to_be32(22),
+        .ordinal = TPM_ORD_GET_CAP
+};
+
+ssize_t tpm_getcap(struct device *dev, __be32 subcap_id, cap_t *cap,
+                   const char *desc)
+{
+        struct tpm_cmd_t tpm_cmd;
+        int rc;
+        struct tpm_chip *chip = dev_get_drvdata(dev);
+
+        tpm_cmd.header.in = tpm_getcap_header;
+        if (subcap_id == CAP_VERSION_1_1 || subcap_id == CAP_VERSION_1_2) {
+                tpm_cmd.params.getcap_in.cap = subcap_id;
+                /*subcap field not necessary */
+                tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(0);
+                tpm_cmd.header.in.length -= cpu_to_be32(sizeof(__be32));
+        } else {
+                if (subcap_id == TPM_CAP_FLAG_PERM ||
+                    subcap_id == TPM_CAP_FLAG_VOL)
+                        tpm_cmd.params.getcap_in.cap = TPM_CAP_FLAG;
+                else
+                        tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;
+                tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);
+                tpm_cmd.params.getcap_in.subcap = subcap_id;
+        }
+        rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE, desc);
+        if (!rc)
+                *cap = tpm_cmd.params.getcap_out.cap;
+        return rc;
+}
+
 void tpm_gen_interrupt(struct tpm_chip *chip)
 {
-        u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)];
+        struct  tpm_cmd_t tpm_cmd;
         ssize_t rc;
 
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_PROP;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_TIS_TIMEOUT;
+        tpm_cmd.header.in = tpm_getcap_header;
+        tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;
+        tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);
+        tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT;
 
-        rc = transmit_cmd(chip, data, sizeof(data),
+        rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE,
                         "attempting to determine the timeouts");
 }
 EXPORT_SYMBOL_GPL(tpm_gen_interrupt);
 
 void tpm_get_timeouts(struct tpm_chip *chip)
 {
-        u8 data[max_t(int, ARRAY_SIZE(tpm_cap), 30)];
+        struct tpm_cmd_t tpm_cmd;
+        struct timeout_t *timeout_cap;
+        struct duration_t *duration_cap;
         ssize_t rc;
         u32 timeout;
 
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_PROP;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_TIS_TIMEOUT;
+        tpm_cmd.header.in = tpm_getcap_header;
+        tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;
+        tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);
+        tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_TIMEOUT;
 
-        rc = transmit_cmd(chip, data, sizeof(data),
+        rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE,
                         "attempting to determine the timeouts");
         if (rc)
                 goto duration;
 
-        if (be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_SIZE_IDX)))
+        if (be32_to_cpu(tpm_cmd.header.out.length)
             != 4 * sizeof(u32))
                 goto duration;
 
+        timeout_cap = &tpm_cmd.params.getcap_out.cap.timeout;
         /* Don't overwrite default if value is 0 */
-        timeout =
-            be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX)));
+        timeout = be32_to_cpu(timeout_cap->a);
         if (timeout)
                 chip->vendor.timeout_a = usecs_to_jiffies(timeout);
-        timeout =
-            be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_2_IDX)));
+        timeout = be32_to_cpu(timeout_cap->b);
         if (timeout)
                 chip->vendor.timeout_b = usecs_to_jiffies(timeout);
-        timeout =
-            be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_3_IDX)));
+        timeout = be32_to_cpu(timeout_cap->c);
         if (timeout)
                 chip->vendor.timeout_c = usecs_to_jiffies(timeout);
-        timeout =
-            be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_4_IDX)));
+        timeout = be32_to_cpu(timeout_cap->d);
         if (timeout)
                 chip->vendor.timeout_d = usecs_to_jiffies(timeout);
 
 duration:
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_PROP;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_TIS_DURATION;
+        tpm_cmd.header.in = tpm_getcap_header;
+        tpm_cmd.params.getcap_in.cap = TPM_CAP_PROP;
+        tpm_cmd.params.getcap_in.subcap_size = cpu_to_be32(4);
+        tpm_cmd.params.getcap_in.subcap = TPM_CAP_PROP_TIS_DURATION;
 
-        rc = transmit_cmd(chip, data, sizeof(data),
+        rc = transmit_cmd(chip, &tpm_cmd, TPM_INTERNAL_RESULT_SIZE,
                         "attempting to determine the durations");
         if (rc)
                 return;
 
-        if (be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_SIZE_IDX)))
+        if (be32_to_cpu(tpm_cmd.header.out.return_code)
             != 3 * sizeof(u32))
                 return;
-
+        duration_cap = &tpm_cmd.params.getcap_out.cap.duration;
         chip->vendor.duration[TPM_SHORT] =
-            usecs_to_jiffies(be32_to_cpu
-                             (*((__be32 *) (data +
-                                            TPM_GET_CAP_RET_UINT32_1_IDX))));
+            usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_short));
         /* The Broadcom BCM0102 chipset in a Dell Latitude D820 gets the above
          * value wrong and apparently reports msecs rather than usecs. So we
          * fix up the resulting too-small TPM_SHORT value to make things work.
@@ -565,13 +579,9 @@ duration:
                 chip->vendor.duration[TPM_SHORT] = HZ;
 
         chip->vendor.duration[TPM_MEDIUM] =
-            usecs_to_jiffies(be32_to_cpu
-                             (*((__be32 *) (data +
-                                            TPM_GET_CAP_RET_UINT32_2_IDX))));
+            usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_medium));
         chip->vendor.duration[TPM_LONG] =
-            usecs_to_jiffies(be32_to_cpu
-                             (*((__be32 *) (data +
-                                            TPM_GET_CAP_RET_UINT32_3_IDX))));
+            usecs_to_jiffies(be32_to_cpu(duration_cap->tpm_long));
 }
 EXPORT_SYMBOL_GPL(tpm_get_timeouts);
 
@@ -587,36 +597,18 @@ void tpm_continue_selftest(struct tpm_chip *chip)
 }
 EXPORT_SYMBOL_GPL(tpm_continue_selftest);
 
-#define  TPM_INTERNAL_RESULT_SIZE 200
-
 ssize_t tpm_show_enabled(struct device * dev, struct device_attribute * attr,
                         char *buf)
 {
-        u8 *data;
+        cap_t cap;
         ssize_t rc;
 
-        struct tpm_chip *chip = dev_get_drvdata(dev);
-        if (chip == NULL)
-                return -ENODEV;
-
-        data = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_FLAG;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_PERM;
-
-        rc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,
-                        "attemtping to determine the permanent enabled state");
-        if (rc) {
-                kfree(data);
+        rc = tpm_getcap(dev, TPM_CAP_FLAG_PERM, &cap,
+                         "attempting to determine the permanent enabled state");
+        if (rc)
                 return 0;
-        }
-
-        rc = sprintf(buf, "%d\n", !data[TPM_GET_CAP_PERM_DISABLE_IDX]);
 
-        kfree(data);
+        rc = sprintf(buf, "%d\n", !cap.perm_flags.disable);
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_show_enabled);
@@ -624,31 +616,15 @@ EXPORT_SYMBOL_GPL(tpm_show_enabled);
 ssize_t tpm_show_active(struct device * dev, struct device_attribute * attr,
                         char *buf)
 {
-        u8 *data;
+        cap_t cap;
         ssize_t rc;
 
-        struct tpm_chip *chip = dev_get_drvdata(dev);
-        if (chip == NULL)
-                return -ENODEV;
-
-        data = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_FLAG;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_PERM;
-
-        rc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,
-                        "attemtping to determine the permanent active state");
-        if (rc) {
-                kfree(data);
+        rc = tpm_getcap(dev, TPM_CAP_FLAG_PERM, &cap,
+                         "attempting to determine the permanent active state");
+        if (rc)
                 return 0;
-        }
 
-        rc = sprintf(buf, "%d\n", !data[TPM_GET_CAP_PERM_INACTIVE_IDX]);
-
-        kfree(data);
+        rc = sprintf(buf, "%d\n", !cap.perm_flags.deactivated);
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_show_active);
@@ -656,31 +632,15 @@ EXPORT_SYMBOL_GPL(tpm_show_active);
 ssize_t tpm_show_owned(struct device * dev, struct device_attribute * attr,
                         char *buf)
 {
-        u8 *data;
+        cap_t cap;
         ssize_t rc;
 
-        struct tpm_chip *chip = dev_get_drvdata(dev);
-        if (chip == NULL)
-                return -ENODEV;
-
-        data = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_PROP;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_OWNER;
-
-        rc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,
-                        "attempting to determine the owner state");
-        if (rc) {
-                kfree(data);
+        rc = tpm_getcap(dev, TPM_CAP_PROP_OWNER, &cap,
+                         "attempting to determine the owner state");
+        if (rc)
                 return 0;
-        }
-
-        rc = sprintf(buf, "%d\n", data[TPM_GET_CAP_RET_BOOL_1_IDX]);
 
-        kfree(data);
+        rc = sprintf(buf, "%d\n", cap.owned);
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_show_owned);
@@ -688,116 +648,180 @@ EXPORT_SYMBOL_GPL(tpm_show_owned);
 ssize_t tpm_show_temp_deactivated(struct device * dev,
                                 struct device_attribute * attr, char *buf)
 {
-        u8 *data;
+        cap_t cap;
         ssize_t rc;
 
-        struct tpm_chip *chip = dev_get_drvdata(dev);
-        if (chip == NULL)
-                return -ENODEV;
+        rc = tpm_getcap(dev, TPM_CAP_FLAG_VOL, &cap,
+                         "attempting to determine the temporary state");
+        if (rc)
+                return 0;
 
-        data = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        rc = sprintf(buf, "%d\n", cap.stclear_flags.deactivated);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(tpm_show_temp_deactivated);
 
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_FLAG;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_FLAG_VOL;
+/*
+ * tpm_chip_find_get - return tpm_chip for given chip number
+ */
+static struct tpm_chip *tpm_chip_find_get(int chip_num)
+{
+        struct tpm_chip *pos, *chip = NULL;
 
-        rc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,
-                        "attempting to determine the temporary state");
-        if (rc) {
-                kfree(data);
-                return 0;
+        rcu_read_lock();
+        list_for_each_entry_rcu(pos, &tpm_chip_list, list) {
+                if (chip_num != TPM_ANY_NUM && chip_num != pos->dev_num)
+                        continue;
+
+                if (try_module_get(pos->dev->driver->owner)) {
+                        chip = pos;
+                        break;
+                }
         }
+        rcu_read_unlock();
+        return chip;
+}
 
-        rc = sprintf(buf, "%d\n", data[TPM_GET_CAP_TEMP_INACTIVE_IDX]);
+#define TPM_ORDINAL_PCRREAD cpu_to_be32(21)
+#define READ_PCR_RESULT_SIZE 30
+static struct tpm_input_header pcrread_header = {
+        .tag = TPM_TAG_RQU_COMMAND,
+        .length = cpu_to_be32(14),
+        .ordinal = TPM_ORDINAL_PCRREAD
+};
 
-        kfree(data);
+int __tpm_pcr_read(struct tpm_chip *chip, int pcr_idx, u8 *res_buf)
+{
+        int rc;
+        struct tpm_cmd_t cmd;
+
+        cmd.header.in = pcrread_header;
+        cmd.params.pcrread_in.pcr_idx = cpu_to_be32(pcr_idx);
+        BUILD_BUG_ON(cmd.header.in.length > READ_PCR_RESULT_SIZE);
+        rc = transmit_cmd(chip, &cmd, cmd.header.in.length,
+                          "attempting to read a pcr value");
+
+        if (rc == 0)
+                memcpy(res_buf, cmd.params.pcrread_out.pcr_result,
+                       TPM_DIGEST_SIZE);
         return rc;
 }
-EXPORT_SYMBOL_GPL(tpm_show_temp_deactivated);
 
-static const u8 pcrread[] = {
-        0, 193,                 /* TPM_TAG_RQU_COMMAND */
-        0, 0, 0, 14,            /* length */
-        0, 0, 0, 21,            /* TPM_ORD_PcrRead */
-        0, 0, 0, 0              /* PCR index */
+/**
+ * tpm_pcr_read - read a pcr value
+ * @chip_num:   tpm idx # or ANY
+ * @pcr_idx:    pcr idx to retrieve
+ * @res_buf:    TPM_PCR value
+ *              size of res_buf is 20 bytes (or NULL if you don't care)
+ *
+ * The TPM driver should be built-in, but for whatever reason it
+ * isn't, protect against the chip disappearing, by incrementing
+ * the module usage count.
+ */
+int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf)
+{
+        struct tpm_chip *chip;
+        int rc;
+
+        chip = tpm_chip_find_get(chip_num);
+        if (chip == NULL)
+                return -ENODEV;
+        rc = __tpm_pcr_read(chip, pcr_idx, res_buf);
+        module_put(chip->dev->driver->owner);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(tpm_pcr_read);
+
+/**
+ * tpm_pcr_extend - extend pcr value with hash
+ * @chip_num:   tpm idx # or AN&
+ * @pcr_idx:    pcr idx to extend
+ * @hash:       hash value used to extend pcr value
+ *
+ * The TPM driver should be built-in, but for whatever reason it
+ * isn't, protect against the chip disappearing, by incrementing
+ * the module usage count.
+ */
+#define TPM_ORD_PCR_EXTEND cpu_to_be32(20)
+#define EXTEND_PCR_SIZE 34
+static struct tpm_input_header pcrextend_header = {
+        .tag = TPM_TAG_RQU_COMMAND,
+        .length = cpu_to_be32(34),
+        .ordinal = TPM_ORD_PCR_EXTEND
 };
 
+int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash)
+{
+        struct tpm_cmd_t cmd;
+        int rc;
+        struct tpm_chip *chip;
+
+        chip = tpm_chip_find_get(chip_num);
+        if (chip == NULL)
+                return -ENODEV;
+
+        cmd.header.in = pcrextend_header;
+        BUILD_BUG_ON(be32_to_cpu(cmd.header.in.length) > EXTEND_PCR_SIZE);
+        cmd.params.pcrextend_in.pcr_idx = cpu_to_be32(pcr_idx);
+        memcpy(cmd.params.pcrextend_in.hash, hash, TPM_DIGEST_SIZE);
+        rc = transmit_cmd(chip, &cmd, cmd.header.in.length,
+                          "attempting extend a PCR value");
+
+        module_put(chip->dev->driver->owner);
+        return rc;
+}
+EXPORT_SYMBOL_GPL(tpm_pcr_extend);
+
 ssize_t tpm_show_pcrs(struct device *dev, struct device_attribute *attr,
                       char *buf)
 {
-        u8 *data;
+        cap_t cap;
+        u8 digest[TPM_DIGEST_SIZE];
         ssize_t rc;
         int i, j, num_pcrs;
-        __be32 index;
         char *str = buf;
-
         struct tpm_chip *chip = dev_get_drvdata(dev);
-        if (chip == NULL)
-                return -ENODEV;
 
-        data = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_PROP;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_PCR;
-
-        rc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,
+        rc = tpm_getcap(dev, TPM_CAP_PROP_PCR, &cap,
                         "attempting to determine the number of PCRS");
-        if (rc) {
-                kfree(data);
+        if (rc)
                 return 0;
-        }
 
-        num_pcrs = be32_to_cpu(*((__be32 *) (data + 14)));
+        num_pcrs = be32_to_cpu(cap.num_pcrs);
         for (i = 0; i < num_pcrs; i++) {
-                memcpy(data, pcrread, sizeof(pcrread));
-                index = cpu_to_be32(i);
-                memcpy(data + 10, &index, 4);
-                rc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,
-                                "attempting to read a PCR");
+                rc = __tpm_pcr_read(chip, i, digest);
                 if (rc)
-                        goto out;
+                        break;
                 str += sprintf(str, "PCR-%02d: ", i);
                 for (j = 0; j < TPM_DIGEST_SIZE; j++)
-                        str += sprintf(str, "%02X ", *(data + 10 + j));
+                        str += sprintf(str, "%02X ", digest[j]);
                 str += sprintf(str, "\n");
         }
-out:
-        kfree(data);
         return str - buf;
 }
 EXPORT_SYMBOL_GPL(tpm_show_pcrs);
 
 #define  READ_PUBEK_RESULT_SIZE 314
-static const u8 readpubek[] = {
-        0, 193,                 /* TPM_TAG_RQU_COMMAND */
-        0, 0, 0, 30,            /* length */
-        0, 0, 0, 124,           /* TPM_ORD_ReadPubek */
+#define TPM_ORD_READPUBEK cpu_to_be32(124)
+struct tpm_input_header tpm_readpubek_header = {
+        .tag = TPM_TAG_RQU_COMMAND,
+        .length = cpu_to_be32(30),
+        .ordinal = TPM_ORD_READPUBEK
 };
 
 ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
                        char *buf)
 {
         u8 *data;
+        struct tpm_cmd_t tpm_cmd;
         ssize_t err;
         int i, rc;
         char *str = buf;
 
         struct tpm_chip *chip = dev_get_drvdata(dev);
-        if (chip == NULL)
-                return -ENODEV;
 
-        data = kzalloc(READ_PUBEK_RESULT_SIZE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        memcpy(data, readpubek, sizeof(readpubek));
-
-        err = transmit_cmd(chip, data, READ_PUBEK_RESULT_SIZE,
+        tpm_cmd.header.in = tpm_readpubek_header;
+        err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
                         "attempting to read the PUBEK");
         if (err)
                 goto out;
@@ -812,7 +836,7 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
            256 byte modulus
            ignore checksum 20 bytes
          */
-
+        data = tpm_cmd.params.readpubek_out_buffer;
         str +=
             sprintf(str,
                     "Algorithm: %02X %02X %02X %02X\nEncscheme: %02X %02X\n"
@@ -832,65 +856,33 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
         }
 out:
         rc = str - buf;
-        kfree(data);
         return rc;
 }
 EXPORT_SYMBOL_GPL(tpm_show_pubek);
 
-#define CAP_VERSION_1_1 6
-#define CAP_VERSION_1_2 0x1A
-#define CAP_VERSION_IDX 13
-static const u8 cap_version[] = {
-        0, 193,                 /* TPM_TAG_RQU_COMMAND */
-        0, 0, 0, 18,            /* length */
-        0, 0, 0, 101,           /* TPM_ORD_GetCapability */
-        0, 0, 0, 0,
-        0, 0, 0, 0
-};
 
 ssize_t tpm_show_caps(struct device *dev, struct device_attribute *attr,
                       char *buf)
 {
-        u8 *data;
+        cap_t cap;
         ssize_t rc;
         char *str = buf;
 
-        struct tpm_chip *chip = dev_get_drvdata(dev);
-        if (chip == NULL)
-                return -ENODEV;
-
-        data = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_PROP;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_MANUFACTURER;
-
-        rc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,
+        rc = tpm_getcap(dev, TPM_CAP_PROP_MANUFACTURER, &cap,
                         "attempting to determine the manufacturer");
-        if (rc) {
-                kfree(data);
+        if (rc)
                 return 0;
-        }
-
         str += sprintf(str, "Manufacturer: 0x%x\n",
-                       be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX))));
+                       be32_to_cpu(cap.manufacturer_id));
 
-        memcpy(data, cap_version, sizeof(cap_version));
-        data[CAP_VERSION_IDX] = CAP_VERSION_1_1;
-        rc = transmit_cmd(chip, data, TPM_INTERNAL_RESULT_SIZE,
-                        "attempting to determine the 1.1 version");
+        rc = tpm_getcap(dev, CAP_VERSION_1_1, &cap,
+                        "attempting to determine the 1.1 version");
         if (rc)
-                goto out;
-
+                return 0;
         str += sprintf(str,
                        "TCG version: %d.%d\nFirmware version: %d.%d\n",
-                       (int) data[14], (int) data[15], (int) data[16],
-                       (int) data[17]);
-
-out:
-        kfree(data);
+                       cap.tpm_version.Major, cap.tpm_version.Minor,
+                       cap.tpm_version.revMajor, cap.tpm_version.revMinor);
         return str - buf;
 }
 EXPORT_SYMBOL_GPL(tpm_show_caps);
@@ -898,51 +890,25 @@ EXPORT_SYMBOL_GPL(tpm_show_caps);
 ssize_t tpm_show_caps_1_2(struct device * dev,
                           struct device_attribute * attr, char *buf)
 {
-        u8 *data;
-        ssize_t len;
+        cap_t cap;
+        ssize_t rc;
         char *str = buf;
 
-        struct tpm_chip *chip = dev_get_drvdata(dev);
-        if (chip == NULL)
-                return -ENODEV;
-
-        data = kzalloc(TPM_INTERNAL_RESULT_SIZE, GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
-
-        memcpy(data, tpm_cap, sizeof(tpm_cap));
-        data[TPM_CAP_IDX] = TPM_CAP_PROP;
-        data[TPM_CAP_SUBCAP_IDX] = TPM_CAP_PROP_MANUFACTURER;
-
-        len = tpm_transmit(chip, data, TPM_INTERNAL_RESULT_SIZE);
-        if (len <= TPM_ERROR_SIZE) {
-                dev_dbg(chip->dev, "A TPM error (%d) occurred "
-                        "attempting to determine the manufacturer\n",
-                        be32_to_cpu(*((__be32 *) (data + TPM_RET_CODE_IDX))));
-                kfree(data);
+        rc = tpm_getcap(dev, TPM_CAP_PROP_MANUFACTURER, &cap,
+                        "attempting to determine the manufacturer");
+        if (rc)
                 return 0;
-        }
-
         str += sprintf(str, "Manufacturer: 0x%x\n",
-                       be32_to_cpu(*((__be32 *) (data + TPM_GET_CAP_RET_UINT32_1_IDX))));
-
-        memcpy(data, cap_version, sizeof(cap_version));
-        data[CAP_VERSION_IDX] = CAP_VERSION_1_2;
-
-        len = tpm_transmit(chip, data, TPM_INTERNAL_RESULT_SIZE);
-        if (len <= TPM_ERROR_SIZE) {
-                dev_err(chip->dev, "A TPM error (%d) occurred "
-                        "attempting to determine the 1.2 version\n",
-                        be32_to_cpu(*((__be32 *) (data + TPM_RET_CODE_IDX))));
-                goto out;
-        }
+                       be32_to_cpu(cap.manufacturer_id));
+        rc = tpm_getcap(dev, CAP_VERSION_1_2, &cap,
+                         "attempting to determine the 1.2 version");
+        if (rc)
+                return 0;
         str += sprintf(str,
                        "TCG version: %d.%d\nFirmware version: %d.%d\n",
-                       (int) data[16], (int) data[17], (int) data[18],
-                       (int) data[19]);
-
-out:
-        kfree(data);
+                       cap.tpm_version_1_2.Major, cap.tpm_version_1_2.Minor,
+                       cap.tpm_version_1_2.revMajor,
+                       cap.tpm_version_1_2.revMinor);
         return str - buf;
 }
 EXPORT_SYMBOL_GPL(tpm_show_caps_1_2);
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 8e30df4a4388..8e00b4ddd083 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -26,6 +26,7 @@
 #include <linux/miscdevice.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/tpm.h>
 
 enum tpm_timeout {
         TPM_TIMEOUT = 5,        /* msecs */
@@ -123,6 +124,147 @@ static inline void tpm_write_index(int base, int index, int value)
         outb(index, base);
         outb(value & 0xFF, base+1);
 }
+struct tpm_input_header {
+        __be16  tag;
+        __be32  length;
+        __be32  ordinal;
+}__attribute__((packed));
+
+struct tpm_output_header {
+        __be16  tag;
+        __be32  length;
+        __be32  return_code;
+}__attribute__((packed));
+
+struct  stclear_flags_t {
+        __be16  tag;
+        u8      deactivated;
+        u8      disableForceClear;
+        u8      physicalPresence;
+        u8      physicalPresenceLock;
+        u8      bGlobalLock;
+}__attribute__((packed));
+
+struct  tpm_version_t {
+        u8      Major;
+        u8      Minor;
+        u8      revMajor;
+        u8      revMinor;
+}__attribute__((packed));
+
+struct  tpm_version_1_2_t {
+        __be16  tag;
+        u8      Major;
+        u8      Minor;
+        u8      revMajor;
+        u8      revMinor;
+}__attribute__((packed));
+
+struct  timeout_t {
+        __be32  a;
+        __be32  b;
+        __be32  c;
+        __be32  d;
+}__attribute__((packed));
+
+struct duration_t {
+        __be32  tpm_short;
+        __be32  tpm_medium;
+        __be32  tpm_long;
+}__attribute__((packed));
+
+struct permanent_flags_t {
+        __be16  tag;
+        u8      disable;
+        u8      ownership;
+        u8      deactivated;
+        u8      readPubek;
+        u8      disableOwnerClear;
+        u8      allowMaintenance;
+        u8      physicalPresenceLifetimeLock;
+        u8      physicalPresenceHWEnable;
+        u8      physicalPresenceCMDEnable;
+        u8      CEKPUsed;
+        u8      TPMpost;
+        u8      TPMpostLock;
+        u8      FIPS;
+        u8      operator;
+        u8      enableRevokeEK;
+        u8      nvLocked;
+        u8      readSRKPub;
+        u8      tpmEstablished;
+        u8      maintenanceDone;
+        u8      disableFullDALogicInfo;
+}__attribute__((packed));
+
+typedef union {
+        struct  permanent_flags_t perm_flags;
+        struct  stclear_flags_t stclear_flags;
+        bool    owned;
+        __be32  num_pcrs;
+        struct  tpm_version_t   tpm_version;
+        struct  tpm_version_1_2_t tpm_version_1_2;
+        __be32  manufacturer_id;
+        struct timeout_t  timeout;
+        struct duration_t duration;
+} cap_t;
+
+struct  tpm_getcap_params_in {
+        __be32  cap;
+        __be32  subcap_size;
+        __be32  subcap;
+}__attribute__((packed));
+
+struct  tpm_getcap_params_out {
+        __be32  cap_size;
+        cap_t   cap;
+}__attribute__((packed));
+
+struct  tpm_readpubek_params_out {
+        u8      algorithm[4];
+        u8      encscheme[2];
+        u8      sigscheme[2];
+        u8      parameters[12]; /*assuming RSA*/
+        __be32  keysize;
+        u8      modulus[256];
+        u8      checksum[20];
+}__attribute__((packed));
+
+typedef union {
+        struct  tpm_input_header in;
+        struct  tpm_output_header out;
+} tpm_cmd_header;
+
+#define TPM_DIGEST_SIZE 20
+struct tpm_pcrread_out {
+        u8      pcr_result[TPM_DIGEST_SIZE];
+}__attribute__((packed));
+
+struct tpm_pcrread_in {
+        __be32  pcr_idx;
+}__attribute__((packed));
+
+struct tpm_pcrextend_in {
+        __be32  pcr_idx;
+        u8      hash[TPM_DIGEST_SIZE];
+}__attribute__((packed));
+
+typedef union {
+        struct  tpm_getcap_params_out getcap_out;
+        struct  tpm_readpubek_params_out readpubek_out;
+        u8      readpubek_out_buffer[sizeof(struct tpm_readpubek_params_out)];
+        struct  tpm_getcap_params_in getcap_in;
+        struct  tpm_pcrread_in  pcrread_in;
+        struct  tpm_pcrread_out pcrread_out;
+        struct  tpm_pcrextend_in pcrextend_in;
+} tpm_cmd_params;
+
+struct tpm_cmd_t {
+        tpm_cmd_header  header;
+        tpm_cmd_params  params;
+}__attribute__((packed));
+
+ssize_t tpm_getcap(struct device *, __be32, cap_t *, const char *);
 
 extern void tpm_get_timeouts(struct tpm_chip *);
 extern void tpm_gen_interrupt(struct tpm_chip *);
diff --git a/drivers/char/tpm/tpm_atmel.c b/drivers/char/tpm/tpm_atmel.c
index d0e7926eb486..c64a1bc65349 100644
--- a/drivers/char/tpm/tpm_atmel.c
+++ b/drivers/char/tpm/tpm_atmel.c
@@ -168,12 +168,22 @@ static void atml_plat_remove(void)
         }
 }
 
-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 tpm_atml_suspend(struct platform_device *dev, pm_message_t msg)
+{
+        return tpm_pm_suspend(&dev->dev, msg);
+}
+
+static int tpm_atml_resume(struct platform_device *dev)
+{
+        return tpm_pm_resume(&dev->dev);
+}
+static struct platform_driver atml_drv = {
+        .driver = {
+                .name = "tpm_atmel",
+                .owner          = THIS_MODULE,
+        },
+        .suspend = tpm_atml_suspend,
+        .resume = tpm_atml_resume,
 };
 
 static int __init init_atmel(void)
@@ -184,7 +194,7 @@ static int __init init_atmel(void)
         unsigned long base;
         struct  tpm_chip *chip;
 
-        rc = driver_register(&atml_drv);
+        rc = platform_driver_register(&atml_drv);
         if (rc)
                 return rc;
 
@@ -223,13 +233,13 @@ err_rel_reg:
                 atmel_release_region(base,
                                      region_size);
 err_unreg_drv:
-        driver_unregister(&atml_drv);
+        platform_driver_unregister(&atml_drv);
         return rc;
 }
 
 static void __exit cleanup_atmel(void)
 {
-        driver_unregister(&atml_drv);
+        platform_driver_unregister(&atml_drv);
         atml_plat_remove();
 }
 
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 717af7ad1bdf..aec1931608aa 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -654,12 +654,22 @@ module_param_string(hid, tpm_pnp_tbl[TIS_HID_USR_IDX].id,
                     sizeof(tpm_pnp_tbl[TIS_HID_USR_IDX].id), 0444);
 MODULE_PARM_DESC(hid, "Set additional specific HID for this driver to probe");
 
-static struct device_driver tis_drv = {
-        .name = "tpm_tis",
-        .bus = &platform_bus_type,
-        .owner = THIS_MODULE,
-        .suspend = tpm_pm_suspend,
-        .resume = tpm_pm_resume,
+static int tpm_tis_suspend(struct platform_device *dev, pm_message_t msg)
+{
+        return tpm_pm_suspend(&dev->dev, msg);
+}
+
+static int tpm_tis_resume(struct platform_device *dev)
+{
+        return tpm_pm_resume(&dev->dev);
+}
+static struct platform_driver tis_drv = {
+        .driver = {
+                .name = "tpm_tis",
+                .owner          = THIS_MODULE,
+        },
+        .suspend = tpm_tis_suspend,
+        .resume = tpm_tis_resume,
 };
 
 static struct platform_device *pdev;
@@ -672,14 +682,14 @@ static int __init init_tis(void)
         int rc;
 
         if (force) {
-                rc = driver_register(&tis_drv);
+                rc = platform_driver_register(&tis_drv);
                 if (rc < 0)
                         return rc;
                 if (IS_ERR(pdev=platform_device_register_simple("tpm_tis", -1, NULL, 0)))
                         return PTR_ERR(pdev);
                 if((rc=tpm_tis_init(&pdev->dev, TIS_MEM_BASE, TIS_MEM_LEN, 0)) != 0) {
                         platform_device_unregister(pdev);
-                        driver_unregister(&tis_drv);
+                        platform_driver_unregister(&tis_drv);
                 }
                 return rc;
         }
@@ -711,7 +721,7 @@ static void __exit cleanup_tis(void)
 
         if (force) {
                 platform_device_unregister(pdev);
-                driver_unregister(&tis_drv);
+                platform_driver_unregister(&tis_drv);
         } else
                 pnp_unregister_driver(&tis_pnp_driver);
 }
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index bc84e125c6bc..224f271d8cbe 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2162,13 +2162,12 @@ static int fionbio(struct file *file, int __user *p)
         if (get_user(nonblock, p))
                 return -EFAULT;
 
-        /* file->f_flags is still BKL protected in the fs layer - vomit */
-        lock_kernel();
+        spin_lock(&file->f_lock);
         if (nonblock)
                 file->f_flags |= O_NONBLOCK;
         else
                 file->f_flags &= ~O_NONBLOCK;
-        unlock_kernel();
+        spin_unlock(&file->f_lock);
         return 0;
 }
 
diff --git a/drivers/char/vc_screen.c b/drivers/char/vc_screen.c
index 4f3b3f95fc42..d94d25c12aa8 100644
--- a/drivers/char/vc_screen.c
+++ b/drivers/char/vc_screen.c
@@ -479,18 +479,18 @@ static const struct file_operations vcs_fops = {
 
 static struct class *vc_class;
 
-void vcs_make_sysfs(struct tty_struct *tty)
+void vcs_make_sysfs(int index)
 {
-        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1), NULL,
-                      "vcs%u", tty->index + 1);
-        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129), NULL,
-                      "vcsa%u", tty->index + 1);
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, index + 1), NULL,
+                      "vcs%u", index + 1);
+        device_create(vc_class, NULL, MKDEV(VCS_MAJOR, index + 129), NULL,
+                      "vcsa%u", index + 1);
 }
 
-void vcs_remove_sysfs(struct tty_struct *tty)
+void vcs_remove_sysfs(int index)
 {
-        device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 1));
-        device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 129));
+        device_destroy(vc_class, MKDEV(VCS_MAJOR, index + 1));
+        device_destroy(vc_class, MKDEV(VCS_MAJOR, index + 129));
 }
 
 int __init vcs_init(void)
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 7900bd63b36d..2c1d133819b5 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -778,6 +778,7 @@ int vc_allocate(unsigned int currcons)	/* return 0 on success */
             }
             vc->vc_kmalloced = 1;
             vc_init(vc, vc->vc_rows, vc->vc_cols, 1);
+            vcs_make_sysfs(currcons);
             atomic_notifier_call_chain(&vt_notifier_list, VT_ALLOCATE, &param);
         }
         return 0;
@@ -987,7 +988,9 @@ void vc_deallocate(unsigned int currcons)
         if (vc_cons_allocated(currcons)) {
                 struct vc_data *vc = vc_cons[currcons].d;
                 struct vt_notifier_param param = { .vc = vc };
+
                 atomic_notifier_call_chain(&vt_notifier_list, VT_DEALLOCATE, &param);
+                vcs_remove_sysfs(currcons);
                 vc->vc_sw->con_deinit(vc);
                 put_pid(vc->vt_pid);
                 module_put(vc->vc_sw->owner);
@@ -2775,7 +2778,6 @@ static int con_open(struct tty_struct *tty, struct file *filp)
                                 tty->termios->c_iflag |= IUTF8;
                         else
                                 tty->termios->c_iflag &= ~IUTF8;
-                        vcs_make_sysfs(tty);
                         release_console_sem();
                         return ret;
                 }
@@ -2795,7 +2797,6 @@ static void con_shutdown(struct tty_struct *tty)
         BUG_ON(vc == NULL);
         acquire_console_sem();
         vc->vc_tty = NULL;
-        vcs_remove_sysfs(tty);
         release_console_sem();
         tty_shutdown(tty);
 }