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

ASoC: wm8996: Convert to devm_regmap_init_i2c()

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Mark Brown af691fb6 66c2b737

+1 -3
+1 -3
sound/soc/codecs/wm8996.c
··· 3000 3000 msleep(5); 3001 3001 } 3002 3002 3003 - wm8996->regmap = regmap_init_i2c(i2c, &wm8996_regmap); 3003 + wm8996->regmap = devm_regmap_init_i2c(i2c, &wm8996_regmap); 3004 3004 if (IS_ERR(wm8996->regmap)) { 3005 3005 ret = PTR_ERR(wm8996->regmap); 3006 3006 dev_err(&i2c->dev, "regmap_init() failed: %d\n", ret); ··· 3049 3049 err_gpiolib: 3050 3050 wm8996_free_gpio(wm8996); 3051 3051 err_regmap: 3052 - regmap_exit(wm8996->regmap); 3053 3052 err_enable: 3054 3053 if (wm8996->pdata.ldo_ena > 0) 3055 3054 gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); ··· 3067 3068 3068 3069 snd_soc_unregister_codec(&client->dev); 3069 3070 wm8996_free_gpio(wm8996); 3070 - regmap_exit(wm8996->regmap); 3071 3071 if (wm8996->pdata.ldo_ena > 0) { 3072 3072 gpio_set_value_cansleep(wm8996->pdata.ldo_ena, 0); 3073 3073 gpio_free(wm8996->pdata.ldo_ena);