From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 13 Sep 2011 05:21:39 +0000 (+1000)
Subject: Merge remote-tracking branch 'regmap/for-next'
X-Git-Tag: next-20110913~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=90cbe606a6d139881be1ec3d20dfb34b2de070cc;p=karo-tx-linux.git

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

90cbe606a6d139881be1ec3d20dfb34b2de070cc
diff --cc drivers/base/regmap/regmap.c
index 20663f8dae45,fa2bd896eb20..86b184776199
--- a/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 include/linux/mfd/wm8994/core.h
index 5ab71bd76f9c,45df450d869f..a275798d690b
--- a/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;