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

diff --cc drivers/base/regmap/internal.h
Simple merge

diff --cc drivers/base/regmap/regmap.c
index b1d962434cb20780e2116fe376c5cb043fe74a89,9592030a0dc3b82c2bde7b14943cdc5317fc3d6d..3d2367501fd0521ee4e472df6126b6ea25ee09a3
--- 1/drivers/base/regmap/regmap.c
--- 2/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)
  {

diff --cc include/linux/regmap.h
Simple merge