6 files changed, 66 insertions, 32 deletions

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 23ac61e2db39..beee6b2d361d 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_I2C_MUX)		+= i2c-mux.o
 obj-y                           += algos/ busses/ muxes/
 
 ccflags-$(CONFIG_I2C_DEBUG_CORE) := -DDEBUG
+CFLAGS_i2c-core.o := -Wno-deprecated-declarations
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 230601e8853f..ad415e6ec5a1 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -98,8 +98,9 @@ config I2C_I801
             EP80579 (Tolapai)
             ICH10
             5/3400 Series (PCH)
-            Cougar Point (PCH)
+            6 Series (PCH)
             Patsburg (PCH)
+            DH89xxCC (PCH)
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-i801.
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 7979aef7ee7b..ed2e0c5ea37c 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -44,11 +44,12 @@
   ICH10                 0x3a30     32     hard     yes     yes     yes
   ICH10                 0x3a60     32     hard     yes     yes     yes
   5/3400 Series (PCH)   0x3b30     32     hard     yes     yes     yes
-  Cougar Point (PCH)    0x1c22     32     hard     yes     yes     yes
+  6 Series (PCH)        0x1c22     32     hard     yes     yes     yes
   Patsburg (PCH)        0x1d22     32     hard     yes     yes     yes
   Patsburg (PCH) IDF    0x1d70     32     hard     yes     yes     yes
   Patsburg (PCH) IDF    0x1d71     32     hard     yes     yes     yes
   Patsburg (PCH) IDF    0x1d72     32     hard     yes     yes     yes
+  DH89xxCC (PCH)        0x2330     32     hard     yes     yes     yes
 
   Features supported by this driver:
   Software PEC                     no
@@ -621,6 +622,7 @@ static const struct pci_device_id i801_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF0) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF1) },
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PATSBURG_SMBUS_IDF2) },
+        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_DH89XXCC_SMBUS) },
         { 0, }
 };
 
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c
index 7e6a63b57165..3ca2e012e789 100644
--- a/drivers/i2c/i2c-boardinfo.c
+++ b/drivers/i2c/i2c-boardinfo.c
@@ -1,5 +1,5 @@
 /*
- * i2c-boardinfo.h - collect pre-declarations of I2C devices
+ * i2c-boardinfo.c - collect pre-declarations of I2C devices
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 045ba6efea48..e5f76a0372fd 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -797,6 +797,9 @@ static int i2c_do_add_adapter(struct i2c_driver *driver,
 
         /* Let legacy drivers scan this bus for matching devices */
         if (driver->attach_adapter) {
+                dev_warn(&adap->dev, "attach_adapter method is deprecated\n");
+                dev_warn(&adap->dev, "Please use another way to instantiate "
+                         "your i2c_client\n");
                 /* We ignore the return code; if it fails, too bad */
                 driver->attach_adapter(adap);
         }
@@ -981,6 +984,7 @@ static int i2c_do_del_adapter(struct i2c_driver *driver,
 
         if (!driver->detach_adapter)
                 return 0;
+        dev_warn(&adapter->dev, "detach_adapter method is deprecated\n");
         res = driver->detach_adapter(adapter);
         if (res)
                 dev_err(&adapter->dev, "detach_adapter failed (%d) "
@@ -1091,6 +1095,18 @@ EXPORT_SYMBOL(i2c_del_adapter);
 
 /* ------------------------------------------------------------------------- */
 
+int i2c_for_each_dev(void *data, int (*fn)(struct device *, void *))
+{
+        int res;
+
+        mutex_lock(&core_lock);
+        res = bus_for_each_dev(&i2c_bus_type, NULL, data, fn);
+        mutex_unlock(&core_lock);
+
+        return res;
+}
+EXPORT_SYMBOL_GPL(i2c_for_each_dev);
+
 static int __process_new_driver(struct device *dev, void *data)
 {
         if (dev->type != &i2c_adapter_type)
@@ -1134,9 +1150,7 @@ 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, __process_new_driver);
-        mutex_unlock(&core_lock);
+        i2c_for_each_dev(driver, __process_new_driver);
 
         return 0;
 }
@@ -1156,9 +1170,7 @@ static int __process_removed_driver(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, __process_removed_driver);
-        mutex_unlock(&core_lock);
+        i2c_for_each_dev(driver, __process_removed_driver);
 
         driver_unregister(&driver->driver);
         pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);
@@ -1581,12 +1593,12 @@ i2c_new_probed_device(struct i2c_adapter *adap,
 }
 EXPORT_SYMBOL_GPL(i2c_new_probed_device);
 
-struct i2c_adapter *i2c_get_adapter(int id)
+struct i2c_adapter *i2c_get_adapter(int nr)
 {
         struct i2c_adapter *adapter;
 
         mutex_lock(&core_lock);
-        adapter = idr_find(&i2c_adapter_idr, id);
+        adapter = idr_find(&i2c_adapter_idr, nr);
         if (adapter && !try_module_get(adapter->owner))
                 adapter = NULL;
 
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index cec0f3ba97f8..c90ce50b619f 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -28,6 +28,8 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/device.h>
+#include <linux/notifier.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/init.h>
@@ -37,16 +39,13 @@
 #include <linux/jiffies.h>
 #include <linux/uaccess.h>
 
-static struct i2c_driver i2cdev_driver;
-
 /*
  * An i2c_dev represents an i2c_adapter ... an I2C or SMBus master, not a
  * slave (i2c_client) with which messages will be exchanged.  It's coupled
  * with a character special file which is accessed by user mode drivers.
  *
  * The list of i2c_dev structures is parallel to the i2c_adapter lists
- * maintained by the driver model, and is updated using notifications
- * delivered to the i2cdev_driver.
+ * maintained by the driver model, and is updated using bus notifications.
  */
 struct i2c_dev {
         struct list_head list;
@@ -491,7 +490,6 @@ static int i2cdev_open(struct inode *inode, struct file *file)
                 return -ENOMEM;
         }
         snprintf(client->name, I2C_NAME_SIZE, "i2c-dev %d", adap->nr);
-        client->driver = &i2cdev_driver;
 
         client->adapter = adap;
         file->private_data = client;
@@ -522,19 +520,18 @@ static const struct file_operations i2cdev_fops = {
 
 /* ------------------------------------------------------------------------- */
 
-/*
- * The legacy "i2cdev_driver" is used primarily to get notifications when
- * I2C adapters are added or removed, so that each one gets an i2c_dev
- * and is thus made available to userspace driver code.
- */
-
 static struct class *i2c_dev_class;
 
-static int i2cdev_attach_adapter(struct i2c_adapter *adap)
+static int i2cdev_attach_adapter(struct device *dev, void *dummy)
 {
+        struct i2c_adapter *adap;
         struct i2c_dev *i2c_dev;
         int res;
 
+        if (dev->type != &i2c_adapter_type)
+                return 0;
+        adap = to_i2c_adapter(dev);
+
         i2c_dev = get_free_i2c_dev(adap);
         if (IS_ERR(i2c_dev))
                 return PTR_ERR(i2c_dev);
@@ -561,10 +558,15 @@ error:
         return res;
 }
 
-static int i2cdev_detach_adapter(struct i2c_adapter *adap)
+static int i2cdev_detach_adapter(struct device *dev, void *dummy)
 {
+        struct i2c_adapter *adap;
         struct i2c_dev *i2c_dev;
 
+        if (dev->type != &i2c_adapter_type)
+                return 0;
+        adap = to_i2c_adapter(dev);
+
         i2c_dev = i2c_dev_get_by_minor(adap->nr);
         if (!i2c_dev) /* attach_adapter must have failed */
                 return 0;
@@ -577,12 +579,23 @@ static int i2cdev_detach_adapter(struct i2c_adapter *adap)
         return 0;
 }
 
-static struct i2c_driver i2cdev_driver = {
-        .driver = {
-                .name   = "dev_driver",
-        },
-        .attach_adapter = i2cdev_attach_adapter,
-        .detach_adapter = i2cdev_detach_adapter,
+int i2cdev_notifier_call(struct notifier_block *nb, unsigned long action,
+                         void *data)
+{
+        struct device *dev = data;
+
+        switch (action) {
+        case BUS_NOTIFY_ADD_DEVICE:
+                return i2cdev_attach_adapter(dev, NULL);
+        case BUS_NOTIFY_DEL_DEVICE:
+                return i2cdev_detach_adapter(dev, NULL);
+        }
+
+        return 0;
+}
+
+static struct notifier_block i2cdev_notifier = {
+        .notifier_call = i2cdev_notifier_call,
 };
 
 /* ------------------------------------------------------------------------- */
@@ -607,10 +620,14 @@ static int __init i2c_dev_init(void)
                 goto out_unreg_chrdev;
         }
 
-        res = i2c_add_driver(&i2cdev_driver);
+        /* Keep track of adapters which will be added or removed later */
+        res = bus_register_notifier(&i2c_bus_type, &i2cdev_notifier);
         if (res)
                 goto out_unreg_class;
 
+        /* Bind to already existing adapters right away */
+        i2c_for_each_dev(NULL, i2cdev_attach_adapter);
+
         return 0;
 
 out_unreg_class:
@@ -624,7 +641,8 @@ out:
 
 static void __exit i2c_dev_exit(void)
 {
-        i2c_del_driver(&i2cdev_driver);
+        bus_unregister_notifier(&i2c_bus_type, &i2cdev_notifier);
+        i2c_for_each_dev(NULL, i2cdev_detach_adapter);
         class_destroy(i2c_dev_class);
         unregister_chrdev(I2C_MAJOR, "i2c");
 }