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

bardliao · bardliao · commit 907b3116653a · 2025-08-21T17:49:10.000+08:00
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
@@ -609,4 +609,5 @@ void regmap_mmio_detach_clk(struct regmap *map)
 }
 EXPORT_SYMBOL_GPL(regmap_mmio_detach_clk);
 
+MODULE_DESCRIPTION("regmap MMIO Module");
 MODULE_LICENSE("GPL v2");
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
@@ -827,7 +827,7 @@ struct regmap *__regmap_init(struct device *dev,
 		map->read_flag_mask = bus->read_flag_mask;
 	}
 
-	if (config && config->read && config->write) {
+	if (config->read && config->write) {
 		map->reg_read  = _regmap_bus_read;
 		if (config->reg_update_bits)
 			map->reg_update_bits = config->reg_update_bits;

Original file line number	Diff line number	Diff line change
`@@ -609,4 +609,5 @@ void regmap_mmio_detach_clk(struct regmap *map)`
`609`	`609`	`}`
`610`	`610`	`EXPORT_SYMBOL_GPL(regmap_mmio_detach_clk);`
`611`	`611`
	`612`	`+MODULE_DESCRIPTION("regmap MMIO Module");`
`612`	`613`	`MODULE_LICENSE("GPL v2");`
Original file line number	Diff line number	Diff line change
`@@ -827,7 +827,7 @@ struct regmap __regmap_init(struct device dev,`
`827`	`827`	`map->read_flag_mask = bus->read_flag_mask;`
`828`	`828`	`}`
`829`	`829`
`830`		`- if (config && config->read && config->write) {`
	`830`	`+ if (config->read && config->write) {`
`831`	`831`	`map->reg_read = _regmap_bus_read;`
`832`	`832`	`if (config->reg_update_bits)`
`833`	`833`	`map->reg_update_bits = config->reg_update_bits;`