Skip to content

Commit fffe418

Browse files
committed
Merge tag 'regmap-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown: "Other than a few cleanups the changes here are all in the KUnit tests, Richard Fitzgerald sent some bug fixes during the v6.9 cycle and while adding test coverage for the issues fixed did some fairly substantial improvements, both cleaning up the framework and building out the coverage" * tag 'regmap-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: Reorder fields in 'struct regmap_config' to save some memory regmap: kunit: Fix an NULL vs IS_ERR() check regmap: spi: Add missing MODULE_DESCRIPTION() regmap: Drop capitalisation in MODULE_DESCRIPTION() regmap: kunit: Add test cases for regmap_read_bypassed() regmap: kunit: Add cache-drop test with multiple cache blocks regmap: kunit: Replace a kmalloc/kfree() pair with KUnit-managed alloc regmap: kunit: Use a KUnit action to call regmap_exit() regmap: kunit: Add more cache-sync tests regmap: kunit: Add more cache-drop tests regmap: kunit: Run non-sparse cache tests at non-zero register addresses regmap: kunit: Run sparse cache tests at non-zero register addresses regmap: kunit: Introduce struct for test case parameters regmap: kunit: Create a struct device for the regmap regmap: kunit: Fix warnings of implicit casts to __le16 and __be16 regmap: maple: Remove second semicolon
2 parents 101b7a9 + 9b1fe05 commit fffe418

File tree

11 files changed

+800
-287
lines changed

11 files changed

+800
-287
lines changed

drivers/base/regmap/internal.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,20 +326,22 @@ struct regmap_ram_data {
326326
* Create a test register map with data stored in RAM, not intended
327327
* for practical use.
328328
*/
329-
struct regmap *__regmap_init_ram(const struct regmap_config *config,
329+
struct regmap *__regmap_init_ram(struct device *dev,
330+
const struct regmap_config *config,
330331
struct regmap_ram_data *data,
331332
struct lock_class_key *lock_key,
332333
const char *lock_name);
333334

334-
#define regmap_init_ram(config, data) \
335-
__regmap_lockdep_wrapper(__regmap_init_ram, #config, config, data)
335+
#define regmap_init_ram(dev, config, data) \
336+
__regmap_lockdep_wrapper(__regmap_init_ram, #dev, dev, config, data)
336337

337-
struct regmap *__regmap_init_raw_ram(const struct regmap_config *config,
338+
struct regmap *__regmap_init_raw_ram(struct device *dev,
339+
const struct regmap_config *config,
338340
struct regmap_ram_data *data,
339341
struct lock_class_key *lock_key,
340342
const char *lock_name);
341343

342-
#define regmap_init_raw_ram(config, data) \
343-
__regmap_lockdep_wrapper(__regmap_init_raw_ram, #config, config, data)
344+
#define regmap_init_raw_ram(dev, config, data) \
345+
__regmap_lockdep_wrapper(__regmap_init_raw_ram, #dev, dev, config, data)
344346

345347
#endif

drivers/base/regmap/regcache-maple.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ static int regcache_maple_exit(struct regmap *map)
294294
{
295295
struct maple_tree *mt = map->cache;
296296
MA_STATE(mas, mt, 0, UINT_MAX);
297-
unsigned int *entry;;
297+
unsigned int *entry;
298298

299299
/* if we've already been called then just return */
300300
if (!mt)

drivers/base/regmap/regmap-i3c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ struct regmap *__devm_regmap_init_i3c(struct i3c_device *i3c,
5656
EXPORT_SYMBOL_GPL(__devm_regmap_init_i3c);
5757

5858
MODULE_AUTHOR("Vitor Soares <[email protected]>");
59-
MODULE_DESCRIPTION("Regmap I3C Module");
59+
MODULE_DESCRIPTION("regmap I3C Module");
6060
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)