i2c: Kill i2c_adapter.class_dev

Kill i2c_adapter.class_dev. Instead, set the class of i2c_adapter.dev
to i2c_adapter_class, so that a symlink will be created for every
i2c_adapter in /sys/class/i2c-adapter.

The same change must be mirrored to i2c-isa as it duplicates some
of the i2c-core functionalities.

User-space tools and libraries might need some adjustments. In
particular, libsensors from lm_sensors 2.10.3 or later is required for
proper discovery of i2c adapter names after this change.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

1 files changed, 1 insertions, 33 deletions

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 21fe1406c8b..40a744d73e8 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -123,28 +123,9 @@ struct device_driver i2c_adapter_driver = {
 
 /* I2C bus adapters -- one roots each I2C or SMBUS segment */
 
-static void i2c_adapter_class_dev_release(struct class_device *dev)
-{
-        struct i2c_adapter *adap = class_dev_to_i2c_adapter(dev);
-        complete(&adap->class_dev_released);
-}
-
-static ssize_t i2c_adapter_show_name(struct class_device *cdev, char *buf)
-{
-        struct i2c_adapter *adap = class_dev_to_i2c_adapter(cdev);
-        return sprintf(buf, "%s\n", adap->name);
-}
-
-static struct class_device_attribute i2c_adapter_attrs[] = {
-        __ATTR(name, S_IRUGO, i2c_adapter_show_name, NULL),
-        { },
-};
-
 struct class i2c_adapter_class = {
         .owner                  = THIS_MODULE,
         .name                   = "i2c-adapter",
-        .class_dev_attrs        = i2c_adapter_attrs,
-        .release                = &i2c_adapter_class_dev_release,
 };
 
 static ssize_t show_adapter_name(struct device *dev, struct device_attribute *attr, char *buf)
@@ -223,6 +204,7 @@ int i2c_add_adapter(struct i2c_adapter *adap)
         sprintf(adap->dev.bus_id, "i2c-%d", adap->nr);
         adap->dev.driver = &i2c_adapter_driver;
         adap->dev.release = &i2c_adapter_dev_release;
+        adap->dev.class = &i2c_adapter_class;
         res = device_register(&adap->dev);
         if (res)
                 goto out_list;
@@ -230,15 +212,6 @@ int i2c_add_adapter(struct i2c_adapter *adap)
         if (res)
                 goto out_unregister;
 
-        /* Add this adapter to the i2c_adapter class */
-        memset(&adap->class_dev, 0x00, sizeof(struct class_device));
-        adap->class_dev.dev = &adap->dev;
-        adap->class_dev.class = &i2c_adapter_class;
-        strlcpy(adap->class_dev.class_id, adap->dev.bus_id, BUS_ID_SIZE);
-        res = class_device_register(&adap->class_dev);
-        if (res)
-                goto out_remove_name;
-
         dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
 
         /* inform drivers of new adapters */
@@ -253,8 +226,6 @@ out_unlock:
         mutex_unlock(&core_lists);
         return res;
 
-out_remove_name:
-        device_remove_file(&adap->dev, &dev_attr_name);
 out_unregister:
         init_completion(&adap->dev_released); /* Needed? */
         device_unregister(&adap->dev);
@@ -314,15 +285,12 @@ int i2c_del_adapter(struct i2c_adapter *adap)
 
         /* clean up the sysfs representation */
         init_completion(&adap->dev_released);
-        init_completion(&adap->class_dev_released);
-        class_device_unregister(&adap->class_dev);
         device_remove_file(&adap->dev, &dev_attr_name);
         device_unregister(&adap->dev);
         list_del(&adap->list);
 
         /* wait for sysfs to drop all references */
         wait_for_completion(&adap->dev_released);
-        wait_for_completion(&adap->class_dev_released);
 
         /* free dynamically allocated bus id */
         idr_remove(&i2c_adapter_idr, adap->nr);