diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-06-30 17:41:39 +0200 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-06-30 17:41:39 +0200 |
| commit | 44f10dbefd5e41b3385af91f855a57aa2afaf40e (patch) | |
| tree | 944c9f1cda8322691468e6f10dc5b0d41c487621 /sound/soc/codecs/cs42l83-i2c.c | |
| parent | Merge branch 'master' into mm-hotfixes-stable (diff) | |
| parent | csky: fix up lock_mm_and_find_vma() conversion (diff) | |
| download | linux-44f10dbefd5e41b3385af91f855a57aa2afaf40e.tar.xz linux-44f10dbefd5e41b3385af91f855a57aa2afaf40e.zip | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'sound/soc/codecs/cs42l83-i2c.c')
| -rw-r--r-- | sound/soc/codecs/cs42l83-i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs42l83-i2c.c b/sound/soc/codecs/cs42l83-i2c.c index 37629ebd90e0..f482b6a4f5c3 100644 --- a/sound/soc/codecs/cs42l83-i2c.c +++ b/sound/soc/codecs/cs42l83-i2c.c @@ -158,7 +158,7 @@ static const struct regmap_config cs42l83_regmap = { .max_register = CS42L42_MAX_REGISTER, .reg_defaults = cs42l83_reg_defaults, .num_reg_defaults = ARRAY_SIZE(cs42l83_reg_defaults), - .cache_type = REGCACHE_RBTREE, + .cache_type = REGCACHE_MAPLE, .use_single_read = true, .use_single_write = true, @@ -228,7 +228,7 @@ static struct i2c_driver cs42l83_i2c_driver = { .pm = &cs42l83_i2c_pm_ops, .of_match_table = of_match_ptr(cs42l83_of_match), }, - .probe_new = cs42l83_i2c_probe, + .probe = cs42l83_i2c_probe, .remove = cs42l83_i2c_remove, }; |