Merge commit 'origin/master' into next

Conflicts:
	include/linux/kvm.h

20 files changed, 173 insertions, 775 deletions

diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index d7ece131b4f4..8d8a00e5a30e 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -5,6 +5,7 @@
 menuconfig I2C
         tristate "I2C support"
         depends on HAS_IOMEM
+        select RT_MUTEXES
         ---help---
           I2C (pronounce: I-square-C) is a slow serial bus protocol used in
           many micro controller applications and developed by Philips.  SMBus,
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index e8fe7f169e25..5f318ce29770 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -640,22 +640,6 @@ config I2C_TINY_USB
           This driver can also be built as a module.  If so, the module
           will be called i2c-tiny-usb.
 
-comment "Graphics adapter I2C/DDC channel drivers"
-        depends on PCI
-
-config I2C_VOODOO3
-        tristate "Voodoo 3 (DEPRECATED)"
-        depends on PCI
-        select I2C_ALGOBIT
-        help
-          If you say yes to this option, support will be included for the
-          Voodoo 3 I2C interface. This driver is deprecated and you should
-          use the tdfxfb driver instead, which additionally provides
-          framebuffer support.
-
-          This driver can also be built as a module.  If so, the module
-          will be called i2c-voodoo3.
-
 comment "Other I2C/SMBus bus drivers"
 
 config I2C_ACORN
diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index ff937ac69f5b..302c551977bb 100644
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -61,9 +61,6 @@ obj-$(CONFIG_I2C_PARPORT_LIGHT)	+= i2c-parport-light.o
 obj-$(CONFIG_I2C_TAOS_EVM)      += i2c-taos-evm.o
 obj-$(CONFIG_I2C_TINY_USB)      += i2c-tiny-usb.o
 
-# Graphics adapter I2C/DDC channel drivers
-obj-$(CONFIG_I2C_VOODOO3)       += i2c-voodoo3.o
-
 # Other I2C/SMBus bus drivers
 obj-$(CONFIG_I2C_ACORN)         += i2c-acorn.o
 obj-$(CONFIG_I2C_ELEKTOR)       += i2c-elektor.o
diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index d108450df064..8de7d7b87bb0 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -138,7 +138,7 @@ static unsigned short ali1535_smba;
    Note the differences between kernels with the old PCI BIOS interface and
    newer kernels with the real PCI interface. In compat.h some things are
    defined to make the transition easier. */
-static int ali1535_setup(struct pci_dev *dev)
+static int __devinit ali1535_setup(struct pci_dev *dev)
 {
         int retval = -ENODEV;
         unsigned char temp;
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index d627fceb790b..e7e3205f1286 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -131,7 +131,7 @@ MODULE_PARM_DESC(force_addr,
 static struct pci_driver ali15x3_driver;
 static unsigned short ali15x3_smba;
 
-static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
+static int __devinit ali15x3_setup(struct pci_dev *ALI15X3_dev)
 {
         u16 a;
         unsigned char temp;
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 55edcfe5b851..df6ab553f975 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -767,6 +767,9 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
         /* set up the sysfs linkage to our parent device */
         i801_adapter.dev.parent = &dev->dev;
 
+        /* Retry up to 3 times on lost arbitration */
+        i801_adapter.retries = 3;
+
         snprintf(i801_adapter.name, sizeof(i801_adapter.name),
                 "SMBus I801 adapter at %04lx", i801_smba);
         err = i2c_add_adapter(&i801_adapter);
diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c
index a75c75e77b92..5901707fc66a 100644
--- a/drivers/i2c/busses/i2c-iop3xx.c
+++ b/drivers/i2c/busses/i2c-iop3xx.c
@@ -56,12 +56,6 @@ iic_cook_addr(struct i2c_msg *msg)
         if (msg->flags & I2C_M_RD)
                 addr |= 1;
 
-        /*
-         * Read or Write?
-         */
-        if (msg->flags & I2C_M_REV_DIR_ADDR)
-                addr ^= 1;
-
         return addr;   
 }
 
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index bbab0e166630..ed387ffa4730 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -338,9 +338,6 @@ mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data,
         if (msg->flags & I2C_M_RD)
                 dir = 1;
 
-        if (msg->flags & I2C_M_REV_DIR_ADDR)
-                dir ^= 1;
-
         if (msg->flags & I2C_M_TEN) {
                 drv_data->addr1 = 0xf0 | (((u32)msg->addr & 0x300) >> 7) | dir;
                 drv_data->addr2 = (u32)msg->addr & 0xff;
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c
index 1fca59077949..fbab6846ae64 100644
--- a/drivers/i2c/busses/i2c-pnx.c
+++ b/drivers/i2c/busses/i2c-pnx.c
@@ -650,7 +650,7 @@ static int __devinit i2c_pnx_probe(struct platform_device *pdev)
         return 0;
 
 out_irq:
-        free_irq(alg_data->irq, alg_data);
+        free_irq(alg_data->irq, i2c_pnx->adapter);
 out_clock:
         i2c_pnx->set_clock_stop(pdev);
 out_unmap:
@@ -669,7 +669,7 @@ static int __devexit i2c_pnx_remove(struct platform_device *pdev)
         struct i2c_adapter *adap = i2c_pnx->adapter;
         struct i2c_pnx_algo_data *alg_data = adap->algo_data;
 
-        free_irq(alg_data->irq, alg_data);
+        free_irq(alg_data->irq, i2c_pnx->adapter);
         i2c_del_adapter(adap);
         i2c_pnx->set_clock_stop(pdev);
         iounmap((void *)alg_data->ioaddr);
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 3c9d71f60187..1c440a70ec61 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -49,48 +49,38 @@ static s32 i2c_powermac_smbus_xfer(	struct i2c_adapter*	adap,
         int                     rc = 0;
         int                     read = (read_write == I2C_SMBUS_READ);
         int                     addrdir = (addr << 1) | read;
+        int                     mode, subsize, len;
+        u32                     subaddr;
+        u8                      *buf;
         u8                      local[2];
 
-        rc = pmac_i2c_open(bus, 0);
-        if (rc)
-                return rc;
+        if (size == I2C_SMBUS_QUICK || size == I2C_SMBUS_BYTE) {
+                mode = pmac_i2c_mode_std;
+                subsize = 0;
+                subaddr = 0;
+        } else {
+                mode = read ? pmac_i2c_mode_combined : pmac_i2c_mode_stdsub;
+                subsize = 1;
+                subaddr = command;
+        }
 
         switch (size) {
         case I2C_SMBUS_QUICK:
-                rc = pmac_i2c_setmode(bus, pmac_i2c_mode_std);
-                if (rc)
-                        goto bail;
-                rc = pmac_i2c_xfer(bus, addrdir, 0, 0, NULL, 0);
+                buf = NULL;
+                len = 0;
                 break;
         case I2C_SMBUS_BYTE:
-                rc = pmac_i2c_setmode(bus, pmac_i2c_mode_std);
-                if (rc)
-                        goto bail;
-                rc = pmac_i2c_xfer(bus, addrdir, 0, 0, &data->byte, 1);
-                break;
         case I2C_SMBUS_BYTE_DATA:
-                rc = pmac_i2c_setmode(bus, read ?
-                                      pmac_i2c_mode_combined :
-                                      pmac_i2c_mode_stdsub);
-                if (rc)
-                        goto bail;
-                rc = pmac_i2c_xfer(bus, addrdir, 1, command, &data->byte, 1);
+                buf = &data->byte;
+                len = 1;
                 break;
         case I2C_SMBUS_WORD_DATA:
-                rc = pmac_i2c_setmode(bus, read ?
-                                      pmac_i2c_mode_combined :
-                                      pmac_i2c_mode_stdsub);
-                if (rc)
-                        goto bail;
                 if (!read) {
                         local[0] = data->word & 0xff;
                         local[1] = (data->word >> 8) & 0xff;
                 }
-                rc = pmac_i2c_xfer(bus, addrdir, 1, command, local, 2);
-                if (rc == 0 && read) {
-                        data->word = ((u16)local[1]) << 8;
-                        data->word |= local[0];
-                }
+                buf = local;
+                len = 2;
                 break;
 
         /* Note that these are broken vs. the expected smbus API where
@@ -105,28 +95,44 @@ static s32 i2c_powermac_smbus_xfer(	struct i2c_adapter*	adap,
          * a repeat start/addr phase (but not stop in between)
          */
         case I2C_SMBUS_BLOCK_DATA:
-                rc = pmac_i2c_setmode(bus, read ?
-                                      pmac_i2c_mode_combined :
-                                      pmac_i2c_mode_stdsub);
-                if (rc)
-                        goto bail;
-                rc = pmac_i2c_xfer(bus, addrdir, 1, command, data->block,
-                                   data->block[0] + 1);
-
+                buf = data->block;
+                len = data->block[0] + 1;
                 break;
         case I2C_SMBUS_I2C_BLOCK_DATA:
-                rc = pmac_i2c_setmode(bus, read ?
-                                      pmac_i2c_mode_combined :
-                                      pmac_i2c_mode_stdsub);
-                if (rc)
-                        goto bail;
-                rc = pmac_i2c_xfer(bus, addrdir, 1, command,
-                                   &data->block[1], data->block[0]);
+                buf = &data->block[1];
+                len = data->block[0];
                 break;
 
         default:
-                rc = -EINVAL;
+                return -EINVAL;
+        }
+
+        rc = pmac_i2c_open(bus, 0);
+        if (rc) {
+                dev_err(&adap->dev, "Failed to open I2C, err %d\n", rc);
+                return rc;
+        }
+
+        rc = pmac_i2c_setmode(bus, mode);
+        if (rc) {
+                dev_err(&adap->dev, "Failed to set I2C mode %d, err %d\n",
+                        mode, rc);
+                goto bail;
         }
+
+        rc = pmac_i2c_xfer(bus, addrdir, subsize, subaddr, buf, len);
+        if (rc) {
+                dev_err(&adap->dev,
+                        "I2C transfer at 0x%02x failed, size %d, err %d\n",
+                        addrdir >> 1, size, rc);
+                goto bail;
+        }
+
+        if (size == I2C_SMBUS_WORD_DATA && read) {
+                data->word = ((u16)local[1]) << 8;
+                data->word |= local[0];
+        }
+
  bail:
         pmac_i2c_close(bus);
         return rc;
@@ -146,20 +152,33 @@ static int i2c_powermac_master_xfer(	struct i2c_adapter *adap,
         int                     read;
         int                     addrdir;
 
+        if (num != 1) {
+                dev_err(&adap->dev,
+                        "Multi-message I2C transactions not supported\n");
+                return -EOPNOTSUPP;
+        }
+
         if (msgs->flags & I2C_M_TEN)
                 return -EINVAL;
         read = (msgs->flags & I2C_M_RD) != 0;
         addrdir = (msgs->addr << 1) | read;
-        if (msgs->flags & I2C_M_REV_DIR_ADDR)
-                addrdir ^= 1;
 
         rc = pmac_i2c_open(bus, 0);
-        if (rc)
+        if (rc) {
+                dev_err(&adap->dev, "Failed to open I2C, err %d\n", rc);
                 return rc;
+        }
         rc = pmac_i2c_setmode(bus, pmac_i2c_mode_std);
-        if (rc)
+        if (rc) {
+                dev_err(&adap->dev, "Failed to set I2C mode %d, err %d\n",
+                        pmac_i2c_mode_std, rc);
                 goto bail;
+        }
         rc = pmac_i2c_xfer(bus, addrdir, 0, 0, msgs->buf, msgs->len);
+        if (rc < 0)
+                dev_err(&adap->dev, "I2C %s 0x%02x failed, err %d\n",
+                        addrdir & 1 ? "read from" : "write to", addrdir >> 1,
+                        rc);
  bail:
         pmac_i2c_close(bus);
         return rc < 0 ? rc : 1;
@@ -183,19 +202,16 @@ static const struct i2c_algorithm i2c_powermac_algorithm = {
 static int __devexit i2c_powermac_remove(struct platform_device *dev)
 {
         struct i2c_adapter      *adapter = platform_get_drvdata(dev);
-        struct pmac_i2c_bus     *bus = i2c_get_adapdata(adapter);
         int                     rc;
 
         rc = i2c_del_adapter(adapter);
-        pmac_i2c_detach_adapter(bus, adapter);
-        i2c_set_adapdata(adapter, NULL);
         /* We aren't that prepared to deal with this... */
         if (rc)
                 printk(KERN_WARNING
                        "i2c-powermac.c: Failed to remove bus %s !\n",
                        adapter->name);
         platform_set_drvdata(dev, NULL);
-        kfree(adapter);
+        memset(adapter, 0, sizeof(*adapter));
 
         return 0;
 }
@@ -206,12 +222,12 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)
         struct pmac_i2c_bus *bus = dev->dev.platform_data;
         struct device_node *parent = NULL;
         struct i2c_adapter *adapter;
-        char name[32];
         const char *basename;
         int rc;
 
         if (bus == NULL)
                 return -EINVAL;
+        adapter = pmac_i2c_get_adapter(bus);
 
         /* Ok, now we need to make up a name for the interface that will
          * match what we used to do in the past, that is basically the
@@ -237,29 +253,22 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)
         default:
                 return -EINVAL;
         }
-        snprintf(name, 32, "%s %d", basename, pmac_i2c_get_channel(bus));
+        snprintf(adapter->name, sizeof(adapter->name), "%s %d", basename,
+                 pmac_i2c_get_channel(bus));
         of_node_put(parent);
 
-        adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
-        if (adapter == NULL) {
-                printk(KERN_ERR "i2c-powermac: can't allocate inteface !\n");
-                return -ENOMEM;
-        }
         platform_set_drvdata(dev, adapter);
-        strcpy(adapter->name, name);
         adapter->algo = &i2c_powermac_algorithm;
         i2c_set_adapdata(adapter, bus);
         adapter->dev.parent = &dev->dev;
-        pmac_i2c_attach_adapter(bus, adapter);
         rc = i2c_add_adapter(adapter);
         if (rc) {
                 printk(KERN_ERR "i2c-powermac: Adapter %s registration "
-                       "failed\n", name);
-                i2c_set_adapdata(adapter, NULL);
-                pmac_i2c_detach_adapter(bus, adapter);
+                       "failed\n", adapter->name);
+                memset(adapter, 0, sizeof(*adapter));
         }
 
-        printk(KERN_INFO "PowerMac i2c bus %s registered\n", name);
+        printk(KERN_INFO "PowerMac i2c bus %s registered\n", adapter->name);
 
         if (!strncmp(basename, "uni-n", 5)) {
                 struct device_node *np;
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 139f0c7f12a4..844569f7d8b7 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -142,7 +142,7 @@ static void sis5595_write(u8 reg, u8 data)
         outb(data, sis5595_base + SMB_DAT);
 }
 
-static int sis5595_setup(struct pci_dev *SIS5595_dev)
+static int __devinit sis5595_setup(struct pci_dev *SIS5595_dev)
 {
         u16 a;
         u8 val;
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 70ca41e90e58..68cff7af7013 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -389,7 +389,7 @@ static u32 sis630_func(struct i2c_adapter *adapter)
                 I2C_FUNC_SMBUS_BLOCK_DATA;
 }
 
-static int sis630_setup(struct pci_dev *sis630_dev)
+static int __devinit sis630_setup(struct pci_dev *sis630_dev)
 {
         unsigned char b;
         struct pci_dev *dummy = NULL;
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c
index 1b7b2af94036..0c770eabe85e 100644
--- a/drivers/i2c/busses/i2c-stub.c
+++ b/drivers/i2c/busses/i2c-stub.c
@@ -35,6 +35,10 @@ module_param_array(chip_addr, ushort, NULL, S_IRUGO);
 MODULE_PARM_DESC(chip_addr,
                  "Chip addresses (up to 10, between 0x03 and 0x77)");
 
+static unsigned long functionality = ~0UL;
+module_param(functionality, ulong, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(functionality, "Override functionality bitfield");
+
 struct stub_chip {
         u8 pointer;
         u16 words[256];         /* Byte operations use the LSB as per SMBus
@@ -48,7 +52,7 @@ static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags,
         char read_write, u8 command, int size, union i2c_smbus_data * data)
 {
         s32 ret;
-        int i;
+        int i, len;
         struct stub_chip *chip = NULL;
 
         /* Search for the right chip */
@@ -118,6 +122,29 @@ static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags,
                 ret = 0;
                 break;
 
+        case I2C_SMBUS_I2C_BLOCK_DATA:
+                len = data->block[0];
+                if (read_write == I2C_SMBUS_WRITE) {
+                        for (i = 0; i < len; i++) {
+                                chip->words[command + i] &= 0xff00;
+                                chip->words[command + i] |= data->block[1 + i];
+                        }
+                        dev_dbg(&adap->dev, "i2c block data - addr 0x%02x, "
+                                        "wrote %d bytes at 0x%02x.\n",
+                                        addr, len, command);
+                } else {
+                        for (i = 0; i < len; i++) {
+                                data->block[1 + i] =
+                                        chip->words[command + i] & 0xff;
+                        }
+                        dev_dbg(&adap->dev, "i2c block data - addr 0x%02x, "
+                                        "read  %d bytes at 0x%02x.\n",
+                                        addr, len, command);
+                }
+
+                ret = 0;
+                break;
+
         default:
                 dev_dbg(&adap->dev, "Unsupported I2C/SMBus command\n");
                 ret = -EOPNOTSUPP;
@@ -129,8 +156,9 @@ static s32 stub_xfer(struct i2c_adapter * adap, u16 addr, unsigned short flags,
 
 static u32 stub_func(struct i2c_adapter *adapter)
 {
-        return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
-                I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA;
+        return (I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
+                I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
+                I2C_FUNC_SMBUS_I2C_BLOCK) & functionality;
 }
 
 static const struct i2c_algorithm smbus_algorithm = {
diff --git a/drivers/i2c/busses/i2c-voodoo3.c b/drivers/i2c/busses/i2c-voodoo3.c
deleted file mode 100644
index 7663d57833a0..000000000000
--- a/drivers/i2c/busses/i2c-voodoo3.c
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
-    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>,
-    Philip Edelbrock <phil@netroedge.com>,
-    Ralph Metzler <rjkm@thp.uni-koeln.de>, and
-    Mark D. Studebaker <mdsxyz123@yahoo.com>
-    
-    Based on code written by Ralph Metzler <rjkm@thp.uni-koeln.de> and
-    Simon Vogl
-
-    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.
-*/
-
-/* This interfaces to the I2C bus of the Voodoo3 to gain access to
-    the BT869 and possibly other I2C devices. */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/i2c.h>
-#include <linux/i2c-algo-bit.h>
-#include <asm/io.h>
-
-/* the only registers we use */
-#define REG             0x78
-#define REG2            0x70
-
-/* bit locations in the register */
-#define DDC_ENAB        0x00040000
-#define DDC_SCL_OUT     0x00080000
-#define DDC_SDA_OUT     0x00100000
-#define DDC_SCL_IN      0x00200000
-#define DDC_SDA_IN      0x00400000
-#define I2C_ENAB        0x00800000
-#define I2C_SCL_OUT     0x01000000
-#define I2C_SDA_OUT     0x02000000
-#define I2C_SCL_IN      0x04000000
-#define I2C_SDA_IN      0x08000000
-
-/* initialization states */
-#define INIT2           0x2
-#define INIT3           0x4
-
-/* delays */
-#define CYCLE_DELAY     10
-#define TIMEOUT         (HZ / 2)
-
-
-static void __iomem *ioaddr;
-
-/* The voo GPIO registers don't have individual masks for each bit
-   so we always have to read before writing. */
-
-static void bit_vooi2c_setscl(void *data, int val)
-{
-        unsigned int r;
-        r = readl(ioaddr + REG);
-        if (val)
-                r |= I2C_SCL_OUT;
-        else
-                r &= ~I2C_SCL_OUT;
-        writel(r, ioaddr + REG);
-        readl(ioaddr + REG);    /* flush posted write */
-}
-
-static void bit_vooi2c_setsda(void *data, int val)
-{
-        unsigned int r;
-        r = readl(ioaddr + REG);
-        if (val)
-                r |= I2C_SDA_OUT;
-        else
-                r &= ~I2C_SDA_OUT;
-        writel(r, ioaddr + REG);
-        readl(ioaddr + REG);    /* flush posted write */
-}
-
-/* The GPIO pins are open drain, so the pins always remain outputs.
-   We rely on the i2c-algo-bit routines to set the pins high before
-   reading the input from other chips. */
-
-static int bit_vooi2c_getscl(void *data)
-{
-        return (0 != (readl(ioaddr + REG) & I2C_SCL_IN));
-}
-
-static int bit_vooi2c_getsda(void *data)
-{
-        return (0 != (readl(ioaddr + REG) & I2C_SDA_IN));
-}
-
-static void bit_vooddc_setscl(void *data, int val)
-{
-        unsigned int r;
-        r = readl(ioaddr + REG);
-        if (val)
-                r |= DDC_SCL_OUT;
-        else
-                r &= ~DDC_SCL_OUT;
-        writel(r, ioaddr + REG);
-        readl(ioaddr + REG);    /* flush posted write */
-}
-
-static void bit_vooddc_setsda(void *data, int val)
-{
-        unsigned int r;
-        r = readl(ioaddr + REG);
-        if (val)
-                r |= DDC_SDA_OUT;
-        else
-                r &= ~DDC_SDA_OUT;
-        writel(r, ioaddr + REG);
-        readl(ioaddr + REG);    /* flush posted write */
-}
-
-static int bit_vooddc_getscl(void *data)
-{
-        return (0 != (readl(ioaddr + REG) & DDC_SCL_IN));
-}
-
-static int bit_vooddc_getsda(void *data)
-{
-        return (0 != (readl(ioaddr + REG) & DDC_SDA_IN));
-}
-
-static int config_v3(struct pci_dev *dev)
-{
-        unsigned long cadr;
-
-        /* map Voodoo3 memory */
-        cadr = dev->resource[0].start;
-        cadr &= PCI_BASE_ADDRESS_MEM_MASK;
-        ioaddr = ioremap_nocache(cadr, 0x1000);
-        if (ioaddr) {
-                writel(0x8160, ioaddr + REG2);
-                writel(0xcffc0020, ioaddr + REG);
-                dev_info(&dev->dev, "Using Banshee/Voodoo3 I2C device at %p\n", ioaddr);
-                return 0;
-        }
-        return -ENODEV;
-}
-
-static struct i2c_algo_bit_data voo_i2c_bit_data = {
-        .setsda         = bit_vooi2c_setsda,
-        .setscl         = bit_vooi2c_setscl,
-        .getsda         = bit_vooi2c_getsda,
-        .getscl         = bit_vooi2c_getscl,
-        .udelay         = CYCLE_DELAY,
-        .timeout        = TIMEOUT
-};
-
-static struct i2c_adapter voodoo3_i2c_adapter = {
-        .owner          = THIS_MODULE,
-        .name           = "I2C Voodoo3/Banshee adapter",
-        .algo_data      = &voo_i2c_bit_data,
-};
-
-static struct i2c_algo_bit_data voo_ddc_bit_data = {
-        .setsda         = bit_vooddc_setsda,
-        .setscl         = bit_vooddc_setscl,
-        .getsda         = bit_vooddc_getsda,
-        .getscl         = bit_vooddc_getscl,
-        .udelay         = CYCLE_DELAY,
-        .timeout        = TIMEOUT
-};
-
-static struct i2c_adapter voodoo3_ddc_adapter = {
-        .owner          = THIS_MODULE,
-        .class          = I2C_CLASS_DDC, 
-        .name           = "DDC Voodoo3/Banshee adapter",
-        .algo_data      = &voo_ddc_bit_data,
-};
-
-static struct pci_device_id voodoo3_ids[] __devinitdata = {
-        { PCI_DEVICE(PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_VOODOO3) },
-        { PCI_DEVICE(PCI_VENDOR_ID_3DFX, PCI_DEVICE_ID_3DFX_BANSHEE) },
-        { 0, }
-};
-
-MODULE_DEVICE_TABLE (pci, voodoo3_ids);
-
-static int __devinit voodoo3_probe(struct pci_dev *dev, const struct pci_device_id *id)
-{
-        int retval;
-
-        retval = config_v3(dev);
-        if (retval)
-                return retval;
-
-        /* set up the sysfs linkage to our parent device */
-        voodoo3_i2c_adapter.dev.parent = &dev->dev;
-        voodoo3_ddc_adapter.dev.parent = &dev->dev;
-
-        retval = i2c_bit_add_bus(&voodoo3_i2c_adapter);
-        if (retval)
-                return retval;
-        retval = i2c_bit_add_bus(&voodoo3_ddc_adapter);
-        if (retval)
-                i2c_del_adapter(&voodoo3_i2c_adapter);
-        return retval;
-}
-
-static void __devexit voodoo3_remove(struct pci_dev *dev)
-{
-        i2c_del_adapter(&voodoo3_i2c_adapter);
-        i2c_del_adapter(&voodoo3_ddc_adapter);
-        iounmap(ioaddr);
-}
-
-static struct pci_driver voodoo3_driver = {
-        .name           = "voodoo3_smbus",
-        .id_table       = voodoo3_ids,
-        .probe          = voodoo3_probe,
-        .remove         = __devexit_p(voodoo3_remove),
-};
-
-static int __init i2c_voodoo3_init(void)
-{
-        return pci_register_driver(&voodoo3_driver);
-}
-
-static void __exit i2c_voodoo3_exit(void)
-{
-        pci_unregister_driver(&voodoo3_driver);
-}
-
-
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
-                "Philip Edelbrock <phil@netroedge.com>, "
-                "Ralph Metzler <rjkm@thp.uni-koeln.de>, "
-                "and Mark D. Studebaker <mdsxyz123@yahoo.com>");
-MODULE_DESCRIPTION("Voodoo3 I2C/SMBus driver");
-MODULE_LICENSE("GPL");
-
-module_init(i2c_voodoo3_init);
-module_exit(i2c_voodoo3_exit);
diff --git a/drivers/i2c/chips/Kconfig b/drivers/i2c/chips/Kconfig
index f9618f4d4e47..ae4539d99bef 100644
--- a/drivers/i2c/chips/Kconfig
+++ b/drivers/i2c/chips/Kconfig
@@ -6,16 +6,6 @@
 
 menu "Miscellaneous I2C Chip support"
 
-config DS1682
-        tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
-        depends on EXPERIMENTAL
-        help
-          If you say yes here you get support for Dallas Semiconductor
-          DS1682 Total Elapsed Time Recorder.
-
-          This driver can also be built as a module.  If so, the module
-          will be called ds1682.
-
 config SENSORS_TSL2550
         tristate "Taos TSL2550 ambient light sensor"
         depends on EXPERIMENTAL
diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index 749cf3606294..fe0af0f81f2d 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -10,7 +10,6 @@
 # * I/O expander drivers go to drivers/gpio
 #
 
-obj-$(CONFIG_DS1682)            += ds1682.o
 obj-$(CONFIG_SENSORS_TSL2550)   += tsl2550.o
 
 ifeq ($(CONFIG_I2C_DEBUG_CHIP),y)
diff --git a/drivers/i2c/chips/ds1682.c b/drivers/i2c/chips/ds1682.c
deleted file mode 100644
index f3ee4a1abb77..000000000000
--- a/drivers/i2c/chips/ds1682.c
+++ /dev/null
@@ -1,267 +0,0 @@
-/*
- * Dallas Semiconductor DS1682 Elapsed Time Recorder device driver
- *
- * Written by: Grant Likely <grant.likely@secretlab.ca>
- *
- * Copyright (C) 2007 Secret Lab Technologies Ltd.
- *
- * 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.
- */
-
-/*
- * The DS1682 elapsed timer recorder is a simple device that implements
- * one elapsed time counter, one event counter, an alarm signal and 10
- * bytes of general purpose EEPROM.
- *
- * This driver provides access to the DS1682 counters and user data via
- * the sysfs.  The following attributes are added to the device node:
- *     elapsed_time (u32): Total elapsed event time in ms resolution
- *     alarm_time (u32): When elapsed time exceeds the value in alarm_time,
- *                       then the alarm pin is asserted.
- *     event_count (u16): number of times the event pin has gone low.
- *     eeprom (u8[10]): general purpose EEPROM
- *
- * Counter registers and user data are both read/write unless the device
- * has been write protected.  This driver does not support turning off write
- * protection.  Once write protection is turned on, it is impossible to
- * turn it off again, so I have left the feature out of this driver to avoid
- * accidental enabling, but it is trivial to add write protect support.
- *
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/string.h>
-#include <linux/list.h>
-#include <linux/sysfs.h>
-#include <linux/ctype.h>
-#include <linux/hwmon-sysfs.h>
-
-/* Device registers */
-#define DS1682_REG_CONFIG               0x00
-#define DS1682_REG_ALARM                0x01
-#define DS1682_REG_ELAPSED              0x05
-#define DS1682_REG_EVT_CNTR             0x09
-#define DS1682_REG_EEPROM               0x0b
-#define DS1682_REG_RESET                0x1d
-#define DS1682_REG_WRITE_DISABLE        0x1e
-#define DS1682_REG_WRITE_MEM_DISABLE    0x1f
-
-#define DS1682_EEPROM_SIZE              10
-
-/*
- * Generic counter attributes
- */
-static ssize_t ds1682_show(struct device *dev, struct device_attribute *attr,
-                           char *buf)
-{
-        struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-        struct i2c_client *client = to_i2c_client(dev);
-        __le32 val = 0;
-        int rc;
-
-        dev_dbg(dev, "ds1682_show() called on %s\n", attr->attr.name);
-
-        /* Read the register */
-        rc = i2c_smbus_read_i2c_block_data(client, sattr->index, sattr->nr,
-                                           (u8 *) & val);
-        if (rc < 0)
-                return -EIO;
-
-        /* Special case: the 32 bit regs are time values with 1/4s
-         * resolution, scale them up to milliseconds */
-        if (sattr->nr == 4)
-                return sprintf(buf, "%llu\n",
-                        ((unsigned long long)le32_to_cpu(val)) * 250);
-
-        /* Format the output string and return # of bytes */
-        return sprintf(buf, "%li\n", (long)le32_to_cpu(val));
-}
-
-static ssize_t ds1682_store(struct device *dev, struct device_attribute *attr,
-                            const char *buf, size_t count)
-{
-        struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr);
-        struct i2c_client *client = to_i2c_client(dev);
-        char *endp;
-        u64 val;
-        __le32 val_le;
-        int rc;
-
-        dev_dbg(dev, "ds1682_store() called on %s\n", attr->attr.name);
-
-        /* Decode input */
-        val = simple_strtoull(buf, &endp, 0);
-        if (buf == endp) {
-                dev_dbg(dev, "input string not a number\n");
-                return -EINVAL;
-        }
-
-        /* Special case: the 32 bit regs are time values with 1/4s
-         * resolution, scale input down to quarter-seconds */
-        if (sattr->nr == 4)
-                do_div(val, 250);
-
-        /* write out the value */
-        val_le = cpu_to_le32(val);
-        rc = i2c_smbus_write_i2c_block_data(client, sattr->index, sattr->nr,
-                                            (u8 *) & val_le);
-        if (rc < 0) {
-                dev_err(dev, "register write failed; reg=0x%x, size=%i\n",
-                        sattr->index, sattr->nr);
-                return -EIO;
-        }
-
-        return count;
-}
-
-/*
- * Simple register attributes
- */
-static SENSOR_DEVICE_ATTR_2(elapsed_time, S_IRUGO | S_IWUSR, ds1682_show,
-                            ds1682_store, 4, DS1682_REG_ELAPSED);
-static SENSOR_DEVICE_ATTR_2(alarm_time, S_IRUGO | S_IWUSR, ds1682_show,
-                            ds1682_store, 4, DS1682_REG_ALARM);
-static SENSOR_DEVICE_ATTR_2(event_count, S_IRUGO | S_IWUSR, ds1682_show,
-                            ds1682_store, 2, DS1682_REG_EVT_CNTR);
-
-static const struct attribute_group ds1682_group = {
-        .attrs = (struct attribute *[]) {
-                &sensor_dev_attr_elapsed_time.dev_attr.attr,
-                &sensor_dev_attr_alarm_time.dev_attr.attr,
-                &sensor_dev_attr_event_count.dev_attr.attr,
-                NULL,
-        },
-};
-
-/*
- * User data attribute
- */
-static ssize_t ds1682_eeprom_read(struct kobject *kobj, struct bin_attribute *attr,
-                                  char *buf, loff_t off, size_t count)
-{
-        struct i2c_client *client = kobj_to_i2c_client(kobj);
-        int rc;
-
-        dev_dbg(&client->dev, "ds1682_eeprom_read(p=%p, off=%lli, c=%zi)\n",
-                buf, off, count);
-
-        if (off >= DS1682_EEPROM_SIZE)
-                return 0;
-
-        if (off + count > DS1682_EEPROM_SIZE)
-                count = DS1682_EEPROM_SIZE - off;
-
-        rc = i2c_smbus_read_i2c_block_data(client, DS1682_REG_EEPROM + off,
-                                           count, buf);
-        if (rc < 0)
-                return -EIO;
-
-        return count;
-}
-
-static ssize_t ds1682_eeprom_write(struct kobject *kobj, struct bin_attribute *attr,
-                                   char *buf, loff_t off, size_t count)
-{
-        struct i2c_client *client = kobj_to_i2c_client(kobj);
-
-        dev_dbg(&client->dev, "ds1682_eeprom_write(p=%p, off=%lli, c=%zi)\n",
-                buf, off, count);
-
-        if (off >= DS1682_EEPROM_SIZE)
-                return -ENOSPC;
-
-        if (off + count > DS1682_EEPROM_SIZE)
-                count = DS1682_EEPROM_SIZE - off;
-
-        /* Write out to the device */
-        if (i2c_smbus_write_i2c_block_data(client, DS1682_REG_EEPROM + off,
-                                           count, buf) < 0)
-                return -EIO;
-
-        return count;
-}
-
-static struct bin_attribute ds1682_eeprom_attr = {
-        .attr = {
-                .name = "eeprom",
-                .mode = S_IRUGO | S_IWUSR,
-        },
-        .size = DS1682_EEPROM_SIZE,
-        .read = ds1682_eeprom_read,
-        .write = ds1682_eeprom_write,
-};
-
-/*
- * Called when a ds1682 device is matched with this driver
- */
-static int ds1682_probe(struct i2c_client *client,
-                        const struct i2c_device_id *id)
-{
-        int rc;
-
-        if (!i2c_check_functionality(client->adapter,
-                                     I2C_FUNC_SMBUS_I2C_BLOCK)) {
-                dev_err(&client->dev, "i2c bus does not support the ds1682\n");
-                rc = -ENODEV;
-                goto exit;
-        }
-
-        rc = sysfs_create_group(&client->dev.kobj, &ds1682_group);
-        if (rc)
-                goto exit;
-
-        rc = sysfs_create_bin_file(&client->dev.kobj, &ds1682_eeprom_attr);
-        if (rc)
-                goto exit_bin_attr;
-
-        return 0;
-
- exit_bin_attr:
-        sysfs_remove_group(&client->dev.kobj, &ds1682_group);
- exit:
-        return rc;
-}
-
-static int ds1682_remove(struct i2c_client *client)
-{
-        sysfs_remove_bin_file(&client->dev.kobj, &ds1682_eeprom_attr);
-        sysfs_remove_group(&client->dev.kobj, &ds1682_group);
-        return 0;
-}
-
-static const struct i2c_device_id ds1682_id[] = {
-        { "ds1682", 0 },
-        { }
-};
-MODULE_DEVICE_TABLE(i2c, ds1682_id);
-
-static struct i2c_driver ds1682_driver = {
-        .driver = {
-                .name = "ds1682",
-        },
-        .probe = ds1682_probe,
-        .remove = ds1682_remove,
-        .id_table = ds1682_id,
-};
-
-static int __init ds1682_init(void)
-{
-        return i2c_add_driver(&ds1682_driver);
-}
-
-static void __exit ds1682_exit(void)
-{
-        i2c_del_driver(&ds1682_driver);
-}
-
-MODULE_AUTHOR("Grant Likely <grant.likely@secretlab.ca>");
-MODULE_DESCRIPTION("DS1682 Elapsed Time Indicator driver");
-MODULE_LICENSE("GPL");
-
-module_init(ds1682_init);
-module_exit(ds1682_exit);
diff --git a/drivers/i2c/chips/tsl2550.c b/drivers/i2c/chips/tsl2550.c
index aa96bd2d27ea..a0702f36a72f 100644
--- a/drivers/i2c/chips/tsl2550.c
+++ b/drivers/i2c/chips/tsl2550.c
@@ -257,6 +257,7 @@ static DEVICE_ATTR(operating_mode, S_IWUSR | S_IRUGO,
 
 static ssize_t __tsl2550_show_lux(struct i2c_client *client, char *buf)
 {
+        struct tsl2550_data *data = i2c_get_clientdata(client);
         u8 ch0, ch1;
         int ret;
 
@@ -274,6 +275,8 @@ static ssize_t __tsl2550_show_lux(struct i2c_client *client, char *buf)
         ret = tsl2550_calculate_lux(ch0, ch1);
         if (ret < 0)
                 return ret;
+        if (data->operating_mode == 1)
+                ret *= 5;
 
         return sprintf(buf, "%d\n", ret);
 }
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 8d80fceca6a4..4f34823e86b1 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -558,11 +558,9 @@ static void i2c_scan_static_board_info(struct i2c_adapter *adapter)
         up_read(&__i2c_board_lock);
 }
 
-static int i2c_do_add_adapter(struct device_driver *d, void *data)
+static int i2c_do_add_adapter(struct i2c_driver *driver,
+                              struct i2c_adapter *adap)
 {
-        struct i2c_driver *driver = to_i2c_driver(d);
-        struct i2c_adapter *adap = data;
-
         /* Detect supported devices on that bus, and instantiate them */
         i2c_detect(adap, driver);
 
@@ -574,6 +572,11 @@ static int i2c_do_add_adapter(struct device_driver *d, void *data)
         return 0;
 }
 
+static int __process_new_adapter(struct device_driver *d, void *data)
+{
+        return i2c_do_add_adapter(to_i2c_driver(d), data);
+}
+
 static int i2c_register_adapter(struct i2c_adapter *adap)
 {
         int res = 0, dummy;
@@ -584,7 +587,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
                 goto out_list;
         }
 
-        mutex_init(&adap->bus_lock);
+        rt_mutex_init(&adap->bus_lock);
 
         /* Set default timeout to 1 second if not already set */
         if (adap->timeout == 0)
@@ -614,7 +617,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
         /* Notify drivers */
         mutex_lock(&core_lock);
         dummy = bus_for_each_drv(&i2c_bus_type, NULL, adap,
-                                 i2c_do_add_adapter);
+                                 __process_new_adapter);
         mutex_unlock(&core_lock);
 
         return 0;
@@ -715,10 +718,9 @@ retry:
 }
 EXPORT_SYMBOL_GPL(i2c_add_numbered_adapter);
 
-static int i2c_do_del_adapter(struct device_driver *d, void *data)
+static int i2c_do_del_adapter(struct i2c_driver *driver,
+                              struct i2c_adapter *adapter)
 {
-        struct i2c_driver *driver = to_i2c_driver(d);
-        struct i2c_adapter *adapter = data;
         struct i2c_client *client, *_n;
         int res;
 
@@ -750,6 +752,11 @@ static int __unregister_client(struct device *dev, void *dummy)
         return 0;
 }
 
+static int __process_removed_adapter(struct device_driver *d, void *data)
+{
+        return i2c_do_del_adapter(to_i2c_driver(d), data);
+}
+
 /**
  * i2c_del_adapter - unregister I2C adapter
  * @adap: the adapter being unregistered
@@ -762,6 +769,7 @@ int i2c_del_adapter(struct i2c_adapter *adap)
 {
         int res = 0;
         struct i2c_adapter *found;
+        struct i2c_client *client, *next;
 
         /* First make sure that this adapter was ever added */
         mutex_lock(&core_lock);
@@ -776,11 +784,21 @@ int i2c_del_adapter(struct i2c_adapter *adap)
         /* Tell drivers about this removal */
         mutex_lock(&core_lock);
         res = bus_for_each_drv(&i2c_bus_type, NULL, adap,
-                               i2c_do_del_adapter);
+                               __process_removed_adapter);
         mutex_unlock(&core_lock);
         if (res)
                 return res;
 
+        /* Remove devices instantiated from sysfs */
+        list_for_each_entry_safe(client, next, &userspace_devices, detected) {
+                if (client->adapter == adap) {
+                        dev_dbg(&adap->dev, "Removing %s at 0x%x\n",
+                                client->name, client->addr);
+                        list_del(&client->detected);
+                        i2c_unregister_device(client);
+                }
+        }
+
         /* Detach any active clients. This can't fail, thus we do not
            checking the returned value. */
         res = device_for_each_child(&adap->dev, NULL, __unregister_client);
@@ -815,22 +833,11 @@ EXPORT_SYMBOL(i2c_del_adapter);
 
 /* ------------------------------------------------------------------------- */
 
-static int __attach_adapter(struct device *dev, void *data)
+static int __process_new_driver(struct device *dev, void *data)
 {
-        struct i2c_adapter *adapter;
-        struct i2c_driver *driver = data;
-
         if (dev->type != &i2c_adapter_type)
                 return 0;
-        adapter = to_i2c_adapter(dev);
-
-        i2c_detect(adapter, driver);
-
-        /* Legacy drivers scan i2c busses directly */
-        if (driver->attach_adapter)
-                driver->attach_adapter(adapter);
-
-        return 0;
+        return i2c_do_add_adapter(data, to_i2c_adapter(dev));
 }
 
 /*
@@ -862,40 +869,18 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
         INIT_LIST_HEAD(&driver->clients);
         /* Walk the adapters that are already present */
         mutex_lock(&core_lock);
-        bus_for_each_dev(&i2c_bus_type, NULL, driver, __attach_adapter);
+        bus_for_each_dev(&i2c_bus_type, NULL, driver, __process_new_driver);
         mutex_unlock(&core_lock);
 
         return 0;
 }
 EXPORT_SYMBOL(i2c_register_driver);
 
-static int __detach_adapter(struct device *dev, void *data)
+static int __process_removed_driver(struct device *dev, void *data)
 {
-        struct i2c_adapter *adapter;
-        struct i2c_driver *driver = data;
-        struct i2c_client *client, *_n;
-
         if (dev->type != &i2c_adapter_type)
                 return 0;
-        adapter = to_i2c_adapter(dev);
-
-        /* Remove the devices we created ourselves as the result of hardware
-         * probing (using a driver's detect method) */
-        list_for_each_entry_safe(client, _n, &driver->clients, detected) {
-                dev_dbg(&adapter->dev, "Removing %s at 0x%x\n",
-                        client->name, client->addr);
-                list_del(&client->detected);
-                i2c_unregister_device(client);
-        }
-
-        if (driver->detach_adapter) {
-                if (driver->detach_adapter(adapter))
-                        dev_err(&adapter->dev,
-                                "detach_adapter failed for driver [%s]\n",
-                                driver->driver.name);
-        }
-
-        return 0;
+        return i2c_do_del_adapter(data, to_i2c_adapter(dev));
 }
 
 /**
@@ -906,7 +891,7 @@ static int __detach_adapter(struct device *dev, void *data)
 void i2c_del_driver(struct i2c_driver *driver)
 {
         mutex_lock(&core_lock);
-        bus_for_each_dev(&i2c_bus_type, NULL, driver, __detach_adapter);
+        bus_for_each_dev(&i2c_bus_type, NULL, driver, __process_removed_driver);
         mutex_unlock(&core_lock);
 
         driver_unregister(&driver->driver);
@@ -1081,12 +1066,12 @@ int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 #endif
 
                 if (in_atomic() || irqs_disabled()) {
-                        ret = mutex_trylock(&adap->bus_lock);
+                        ret = rt_mutex_trylock(&adap->bus_lock);
                         if (!ret)
                                 /* I2C activity is ongoing. */
                                 return -EAGAIN;
                 } else {
-                        mutex_lock_nested(&adap->bus_lock, adap->level);
+                        rt_mutex_lock(&adap->bus_lock);
                 }
 
                 /* Retry automatically on arbitration loss */
@@ -1098,7 +1083,7 @@ int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
                         if (time_after(jiffies, orig_jiffies + adap->timeout))
                                 break;
                 }
-                mutex_unlock(&adap->bus_lock);
+                rt_mutex_unlock(&adap->bus_lock);
 
                 return ret;
         } else {
@@ -1169,7 +1154,7 @@ EXPORT_SYMBOL(i2c_master_recv);
  * ----------------------------------------------------
  */
 
-static int i2c_detect_address(struct i2c_client *temp_client, int kind,
+static int i2c_detect_address(struct i2c_client *temp_client,
                               struct i2c_driver *driver)
 {
         struct i2c_board_info info;
@@ -1188,22 +1173,18 @@ static int i2c_detect_address(struct i2c_client *temp_client, int kind,
         if (i2c_check_addr(adapter, addr))
                 return 0;
 
-        /* Make sure there is something at this address, unless forced */
-        if (kind < 0) {
-                if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-                                   I2C_SMBUS_QUICK, NULL) < 0)
-                        return 0;
+        /* Make sure there is something at this address */
+        if (i2c_smbus_xfer(adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL) < 0)
+                return 0;
 
-                /* prevent 24RF08 corruption */
-                if ((addr & ~0x0f) == 0x50)
-                        i2c_smbus_xfer(adapter, addr, 0, 0, 0,
-                                       I2C_SMBUS_QUICK, NULL);
-        }
+        /* Prevent 24RF08 corruption */
+        if ((addr & ~0x0f) == 0x50)
+                i2c_smbus_xfer(adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL);
 
         /* Finally call the custom detection function */
         memset(&info, 0, sizeof(struct i2c_board_info));
         info.addr = addr;
-        err = driver->detect(temp_client, kind, &info);
+        err = driver->detect(temp_client, -1, &info);
         if (err) {
                 /* -ENODEV is returned if the detection fails. We catch it
                    here as this isn't an error. */
@@ -1248,40 +1229,13 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
                 return -ENOMEM;
         temp_client->adapter = adapter;
 
-        /* Force entries are done first, and are not affected by ignore
-           entries */
-        if (address_data->forces) {
-                const unsigned short * const *forces = address_data->forces;
-                int kind;
-
-                for (kind = 0; forces[kind]; kind++) {
-                        for (i = 0; forces[kind][i] != I2C_CLIENT_END;
-                             i += 2) {
-                                if (forces[kind][i] == adap_id
-                                 || forces[kind][i] == ANY_I2C_BUS) {
-                                        dev_dbg(&adapter->dev, "found force "
-                                                "parameter for adapter %d, "
-                                                "addr 0x%02x, kind %d\n",
-                                                adap_id, forces[kind][i + 1],
-                                                kind);
-                                        temp_client->addr = forces[kind][i + 1];
-                                        err = i2c_detect_address(temp_client,
-                                                kind, driver);
-                                        if (err)
-                                                goto exit_free;
-                                }
-                        }
-                }
-        }
-
         /* Stop here if the classes do not match */
         if (!(adapter->class & driver->class))
                 goto exit_free;
 
         /* Stop here if we can't use SMBUS_QUICK */
         if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_QUICK)) {
-                if (address_data->probe[0] == I2C_CLIENT_END
-                 && address_data->normal_i2c[0] == I2C_CLIENT_END)
+                if (address_data->normal_i2c[0] == I2C_CLIENT_END)
                         goto exit_free;
 
                 dev_warn(&adapter->dev, "SMBus Quick command not supported, "
@@ -1290,48 +1244,12 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver)
                 goto exit_free;
         }
 
-        /* Probe entries are done second, and are not affected by ignore
-           entries either */
-        for (i = 0; address_data->probe[i] != I2C_CLIENT_END; i += 2) {
-                if (address_data->probe[i] == adap_id
-                 || address_data->probe[i] == ANY_I2C_BUS) {
-                        dev_dbg(&adapter->dev, "found probe parameter for "
-                                "adapter %d, addr 0x%02x\n", adap_id,
-                                address_data->probe[i + 1]);
-                        temp_client->addr = address_data->probe[i + 1];
-                        err = i2c_detect_address(temp_client, -1, driver);
-                        if (err)
-                                goto exit_free;
-                }
-        }
-
-        /* Normal entries are done last, unless shadowed by an ignore entry */
         for (i = 0; address_data->normal_i2c[i] != I2C_CLIENT_END; i += 1) {
-                int j, ignore;
-
-                ignore = 0;
-                for (j = 0; address_data->ignore[j] != I2C_CLIENT_END;
-                     j += 2) {
-                        if ((address_data->ignore[j] == adap_id ||
-                             address_data->ignore[j] == ANY_I2C_BUS)
-                         && address_data->ignore[j + 1]
-                            == address_data->normal_i2c[i]) {
-                                dev_dbg(&adapter->dev, "found ignore "
-                                        "parameter for adapter %d, "
-                                        "addr 0x%02x\n", adap_id,
-                                        address_data->ignore[j + 1]);
-                                ignore = 1;
-                                break;
-                        }
-                }
-                if (ignore)
-                        continue;
-
                 dev_dbg(&adapter->dev, "found normal entry for adapter %d, "
                         "addr 0x%02x\n", adap_id,
                         address_data->normal_i2c[i]);
                 temp_client->addr = address_data->normal_i2c[i];
-                err = i2c_detect_address(temp_client, -1, driver);
+                err = i2c_detect_address(temp_client, driver);
                 if (err)
                         goto exit_free;
         }
@@ -1902,7 +1820,7 @@ s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags,
         flags &= I2C_M_TEN | I2C_CLIENT_PEC;
 
         if (adapter->algo->smbus_xfer) {
-                mutex_lock(&adapter->bus_lock);
+                rt_mutex_lock(&adapter->bus_lock);
 
                 /* Retry automatically on arbitration loss */
                 orig_jiffies = jiffies;
@@ -1916,7 +1834,7 @@ s32 i2c_smbus_xfer(struct i2c_adapter *adapter, u16 addr, unsigned short flags,
                                        orig_jiffies + adapter->timeout))
                                 break;
                 }
-                mutex_unlock(&adapter->bus_lock);
+                rt_mutex_unlock(&adapter->bus_lock);
         } else
                 res = i2c_smbus_xfer_emulated(adapter,addr,flags,read_write,
                                               command, protocol, data);
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 7e13d2df9af3..f4110aa49600 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -34,7 +34,6 @@
 #include <linux/list.h>
 #include <linux/i2c.h>
 #include <linux/i2c-dev.h>
-#include <linux/smp_lock.h>
 #include <linux/jiffies.h>
 #include <asm/uaccess.h>
 
@@ -445,20 +444,14 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         struct i2c_client *client;
         struct i2c_adapter *adap;
         struct i2c_dev *i2c_dev;
-        int ret = 0;
 
-        lock_kernel();
         i2c_dev = i2c_dev_get_by_minor(minor);
-        if (!i2c_dev) {
-                ret = -ENODEV;
-                goto out;
-        }
+        if (!i2c_dev)
+                return -ENODEV;
 
         adap = i2c_get_adapter(i2c_dev->adap->nr);
-        if (!adap) {
-                ret = -ENODEV;
-                goto out;
-        }
+        if (!adap)
+                return -ENODEV;
 
         /* This creates an anonymous i2c_client, which may later be
          * pointed to some address using I2C_SLAVE or I2C_SLAVE_FORCE.
@@ -470,8 +463,7 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         client = kzalloc(sizeof(*client), GFP_KERNEL);
         if (!client) {
                 i2c_put_adapter(adap);
-                ret = -ENOMEM;
-                goto out;
+                return -ENOMEM;
         }
         snprintf(client->name, I2C_NAME_SIZE, "i2c-dev %d", adap->nr);
         client->driver = &i2cdev_driver;
@@ -479,9 +471,7 @@ static int i2cdev_open(struct inode *inode, struct file *file)
         client->adapter = adap;
         file->private_data = client;
 
-out:
-        unlock_kernel();
-        return ret;
+        return 0;
 }
 
 static int i2cdev_release(struct inode *inode, struct file *file)