From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 14 Feb 2013 17:11:09 +0000 (+0000)
Subject: Merge remote-tracking branch 'regmap/topic/no-bus' into regmap-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a2b37efc4e2aa76a5be29bbde8a2cd1c9c9066bc;p=linux-beck.git

Merge remote-tracking branch 'regmap/topic/no-bus' into regmap-next
---

a2b37efc4e2aa76a5be29bbde8a2cd1c9c9066bc
diff --cc drivers/base/regmap/regmap.c
index b1d962434cb2,9592030a0dc3..3d2367501fd0
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@ -1102,9 -1052,14 +1118,14 @@@ static int _regmap_bus_raw_write(void *
  				 map->work_buf +
  				 map->format.reg_bytes +
  				 map->format.pad_bytes,
 -				 map->format.val_bytes);
 +				 map->format.val_bytes, false);
  }
  
+ static inline void *_regmap_map_get_context(struct regmap *map)
+ {
+ 	return (map->bus) ? map : map->bus_context;
+ }
+ 
  int _regmap_write(struct regmap *map, unsigned int reg,
  		  unsigned int val)
  {