leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/wm8995' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2012-12-02 13:35:30 +09:00
commit d7ba2556a0
1 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sound/soc/codecs/wm8995.c
View File

@ -2261,41 +2261,28 @@ static int __devinit wm8995_spi_probe(struct spi_device *spi)
struct wm8995_priv *wm8995; struct wm8995_priv *wm8995;
int ret; int ret;
wm8995 = kzalloc(sizeof *wm8995, GFP_KERNEL); wm8995 = devm_kzalloc(&spi->dev, sizeof(*wm8995), GFP_KERNEL);
if (!wm8995) if (!wm8995)
return -ENOMEM; return -ENOMEM;
spi_set_drvdata(spi, wm8995); spi_set_drvdata(spi, wm8995);
wm8995->regmap = regmap_init_spi(spi, &wm8995_regmap); wm8995->regmap = devm_regmap_init_spi(spi, &wm8995_regmap);
if (IS_ERR(wm8995->regmap)) { if (IS_ERR(wm8995->regmap)) {
ret = PTR_ERR(wm8995->regmap); ret = PTR_ERR(wm8995->regmap);
dev_err(&spi->dev, "Failed to register regmap: %d\n", ret); dev_err(&spi->dev, "Failed to register regmap: %d\n", ret);
goto err_alloc; return ret;
} }
ret = snd_soc_register_codec(&spi->dev, ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_wm8995, wm8995_dai, &soc_codec_dev_wm8995, wm8995_dai,
ARRAY_SIZE(wm8995_dai)); ARRAY_SIZE(wm8995_dai));
if (ret < 0)
goto err_regmap;
return ret;
err_regmap:
regmap_exit(wm8995->regmap);
err_alloc:
kfree(wm8995);
return ret; return ret;
} }
static int __devexit wm8995_spi_remove(struct spi_device *spi) static int __devexit wm8995_spi_remove(struct spi_device *spi)
{ {
struct wm8995_priv *wm8995 = spi_get_drvdata(spi);
snd_soc_unregister_codec(&spi->dev); snd_soc_unregister_codec(&spi->dev);
regmap_exit(wm8995->regmap);
kfree(wm8995);
return 0; return 0;
} }
@ -2316,44 +2303,31 @@ static __devinit int wm8995_i2c_probe(struct i2c_client *i2c,
struct wm8995_priv *wm8995; struct wm8995_priv *wm8995;
int ret; int ret;
wm8995 = kzalloc(sizeof *wm8995, GFP_KERNEL); wm8995 = devm_kzalloc(&i2c->dev, sizeof(*wm8995), GFP_KERNEL);
if (!wm8995) if (!wm8995)
return -ENOMEM; return -ENOMEM;
i2c_set_clientdata(i2c, wm8995); i2c_set_clientdata(i2c, wm8995);
wm8995->regmap = regmap_init_i2c(i2c, &wm8995_regmap); wm8995->regmap = devm_regmap_init_i2c(i2c, &wm8995_regmap);
if (IS_ERR(wm8995->regmap)) { if (IS_ERR(wm8995->regmap)) {
ret = PTR_ERR(wm8995->regmap); ret = PTR_ERR(wm8995->regmap);
dev_err(&i2c->dev, "Failed to register regmap: %d\n", ret); dev_err(&i2c->dev, "Failed to register regmap: %d\n", ret);
goto err_alloc; return ret;
} }
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8995, wm8995_dai, &soc_codec_dev_wm8995, wm8995_dai,
ARRAY_SIZE(wm8995_dai)); ARRAY_SIZE(wm8995_dai));
if (ret < 0) { if (ret < 0)
dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret); dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
goto err_regmap;
}
return ret;
err_regmap:
regmap_exit(wm8995->regmap);
err_alloc:
kfree(wm8995);
return ret; return ret;
} }
static __devexit int wm8995_i2c_remove(struct i2c_client *client) static __devexit int wm8995_i2c_remove(struct i2c_client *client)
{ {
struct wm8995_priv *wm8995 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
regmap_exit(wm8995->regmap);
kfree(wm8995);
return 0; return 0;
} }