Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay...

[mirror_ubuntu-artful-kernel.git] / drivers / base / regmap / regmap-i2c.c

diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index ddb9b0efb7242f4209ab6619700af9ea1d56d082..1a8ec3b2b60181be46beaeb765f530bc9a2f7a83 100644 (file)
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -282,47 +282,34 @@ static const struct regmap_bus *regmap_get_i2c_bus(struct i2c_client *i2c,
        return ERR_PTR(-ENOTSUPP);
 }
 
-/**
- * regmap_init_i2c(): Initialise register map
- *
- * @i2c: Device that will be interacted with
- * @config: Configuration for register map
- *
- * The return value will be an ERR_PTR() on error or a valid pointer to
- * a struct regmap.
- */
-struct regmap *regmap_init_i2c(struct i2c_client *i2c,
-                              const struct regmap_config *config)
+struct regmap *__regmap_init_i2c(struct i2c_client *i2c,
+                                const struct regmap_config *config,
+                                struct lock_class_key *lock_key,
+                                const char *lock_name)
 {
        const struct regmap_bus *bus = regmap_get_i2c_bus(i2c, config);
 
        if (IS_ERR(bus))
                return ERR_CAST(bus);
 
-       return regmap_init(&i2c->dev, bus, &i2c->dev, config);
+       return __regmap_init(&i2c->dev, bus, &i2c->dev, config,
+                            lock_key, lock_name);
 }
-EXPORT_SYMBOL_GPL(regmap_init_i2c);
+EXPORT_SYMBOL_GPL(__regmap_init_i2c);
 
-/**
- * devm_regmap_init_i2c(): Initialise managed register map
- *
- * @i2c: Device that will be interacted with
- * @config: Configuration for register map
- *
- * The return value will be an ERR_PTR() on error or a valid pointer
- * to a struct regmap.  The regmap will be automatically freed by the
- * device management code.
- */
-struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c,
-                                   const struct regmap_config *config)
+struct regmap *__devm_regmap_init_i2c(struct i2c_client *i2c,
+                                     const struct regmap_config *config,
+                                     struct lock_class_key *lock_key,
+                                     const char *lock_name)
 {
        const struct regmap_bus *bus = regmap_get_i2c_bus(i2c, config);
 
        if (IS_ERR(bus))
                return ERR_CAST(bus);
 
-       return devm_regmap_init(&i2c->dev, bus, &i2c->dev, config);
+       return __devm_regmap_init(&i2c->dev, bus, &i2c->dev, config,
+                                 lock_key, lock_name);
 }
-EXPORT_SYMBOL_GPL(devm_regmap_init_i2c);
+EXPORT_SYMBOL_GPL(__devm_regmap_init_i2c);
 
 MODULE_LICENSE("GPL");