Merge remote-tracking branch 'regmap/for-next'

diff --cc drivers/base/regmap/regmap-spi.c
Simple merge

diff --cc drivers/base/regmap/regmap.c
index 20663f8dae45a3674e6ce04c84a54c5e07361151,fa2bd896eb208fa8a92732eb6a2accf3ee3a4732..86b1847761998bd45ee5ce39994d87803daf7b09
--- 1/drivers/base/regmap/regmap.c
--- 2/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -168,11 -198,15 +198,13 @@@ struct regmap *regmap_init(struct devic
        map->work_buf = kmalloc(map->format.buf_size, GFP_KERNEL);
        if (map->work_buf == NULL) {
                ret = -ENOMEM;
 -              goto err_bus;
 +              goto err_map;
        }
  
+       regmap_debugfs_init(map);
+ 
        return map;
  
 -err_bus:
 -      module_put(map->bus->owner);
  err_map:
        kfree(map);
  err:
@@@ -185,7 -219,9 +217,8 @@@ EXPORT_SYMBOL_GPL(regmap_init)
   */
  void regmap_exit(struct regmap *map)
  {
+       regmap_debugfs_exit(map);
        kfree(map->work_buf);
 -      module_put(map->bus->owner);
        kfree(map);
  }
  EXPORT_SYMBOL_GPL(regmap_exit);

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/wm8994-core.c
Simple merge

diff --cc include/linux/mfd/wm8994/core.h
index 5ab71bd76f9c77a5c178f93945f7185fb2d368da,45df450d869f577897e5194f85ee315099431f3b..a275798d690bc54f5d23b42f0ce5d5e808a7245e
--- 1/include/linux/mfd/wm8994/core.h
--- 2/include/linux/mfd/wm8994/core.h
+++ b/include/linux/mfd/wm8994/core.h
@@@ -56,15 -56,8 +56,10 @@@ struct wm8994 
        enum wm8994_type type;
  
        struct device *dev;
-       int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
-                       int bytes, void *dest);
-       int (*write_dev)(struct wm8994 *wm8994, unsigned short reg,
-                        int bytes, const void *src);
- 
-       void *control_data;
+       struct regmap *regmap;
  
 +      bool ldo_ena_always_driven;
 +
        int gpio_base;
        int irq_base;