Merge remote-tracking branch 'regmap/for-next' into sound/upstream-20260624

bardliao · bardliao · commit 6ad6ebea26e7 · 2026-06-24T19:30:38.000+08:00
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
@@ -245,7 +245,7 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
 	if (map->cache_ops->exit) {
 		dev_dbg(map->dev, "Destroying %s cache\n", map->cache_ops->name);
 		map->lock(map->lock_arg);
-		ret = map->cache_ops->exit(map);
+		map->cache_ops->exit(map);
 		map->unlock(map->lock_arg);
 	}
 err_free_reg_defaults:
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
@@ -337,7 +337,7 @@ static int regmap_smbus_word_write_reg16(void *context, const void *data,
 	val = ((u8 *)data)[2];
 
 	return i2c_smbus_write_word_data(i2c, addr_hi,
-					 cpu_to_le16(((u16)val << 8) | addr_lo));
+					 ((u16)val << 8) | addr_lo);
 }
 
 static const struct regmap_bus regmap_smbus_byte_word_reg16 = {

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ int regcache_init(struct regmap map, const struct regmap_config config)`
`245`	`245`	`if (map->cache_ops->exit) {`
`246`	`246`	`dev_dbg(map->dev, "Destroying %s cache\n", map->cache_ops->name);`
`247`	`247`	`map->lock(map->lock_arg);`
`248`		`- ret = map->cache_ops->exit(map);`
	`248`	`+ map->cache_ops->exit(map);`
`249`	`249`	`map->unlock(map->lock_arg);`
`250`	`250`	`}`
`251`	`251`	`err_free_reg_defaults:`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ static int regmap_smbus_word_write_reg16(void context, const void data,`
`337`	`337`	`val = ((u8 *)data)[2];`
`338`	`338`
`339`	`339`	`return i2c_smbus_write_word_data(i2c, addr_hi,`
`340`		`- cpu_to_le16(((u16)val << 8) \| addr_lo));`
	`340`	`+ ((u16)val << 8) \| addr_lo);`
`341`	`341`	`}`
`342`	`342`
`343`	`343`	`static const struct regmap_bus regmap_smbus_byte_word_reg16 = {`