Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'regmap-fix-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap fixes from Mark Brown:
"A couple of small fixes, fixing an incorrect format specifier in a log
message and adding missing cleanup of the devres data used to support
dev_get_regmap() when a device is unregistered"
* tag 'regmap-fix-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: detach regmap from dev on regmap_exit
regmap: Use correct format specifier for logging range errors
+14
-2
+14
-2
drivers/base/regmap/regmap.c
+14
-2
drivers/base/regmap/regmap.c
···
598
598
}
599
599
EXPORT_SYMBOL_GPL(regmap_attach_dev);
600
600
601
+
static int dev_get_regmap_match(struct device *dev, void *res, void *data);
602
+
603
+
static int regmap_detach_dev(struct device *dev, struct regmap *map)
604
+
{
605
+
if (!dev)
606
+
return 0;
607
+
608
+
return devres_release(dev, dev_get_regmap_release,
609
+
dev_get_regmap_match, (void *)map->name);
610
+
}
611
+
601
612
static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
602
613
const struct regmap_config *config)
603
614
{
···
1063
1052
1064
1053
/* Sanity check */
1065
1054
if (range_cfg->range_max < range_cfg->range_min) {
1066
-
dev_err(map->dev, "Invalid range %d: %d < %d\n", i,
1055
+
dev_err(map->dev, "Invalid range %d: %u < %u\n", i,
1067
1056
range_cfg->range_max, range_cfg->range_min);
1068
1057
goto err_range;
1069
1058
}
1070
1059
1071
1060
if (range_cfg->range_max > map->max_register) {
1072
-
dev_err(map->dev, "Invalid range %d: %d > %d\n", i,
1061
+
dev_err(map->dev, "Invalid range %d: %u > %u\n", i,
1073
1062
range_cfg->range_max, map->max_register);
1074
1063
goto err_range;
1075
1064
}
···
1456
1445
{
1457
1446
struct regmap_async *async;
1458
1447
1448
+
regmap_detach_dev(map->dev, map);
1459
1449
regcache_exit(map);
1460
1450
1461
1451
regmap_debugfs_exit(map);