Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ASoC: wm8985: Convert to use devm_regmap_init_{spi,i2c}()

Browse source 
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Tushar Behera 2012-11-22 09:38:40 +05:30 committed by Mark Brown
parent f4a75d2eb7
commit f911fa829d
1 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sound/soc/codecs/wm8985.c
View file

@ -1122,33 +1122,22 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi)
spi_set_drvdata(spi, wm8985); spi_set_drvdata(spi, wm8985);
wm8985->regmap = regmap_init_spi(spi, &wm8985_regmap); wm8985->regmap = devm_regmap_init_spi(spi, &wm8985_regmap);
if (IS_ERR(wm8985->regmap)) { if (IS_ERR(wm8985->regmap)) {
ret = PTR_ERR(wm8985->regmap); ret = PTR_ERR(wm8985->regmap);
dev_err(&spi->dev, "Failed to allocate register map: %d\n", dev_err(&spi->dev, "Failed to allocate register map: %d\n",
ret); ret);
goto err; return ret;
} }
ret = snd_soc_register_codec(&spi->dev, ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8985, &wm8985_dai, 1); &soc_codec_dev_wm8985, &wm8985_dai, 1);
if (ret != 0)
goto err;
return 0;
err:
regmap_exit(wm8985->regmap);
return ret; return ret;
} }
static int __devexit wm8985_spi_remove(struct spi_device *spi) static int __devexit wm8985_spi_remove(struct spi_device *spi)
{ {
struct wm8985_priv *wm8985 = spi_get_drvdata(spi);
snd_soc_unregister_codec(&spi->dev); snd_soc_unregister_codec(&spi->dev);
regmap_exit(wm8985->regmap);
return 0; return 0;
} }
@ -1175,33 +1164,22 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm8985); i2c_set_clientdata(i2c, wm8985);
wm8985->regmap = regmap_init_i2c(i2c, &wm8985_regmap); wm8985->regmap = devm_regmap_init_i2c(i2c, &wm8985_regmap);
if (IS_ERR(wm8985->regmap)) { if (IS_ERR(wm8985->regmap)) {
ret = PTR_ERR(wm8985->regmap); ret = PTR_ERR(wm8985->regmap);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n", dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
ret); ret);
goto err; return ret;
} }
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8985, &wm8985_dai, 1); &soc_codec_dev_wm8985, &wm8985_dai, 1);
if (ret != 0)
goto err;
return 0;
err:
regmap_exit(wm8985->regmap);
return ret; return ret;
} }
static __devexit int wm8985_i2c_remove(struct i2c_client *i2c) static __devexit int wm8985_i2c_remove(struct i2c_client *i2c)
{ {
struct wm8985_priv *wm8985 = i2c_get_clientdata(i2c);
snd_soc_unregister_codec(&i2c->dev); snd_soc_unregister_codec(&i2c->dev);
regmap_exit(wm8985->regmap);
return 0; return 0;
} }