dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Mark Brown 2012-12-10 00:22:32 +09:00
parent e7d28c8ca4 b439c6d0d1
commit 86a942773d
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sound/soc/codecs/wm8962.c
View File

@ -3610,7 +3610,7 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++) for (i = 0; i < ARRAY_SIZE(wm8962->supplies); i++)
wm8962->supplies[i].supply = wm8962_supply_names[i]; wm8962->supplies[i].supply = wm8962_supply_names[i];
ret = regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8962->supplies), ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(wm8962->supplies),
wm8962->supplies); wm8962->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret); dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);
@ -3621,10 +3621,10 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
wm8962->supplies); wm8962->supplies);
if (ret != 0) { if (ret != 0) {
dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret); dev_err(&i2c->dev, "Failed to enable supplies: %d\n", ret);
goto err_get; return ret;
} }
wm8962->regmap = regmap_init_i2c(i2c, &wm8962_regmap); wm8962->regmap = devm_regmap_init_i2c(i2c, &wm8962_regmap);
if (IS_ERR(wm8962->regmap)) { if (IS_ERR(wm8962->regmap)) {
ret = PTR_ERR(wm8962->regmap); ret = PTR_ERR(wm8962->regmap);
dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret); dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
@ -3641,20 +3641,20 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
ret = regmap_read(wm8962->regmap, WM8962_SOFTWARE_RESET, &reg); ret = regmap_read(wm8962->regmap, WM8962_SOFTWARE_RESET, &reg);
if (ret < 0) { if (ret < 0) {
dev_err(&i2c->dev, "Failed to read ID register\n"); dev_err(&i2c->dev, "Failed to read ID register\n");
goto err_regmap; goto err_enable;
} }
if (reg != 0x6243) { if (reg != 0x6243) {
dev_err(&i2c->dev, dev_err(&i2c->dev,
"Device is not a WM8962, ID %x != 0x6243\n", reg); "Device is not a WM8962, ID %x != 0x6243\n", reg);
ret = -EINVAL; ret = -EINVAL;
goto err_regmap; goto err_enable;
} }
ret = regmap_read(wm8962->regmap, WM8962_RIGHT_INPUT_VOLUME, &reg); ret = regmap_read(wm8962->regmap, WM8962_RIGHT_INPUT_VOLUME, &reg);
if (ret < 0) { if (ret < 0) {
dev_err(&i2c->dev, "Failed to read device revision: %d\n", dev_err(&i2c->dev, "Failed to read device revision: %d\n",
ret); ret);
goto err_regmap; goto err_enable;
} }
dev_info(&i2c->dev, "customer id %x revision %c\n", dev_info(&i2c->dev, "customer id %x revision %c\n",
@ -3667,7 +3667,7 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
ret = wm8962_reset(wm8962); ret = wm8962_reset(wm8962);
if (ret < 0) { if (ret < 0) {
dev_err(&i2c->dev, "Failed to issue reset\n"); dev_err(&i2c->dev, "Failed to issue reset\n");
goto err_regmap; goto err_enable;
} }
if (pdata && pdata->in4_dc_measure) { if (pdata && pdata->in4_dc_measure) {
@ -3686,30 +3686,22 @@ static __devinit int wm8962_i2c_probe(struct i2c_client *i2c,
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8962, &wm8962_dai, 1); &soc_codec_dev_wm8962, &wm8962_dai, 1);
if (ret < 0) if (ret < 0)
goto err_regmap; goto err_enable;
/* The drivers should power up as needed */ /* The drivers should power up as needed */
regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
return 0; return 0;
err_regmap:
regmap_exit(wm8962->regmap);
err_enable: err_enable:
regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
err_get:
regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
err: err:
return ret; return ret;
} }
static __devexit int wm8962_i2c_remove(struct i2c_client *client) static __devexit int wm8962_i2c_remove(struct i2c_client *client)
{ {
struct wm8962_priv *wm8962 = dev_get_drvdata(&client->dev);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
regmap_exit(wm8962->regmap);
regulator_bulk_free(ARRAY_SIZE(wm8962->supplies), wm8962->supplies);
return 0; return 0;
} }