Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'regmap-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull regmap updates from Mark Brown:
"A very quiet release for regmap this time, just two cleanup patches
and one almost cleanup patch which saves individual MMIO regmaps
flagging themselves as having fast I/O"

* tag 'regmap-v6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
regmap: Annotate that MMIO implies fast IO
regmap: get rid of redundant debugfs_file_{get,put}()
regmap: kunit: Constify regmap_range_cfg array

+5 -15
-10
drivers/base/regmap/regmap-debugfs.c
··· 470 470 if (err) 471 471 return count; 472 472 473 - err = debugfs_file_get(file->f_path.dentry); 474 - if (err) 475 - return err; 476 - 477 473 map->lock(map->lock_arg); 478 474 479 475 if (new_val && !map->cache_only) { ··· 482 486 map->cache_only = new_val; 483 487 484 488 map->unlock(map->lock_arg); 485 - debugfs_file_put(file->f_path.dentry); 486 489 487 490 if (require_sync) { 488 491 err = regcache_sync(map); ··· 512 517 if (err) 513 518 return count; 514 519 515 - err = debugfs_file_get(file->f_path.dentry); 516 - if (err) 517 - return err; 518 - 519 520 map->lock(map->lock_arg); 520 521 521 522 if (new_val && !map->cache_bypass) { ··· 523 532 map->cache_bypass = new_val; 524 533 525 534 map->unlock(map->lock_arg); 526 - debugfs_file_put(file->f_path.dentry); 527 535 528 536 return count; 529 537 }
+1 -1
drivers/base/regmap/regmap-kunit.c
··· 736 736 } 737 737 } 738 738 739 - static struct regmap_range_cfg test_range = { 739 + static const struct regmap_range_cfg test_range = { 740 740 .selector_reg = 1, 741 741 .selector_mask = 0xff, 742 742
+4 -4
include/linux/regmap.h
··· 913 913 * @config: Configuration for register map 914 914 * 915 915 * The return value will be an ERR_PTR() on error or a valid pointer to 916 - * a struct regmap. 916 + * a struct regmap. Implies 'fast_io'. 917 917 */ 918 918 #define regmap_init_mmio_clk(dev, clk_id, regs, config) \ 919 919 __regmap_lockdep_wrapper(__regmap_init_mmio_clk, #config, \ ··· 927 927 * @config: Configuration for register map 928 928 * 929 929 * The return value will be an ERR_PTR() on error or a valid pointer to 930 - * a struct regmap. 930 + * a struct regmap. Implies 'fast_io'. 931 931 */ 932 932 #define regmap_init_mmio(dev, regs, config) \ 933 933 regmap_init_mmio_clk(dev, NULL, regs, config) ··· 1138 1138 * 1139 1139 * The return value will be an ERR_PTR() on error or a valid pointer 1140 1140 * to a struct regmap. The regmap will be automatically freed by the 1141 - * device management code. 1141 + * device management code. Implies 'fast_io'. 1142 1142 */ 1143 1143 #define devm_regmap_init_mmio_clk(dev, clk_id, regs, config) \ 1144 1144 __regmap_lockdep_wrapper(__devm_regmap_init_mmio_clk, #config, \ ··· 1153 1153 * 1154 1154 * The return value will be an ERR_PTR() on error or a valid pointer 1155 1155 * to a struct regmap. The regmap will be automatically freed by the 1156 - * device management code. 1156 + * device management code. Implies 'fast_io'. 1157 1157 */ 1158 1158 #define devm_regmap_init_mmio(dev, regs, config) \ 1159 1159 devm_regmap_init_mmio_clk(dev, NULL, regs, config)