Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[cascardo/linux.git] / drivers / i2c / i2c-mux.c

diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
index 2d0847b..593f7ca 100644 (file)
--- a/drivers/i2c/i2c-mux.c
+++ b/drivers/i2c/i2c-mux.c
@@ -110,6 +110,7 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
                                                 void *, u32))
 {
        struct i2c_mux_priv *priv;
+       char symlink_name[20];
        int ret;
 
        priv = kzalloc(sizeof(struct i2c_mux_priv), GFP_KERNEL);
@@ -183,6 +184,12 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
                return NULL;
        }
 
+       WARN(sysfs_create_link(&priv->adap.dev.kobj, &mux_dev->kobj, "mux_device"),
+                              "can't create symlink to mux device\n");
+
+       snprintf(symlink_name, sizeof(symlink_name), "channel-%u", chan_id);
+       WARN(sysfs_create_link(&mux_dev->kobj, &priv->adap.dev.kobj, symlink_name),
+                              "can't create symlink for channel %u\n", chan_id);
        dev_info(&parent->dev, "Added multiplexed i2c bus %d\n",
                 i2c_adapter_id(&priv->adap));
 
@@ -193,7 +200,12 @@ EXPORT_SYMBOL_GPL(i2c_add_mux_adapter);
 void i2c_del_mux_adapter(struct i2c_adapter *adap)
 {
        struct i2c_mux_priv *priv = adap->algo_data;
+       char symlink_name[20];
+
+       snprintf(symlink_name, sizeof(symlink_name), "channel-%u", priv->chan_id);
+       sysfs_remove_link(&adap->dev.parent->kobj, symlink_name);
 
+       sysfs_remove_link(&priv->adap.dev.kobj, "mux_device");
        i2c_del_adapter(adap);
        kfree(priv);
 }