Merge remote branch 'origin' into secretlab/next-spi

12 files changed, 125 insertions, 499 deletions

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 7b6f7eefdf8d..f12dc3e54402 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -3,7 +3,6 @@
 #
 
 obj-$(CONFIG_IBM_ASM)           += ibmasm/
-obj-$(CONFIG_HDPU_FEATURES)     += hdpuftrs/
 obj-$(CONFIG_AD525X_DPOT)       += ad525x_dpot.o
 obj-$(CONFIG_ATMEL_PWM)         += atmel_pwm.o
 obj-$(CONFIG_ATMEL_SSC)         += atmel-ssc.o
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
index ed090e77c9cd..19fc7c1cb428 100644
--- a/drivers/misc/c2port/core.c
+++ b/drivers/misc/c2port/core.c
@@ -707,7 +707,7 @@ static ssize_t __c2port_read_flash_data(struct c2port_device *dev,
         return nread;
 }
 
-static ssize_t c2port_read_flash_data(struct kobject *kobj,
+static ssize_t c2port_read_flash_data(struct file *filp, struct kobject *kobj,
                                 struct bin_attribute *attr,
                                 char *buffer, loff_t offset, size_t count)
 {
@@ -824,7 +824,7 @@ static ssize_t __c2port_write_flash_data(struct c2port_device *dev,
         return nwrite;
 }
 
-static ssize_t c2port_write_flash_data(struct kobject *kobj,
+static ssize_t c2port_write_flash_data(struct file *filp, struct kobject *kobj,
                                 struct bin_attribute *attr,
                                 char *buffer, loff_t offset, size_t count)
 {
diff --git a/drivers/misc/ds1682.c b/drivers/misc/ds1682.c
index 9197cfc55015..a513f0aa6432 100644
--- a/drivers/misc/ds1682.c
+++ b/drivers/misc/ds1682.c
@@ -140,7 +140,8 @@ static const struct attribute_group ds1682_group = {
 /*
  * User data attribute
  */
-static ssize_t ds1682_eeprom_read(struct kobject *kobj, struct bin_attribute *attr,
+static ssize_t ds1682_eeprom_read(struct file *filp, struct kobject *kobj,
+                                  struct bin_attribute *attr,
                                   char *buf, loff_t off, size_t count)
 {
         struct i2c_client *client = kobj_to_i2c_client(kobj);
@@ -163,7 +164,8 @@ static ssize_t ds1682_eeprom_read(struct kobject *kobj, struct bin_attribute *at
         return count;
 }
 
-static ssize_t ds1682_eeprom_write(struct kobject *kobj, struct bin_attribute *attr,
+static ssize_t ds1682_eeprom_write(struct file *filp, struct kobject *kobj,
+                                   struct bin_attribute *attr,
                                    char *buf, loff_t off, size_t count)
 {
         struct i2c_client *client = kobj_to_i2c_client(kobj);
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index db7d0f21b65d..f7ca3a42b490 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -54,7 +54,7 @@
 struct at24_data {
         struct at24_platform_data chip;
         struct memory_accessor macc;
-        bool use_smbus;
+        int use_smbus;
 
         /*
          * Lock protects against activities from other Linux tasks,
@@ -184,11 +184,19 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
         if (count > io_limit)
                 count = io_limit;
 
-        if (at24->use_smbus) {
+        switch (at24->use_smbus) {
+        case I2C_SMBUS_I2C_BLOCK_DATA:
                 /* Smaller eeproms can work given some SMBus extension calls */
                 if (count > I2C_SMBUS_BLOCK_MAX)
                         count = I2C_SMBUS_BLOCK_MAX;
-        } else {
+                break;
+        case I2C_SMBUS_WORD_DATA:
+                count = 2;
+                break;
+        case I2C_SMBUS_BYTE_DATA:
+                count = 1;
+                break;
+        default:
                 /*
                  * When we have a better choice than SMBus calls, use a
                  * combined I2C message. Write address; then read up to
@@ -219,10 +227,27 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
         timeout = jiffies + msecs_to_jiffies(write_timeout);
         do {
                 read_time = jiffies;
-                if (at24->use_smbus) {
+                switch (at24->use_smbus) {
+                case I2C_SMBUS_I2C_BLOCK_DATA:
                         status = i2c_smbus_read_i2c_block_data(client, offset,
                                         count, buf);
-                } else {
+                        break;
+                case I2C_SMBUS_WORD_DATA:
+                        status = i2c_smbus_read_word_data(client, offset);
+                        if (status >= 0) {
+                                buf[0] = status & 0xff;
+                                buf[1] = status >> 8;
+                                status = count;
+                        }
+                        break;
+                case I2C_SMBUS_BYTE_DATA:
+                        status = i2c_smbus_read_byte_data(client, offset);
+                        if (status >= 0) {
+                                buf[0] = status;
+                                status = count;
+                        }
+                        break;
+                default:
                         status = i2c_transfer(client->adapter, msg, 2);
                         if (status == 2)
                                 status = count;
@@ -274,7 +299,8 @@ static ssize_t at24_read(struct at24_data *at24,
         return retval;
 }
 
-static ssize_t at24_bin_read(struct kobject *kobj, struct bin_attribute *attr,
+static ssize_t at24_bin_read(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct at24_data *at24;
@@ -395,7 +421,8 @@ static ssize_t at24_write(struct at24_data *at24, const char *buf, loff_t off,
         return retval;
 }
 
-static ssize_t at24_bin_write(struct kobject *kobj, struct bin_attribute *attr,
+static ssize_t at24_bin_write(struct file *filp, struct kobject *kobj,
+                struct bin_attribute *attr,
                 char *buf, loff_t off, size_t count)
 {
         struct at24_data *at24;
@@ -434,7 +461,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         struct at24_platform_data chip;
         bool writable;
-        bool use_smbus = false;
+        int use_smbus = 0;
         struct at24_data *at24;
         int err;
         unsigned i, num_addresses;
@@ -475,12 +502,19 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
                         err = -EPFNOSUPPORT;
                         goto err_out;
                 }
-                if (!i2c_check_functionality(client->adapter,
+                if (i2c_check_functionality(client->adapter,
                                 I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+                        use_smbus = I2C_SMBUS_I2C_BLOCK_DATA;
+                } else if (i2c_check_functionality(client->adapter,
+                                I2C_FUNC_SMBUS_READ_WORD_DATA)) {
+                        use_smbus = I2C_SMBUS_WORD_DATA;
+                } else if (i2c_check_functionality(client->adapter,
+                                I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
+                        use_smbus = I2C_SMBUS_BYTE_DATA;
+                } else {
                         err = -EPFNOSUPPORT;
                         goto err_out;
                 }
-                use_smbus = true;
         }
 
         if (chip.flags & AT24_FLAG_TAKE8ADDR)
@@ -566,11 +600,16 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
         dev_info(&client->dev, "%zu byte %s EEPROM %s\n",
                 at24->bin.size, client->name,
                 writable ? "(writable)" : "(read-only)");
+        if (use_smbus == I2C_SMBUS_WORD_DATA ||
+            use_smbus == I2C_SMBUS_BYTE_DATA) {
+                dev_notice(&client->dev, "Falling back to %s reads, "
+                           "performance will suffer\n", use_smbus ==
+                           I2C_SMBUS_WORD_DATA ? "word" : "byte");
+        }
         dev_dbg(&client->dev,
-                "page_size %d, num_addresses %d, write_max %d%s\n",
+                "page_size %d, num_addresses %d, write_max %d, use_smbus %d\n",
                 chip.page_size, num_addresses,
-                at24->write_max,
-                use_smbus ? ", use_smbus" : "");
+                at24->write_max, use_smbus);
 
         /* export data to kernel code */
         if (chip.setup)
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index d194212a41f6..c627e4174ccd 100644
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -126,7 +126,8 @@ at25_ee_read(
 }
 
 static ssize_t
-at25_bin_read(struct kobject *kobj, struct bin_attribute *bin_attr,
+at25_bin_read(struct file *filp, struct kobject *kobj,
+              struct bin_attribute *bin_attr,
               char *buf, loff_t off, size_t count)
 {
         struct device           *dev;
@@ -253,7 +254,8 @@ at25_ee_write(struct at25_data *at25, const char *buf, loff_t off,
 }
 
 static ssize_t
-at25_bin_write(struct kobject *kobj, struct bin_attribute *bin_attr,
+at25_bin_write(struct file *filp, struct kobject *kobj,
+               struct bin_attribute *bin_attr,
                char *buf, loff_t off, size_t count)
 {
         struct device           *dev;
diff --git a/drivers/misc/eeprom/eeprom.c b/drivers/misc/eeprom/eeprom.c
index f939ebc2507c..45060ddc4e59 100644
--- a/drivers/misc/eeprom/eeprom.c
+++ b/drivers/misc/eeprom/eeprom.c
@@ -1,24 +1,20 @@
 /*
-    Copyright (C) 1998, 1999  Frodo Looijaard <frodol@dds.nl> and
-                               Philip Edelbrock <phil@netroedge.com>
-    Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
-    Copyright (C) 2003 IBM Corp.
-    Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+ * Copyright (C) 1998, 1999  Frodo Looijaard <frodol@dds.nl> and
+ *                           Philip Edelbrock <phil@netroedge.com>
+ * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003 IBM Corp.
+ * Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -85,7 +81,8 @@ exit:
         mutex_unlock(&data->update_lock);
 }
 
-static ssize_t eeprom_read(struct kobject *kobj, struct bin_attribute *bin_attr,
+static ssize_t eeprom_read(struct file *filp, struct kobject *kobj,
+                           struct bin_attribute *bin_attr,
                            char *buf, loff_t off, size_t count)
 {
         struct i2c_client *client = to_i2c_client(container_of(kobj, struct device, kobj));
diff --git a/drivers/misc/eeprom/eeprom_93cx6.c b/drivers/misc/eeprom/eeprom_93cx6.c
index 15b1780025c8..7b33de95c4bf 100644
--- a/drivers/misc/eeprom/eeprom_93cx6.c
+++ b/drivers/misc/eeprom/eeprom_93cx6.c
@@ -1,27 +1,20 @@
 /*
-        Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
-        <http://rt2x00.serialmonkey.com>
-
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2 of the License, or
-        (at your option) any later version.
-
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-        GNU General Public License for more details.
-
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the
-        Free Software Foundation, Inc.,
-        59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-/*
-        Module: eeprom_93cx6
-        Abstract: EEPROM reader routines for 93cx6 chipsets.
-        Supported chipsets: 93c46 & 93c66.
+ * Copyright (C) 2004 - 2006 rt2x00 SourceForge Project
+ * <http://rt2x00.serialmonkey.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Module: eeprom_93cx6
+ * Abstract: EEPROM reader routines for 93cx6 chipsets.
+ * Supported chipsets: 93c46 & 93c66.
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c
index 5a6b2bce8ad5..5653a3ce0517 100644
--- a/drivers/misc/eeprom/max6875.c
+++ b/drivers/misc/eeprom/max6875.c
@@ -1,30 +1,30 @@
 /*
-    max6875.c - driver for MAX6874/MAX6875
-
-    Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
-
-    Based on eeprom.c
-
-    The MAX6875 has a bank of registers and two banks of EEPROM.
-    Address ranges are defined as follows:
-     * 0x0000 - 0x0046 = configuration registers
-     * 0x8000 - 0x8046 = configuration EEPROM
-     * 0x8100 - 0x82FF = user EEPROM
-
-    This driver makes the user EEPROM available for read.
-
-    The registers & config EEPROM should be accessed via i2c-dev.
-
-    The MAX6875 ignores the lowest address bit, so each chip responds to
-    two addresses - 0x50/0x51 and 0x52/0x53.
-
-    Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
-    address, so this driver is destructive if loaded for the wrong EEPROM chip.
-
-    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; version 2 of the License.
-*/
+ * max6875.c - driver for MAX6874/MAX6875
+ *
+ * Copyright (C) 2005 Ben Gardner <bgardner@wabtec.com>
+ *
+ * Based on eeprom.c
+ *
+ * The MAX6875 has a bank of registers and two banks of EEPROM.
+ * Address ranges are defined as follows:
+ *  * 0x0000 - 0x0046 = configuration registers
+ *  * 0x8000 - 0x8046 = configuration EEPROM
+ *  * 0x8100 - 0x82FF = user EEPROM
+ *
+ * This driver makes the user EEPROM available for read.
+ *
+ * The registers & config EEPROM should be accessed via i2c-dev.
+ *
+ * The MAX6875 ignores the lowest address bit, so each chip responds to
+ * two addresses - 0x50/0x51 and 0x52/0x53.
+ *
+ * Note that the MAX6875 uses i2c_smbus_write_byte_data() to set the read
+ * address, so this driver is destructive if loaded for the wrong EEPROM chip.
+ *
+ * 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; version 2 of the License.
+ */
 
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -107,7 +107,7 @@ exit_up:
         mutex_unlock(&data->update_lock);
 }
 
-static ssize_t max6875_read(struct kobject *kobj,
+static ssize_t max6875_read(struct file *filp, struct kobject *kobj,
                             struct bin_attribute *bin_attr,
                             char *buf, loff_t off, size_t count)
 {
diff --git a/drivers/misc/hdpuftrs/Makefile b/drivers/misc/hdpuftrs/Makefile
deleted file mode 100644
index ac74ae679230..000000000000
--- a/drivers/misc/hdpuftrs/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_HDPU_FEATURES) := hdpu_cpustate.o hdpu_nexus.o
diff --git a/drivers/misc/hdpuftrs/hdpu_cpustate.c b/drivers/misc/hdpuftrs/hdpu_cpustate.c
deleted file mode 100644
index 176fe4e09d3f..000000000000
--- a/drivers/misc/hdpuftrs/hdpu_cpustate.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- *      Sky CPU State Driver
- *
- *      Copyright (C) 2002 Brian Waite
- *
- *      This driver allows use of the CPU state bits
- *      It exports the /dev/sky_cpustate and also
- *      /proc/sky_cpustate pseudo-file for status information.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/smp_lock.h>
-#include <linux/miscdevice.h>
-#include <linux/proc_fs.h>
-#include <linux/hdpu_features.h>
-#include <linux/platform_device.h>
-#include <asm/uaccess.h>
-#include <linux/seq_file.h>
-#include <asm/io.h>
-
-#define SKY_CPUSTATE_VERSION            "1.1"
-
-static int hdpu_cpustate_probe(struct platform_device *pdev);
-static int hdpu_cpustate_remove(struct platform_device *pdev);
-
-static unsigned char cpustate_get_state(void);
-static int cpustate_proc_open(struct inode *inode, struct file *file);
-static int cpustate_proc_read(struct seq_file *seq, void *offset);
-
-static struct cpustate_t cpustate;
-
-static const struct file_operations proc_cpustate = {
-        .open = cpustate_proc_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-
-static int cpustate_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, cpustate_proc_read, NULL);
-}
-
-static int cpustate_proc_read(struct seq_file *seq, void *offset)
-{
-        seq_printf(seq, "CPU State: %04x\n", cpustate_get_state());
-        return 0;
-}
-
-static int cpustate_get_ref(int excl)
-{
-
-        int retval = -EBUSY;
-
-        spin_lock(&cpustate.lock);
-
-        if (cpustate.excl)
-                goto out_busy;
-
-        if (excl) {
-                if (cpustate.open_count)
-                        goto out_busy;
-                cpustate.excl = 1;
-        }
-
-        cpustate.open_count++;
-        retval = 0;
-
-      out_busy:
-        spin_unlock(&cpustate.lock);
-        return retval;
-}
-
-static int cpustate_free_ref(void)
-{
-
-        spin_lock(&cpustate.lock);
-
-        cpustate.excl = 0;
-        cpustate.open_count--;
-
-        spin_unlock(&cpustate.lock);
-        return 0;
-}
-
-static unsigned char cpustate_get_state(void)
-{
-
-        return cpustate.cached_val;
-}
-
-static void cpustate_set_state(unsigned char new_state)
-{
-        unsigned int state = (new_state << 21);
-
-#ifdef DEBUG_CPUSTATE
-        printk("CPUSTATE -> 0x%x\n", new_state);
-#endif
-        spin_lock(&cpustate.lock);
-        cpustate.cached_val = new_state;
-        writel((0xff << 21), cpustate.clr_addr);
-        writel(state, cpustate.set_addr);
-        spin_unlock(&cpustate.lock);
-}
-
-/*
- *      Now all the various file operations that we export.
- */
-
-static ssize_t cpustate_read(struct file *file, char *buf,
-                             size_t count, loff_t * ppos)
-{
-        unsigned char data;
-
-        if (count < 0)
-                return -EFAULT;
-        if (count == 0)
-                return 0;
-
-        data = cpustate_get_state();
-        if (copy_to_user(buf, &data, sizeof(unsigned char)))
-                return -EFAULT;
-        return sizeof(unsigned char);
-}
-
-static ssize_t cpustate_write(struct file *file, const char *buf,
-                              size_t count, loff_t * ppos)
-{
-        unsigned char data;
-
-        if (count < 0)
-                return -EFAULT;
-
-        if (count == 0)
-                return 0;
-
-        if (copy_from_user((unsigned char *)&data, buf, sizeof(unsigned char)))
-                return -EFAULT;
-
-        cpustate_set_state(data);
-        return sizeof(unsigned char);
-}
-
-static int cpustate_open(struct inode *inode, struct file *file)
-{
-        int ret;
-
-        lock_kernel();
-        ret = cpustate_get_ref((file->f_flags & O_EXCL));
-        unlock_kernel();
-
-        return ret;
-}
-
-static int cpustate_release(struct inode *inode, struct file *file)
-{
-        return cpustate_free_ref();
-}
-
-static struct platform_driver hdpu_cpustate_driver = {
-        .probe = hdpu_cpustate_probe,
-        .remove = hdpu_cpustate_remove,
-        .driver = {
-                .name = HDPU_CPUSTATE_NAME,
-                .owner = THIS_MODULE,
-        },
-};
-
-/*
- *      The various file operations we support.
- */
-static const struct file_operations cpustate_fops = {
-      .owner    = THIS_MODULE,
-      .open     = cpustate_open,
-      .release  = cpustate_release,
-      .read     = cpustate_read,
-      .write    = cpustate_write,
-      .llseek   = no_llseek,
-};
-
-static struct miscdevice cpustate_dev = {
-        .minor  = MISC_DYNAMIC_MINOR,
-        .name   = "sky_cpustate",
-        .fops   = &cpustate_fops,
-};
-
-static int hdpu_cpustate_probe(struct platform_device *pdev)
-{
-        struct resource *res;
-        struct proc_dir_entry *proc_de;
-        int ret;
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                printk(KERN_ERR "sky_cpustate: "
-                       "Invalid memory resource.\n");
-                return -EINVAL;
-        }
-        cpustate.set_addr = (unsigned long *)res->start;
-        cpustate.clr_addr = (unsigned long *)res->end - 1;
-
-        ret = misc_register(&cpustate_dev);
-        if (ret) {
-                printk(KERN_WARNING "sky_cpustate: "
-                       "Unable to register misc device.\n");
-                cpustate.set_addr = NULL;
-                cpustate.clr_addr = NULL;
-                return ret;
-        }
-
-        proc_de = proc_create("sky_cpustate", 0666, NULL, &proc_cpustate);
-        if (!proc_de) {
-                printk(KERN_WARNING "sky_cpustate: "
-                       "Unable to create proc entry\n");
-        }
-
-        printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n");
-        return 0;
-}
-
-static int hdpu_cpustate_remove(struct platform_device *pdev)
-{
-        cpustate.set_addr = NULL;
-        cpustate.clr_addr = NULL;
-
-        remove_proc_entry("sky_cpustate", NULL);
-        misc_deregister(&cpustate_dev);
-
-        return 0;
-}
-
-static int __init cpustate_init(void)
-{
-        return platform_driver_register(&hdpu_cpustate_driver);
-}
-
-static void __exit cpustate_exit(void)
-{
-        platform_driver_unregister(&hdpu_cpustate_driver);
-}
-
-module_init(cpustate_init);
-module_exit(cpustate_exit);
-
-MODULE_AUTHOR("Brian Waite");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" HDPU_CPUSTATE_NAME);
diff --git a/drivers/misc/hdpuftrs/hdpu_nexus.c b/drivers/misc/hdpuftrs/hdpu_nexus.c
deleted file mode 100644
index ce39fa54949b..000000000000
--- a/drivers/misc/hdpuftrs/hdpu_nexus.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- *      Sky Nexus Register Driver
- *
- *      Copyright (C) 2002 Brian Waite
- *
- *      This driver allows reading the Nexus register
- *      It exports the /proc/sky_chassis_id and also
- *      /proc/sky_slot_id pseudo-file for status information.
- *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/proc_fs.h>
-#include <linux/hdpu_features.h>
-#include <linux/platform_device.h>
-#include <linux/seq_file.h>
-#include <asm/io.h>
-
-static int hdpu_nexus_probe(struct platform_device *pdev);
-static int hdpu_nexus_remove(struct platform_device *pdev);
-static int hdpu_slot_id_open(struct inode *inode, struct file *file);
-static int hdpu_slot_id_read(struct seq_file *seq, void *offset);
-static int hdpu_chassis_id_open(struct inode *inode, struct file *file);
-static int hdpu_chassis_id_read(struct seq_file *seq, void *offset);
-
-static struct proc_dir_entry *hdpu_slot_id;
-static struct proc_dir_entry *hdpu_chassis_id;
-static int slot_id = -1;
-static int chassis_id = -1;
-
-static const struct file_operations proc_slot_id = {
-        .open = hdpu_slot_id_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-
-static const struct file_operations proc_chassis_id = {
-        .open = hdpu_chassis_id_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-        .owner = THIS_MODULE,
-};
-
-static struct platform_driver hdpu_nexus_driver = {
-        .probe = hdpu_nexus_probe,
-        .remove = hdpu_nexus_remove,
-        .driver = {
-                .name = HDPU_NEXUS_NAME,
-                .owner = THIS_MODULE,
-        },
-};
-
-static int hdpu_slot_id_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, hdpu_slot_id_read, NULL);
-}
-
-static int hdpu_slot_id_read(struct seq_file *seq, void *offset)
-{
-        seq_printf(seq, "%d\n", slot_id);
-        return 0;
-}
-
-static int hdpu_chassis_id_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, hdpu_chassis_id_read, NULL);
-}
-
-static int hdpu_chassis_id_read(struct seq_file *seq, void *offset)
-{
-        seq_printf(seq, "%d\n", chassis_id);
-        return 0;
-}
-
-static int hdpu_nexus_probe(struct platform_device *pdev)
-{
-        struct resource *res;
-        int *nexus_id_addr;
-
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                printk(KERN_ERR "sky_nexus: "
-                       "Invalid memory resource.\n");
-                return -EINVAL;
-        }
-        nexus_id_addr = ioremap(res->start,
-                                (unsigned long)(res->end - res->start));
-        if (nexus_id_addr) {
-                slot_id = (*nexus_id_addr >> 8) & 0x1f;
-                chassis_id = *nexus_id_addr & 0xff;
-                iounmap(nexus_id_addr);
-        } else {
-                printk(KERN_ERR "sky_nexus: Could not map slot id\n");
-        }
-
-        hdpu_slot_id = proc_create("sky_slot_id", 0666, NULL, &proc_slot_id);
-        if (!hdpu_slot_id) {
-                printk(KERN_WARNING "sky_nexus: "
-                       "Unable to create proc dir entry: sky_slot_id\n");
-        }
-
-        hdpu_chassis_id = proc_create("sky_chassis_id", 0666, NULL,
-                                      &proc_chassis_id);
-        if (!hdpu_chassis_id)
-                printk(KERN_WARNING "sky_nexus: "
-                       "Unable to create proc dir entry: sky_chassis_id\n");
-
-        return 0;
-}
-
-static int hdpu_nexus_remove(struct platform_device *pdev)
-{
-        slot_id = -1;
-        chassis_id = -1;
-
-        remove_proc_entry("sky_slot_id", NULL);
-        remove_proc_entry("sky_chassis_id", NULL);
-
-        hdpu_slot_id = 0;
-        hdpu_chassis_id = 0;
-
-        return 0;
-}
-
-static int __init nexus_init(void)
-{
-        return platform_driver_register(&hdpu_nexus_driver);
-}
-
-static void __exit nexus_exit(void)
-{
-        platform_driver_unregister(&hdpu_nexus_driver);
-}
-
-module_init(nexus_init);
-module_exit(nexus_exit);
-
-MODULE_AUTHOR("Brian Waite");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:" HDPU_NEXUS_NAME);
diff --git a/drivers/misc/vmware_balloon.c b/drivers/misc/vmware_balloon.c
index e7161c4e3798..db9cd0240c6f 100644
--- a/drivers/misc/vmware_balloon.c
+++ b/drivers/misc/vmware_balloon.c
@@ -41,7 +41,7 @@
 #include <linux/workqueue.h>
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
-#include <asm/vmware.h>
+#include <asm/hypervisor.h>
 
 MODULE_AUTHOR("VMware, Inc.");
 MODULE_DESCRIPTION("VMware Memory Control (Balloon) Driver");
@@ -767,7 +767,7 @@ static int __init vmballoon_init(void)
          * Check if we are running on VMware's hypervisor and bail out
          * if we are not.
          */
-        if (!vmware_platform())
+        if (x86_hyper != &x86_hyper_vmware)
                 return -ENODEV;
 
         vmballoon_wq = create_freezeable_workqueue("vmmemctl");