From d79cf585c08b5e08753550632278d807139d2970 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 10 Dec 2012 00:22:35 +0900 Subject: [PATCH] --- yaml --- r: 342958 b: refs/heads/master c: fa5236985b108250de81e7384c62e3abc9ff3a71 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm8985.c | 30 ++++-------------------------- 2 files changed, 5 insertions(+), 27 deletions(-) diff --git a/[refs] b/[refs] index 47d634f70a8b..bf7a7bebdaa7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e00457d2e093fef1f0688e32948d7823e9d8e38a +refs/heads/master: fa5236985b108250de81e7384c62e3abc9ff3a71 diff --git a/trunk/sound/soc/codecs/wm8985.c b/trunk/sound/soc/codecs/wm8985.c index 14f666398d0c..7b3f4097609b 100644 --- a/trunk/sound/soc/codecs/wm8985.c +++ b/trunk/sound/soc/codecs/wm8985.c @@ -1122,33 +1122,22 @@ static int __devinit wm8985_spi_probe(struct spi_device *spi) 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)) { ret = PTR_ERR(wm8985->regmap); dev_err(&spi->dev, "Failed to allocate register map: %d\n", ret); - goto err; + return ret; } ret = snd_soc_register_codec(&spi->dev, &soc_codec_dev_wm8985, &wm8985_dai, 1); - if (ret != 0) - goto err; - - return 0; - -err: - regmap_exit(wm8985->regmap); return ret; } static int __devexit wm8985_spi_remove(struct spi_device *spi) { - struct wm8985_priv *wm8985 = spi_get_drvdata(spi); - snd_soc_unregister_codec(&spi->dev); - regmap_exit(wm8985->regmap); - return 0; } @@ -1175,33 +1164,22 @@ static __devinit int wm8985_i2c_probe(struct i2c_client *i2c, 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)) { ret = PTR_ERR(wm8985->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", ret); - goto err; + return ret; } ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_wm8985, &wm8985_dai, 1); - if (ret != 0) - goto err; - - return 0; - -err: - regmap_exit(wm8985->regmap); return ret; } static __devexit int wm8985_i2c_remove(struct i2c_client *i2c) { - struct wm8985_priv *wm8985 = i2c_get_clientdata(i2c); - snd_soc_unregister_codec(&i2c->dev); - regmap_exit(wm8985->regmap); - return 0; }