Skip to content

Commit

Permalink
ASoC: Convert sta32x to devm_kzalloc()
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Jan 2, 2012
1 parent 8eeffe9 commit d999c02
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions sound/soc/codecs/sta32x.c
Original file line number Diff line number Diff line change
Expand Up @@ -968,28 +968,23 @@ static __devinit int sta32x_i2c_probe(struct i2c_client *i2c,
struct sta32x_priv *sta32x;
int ret;

sta32x = kzalloc(sizeof(struct sta32x_priv), GFP_KERNEL);
sta32x = devm_kzalloc(&i2c->dev, sizeof(struct sta32x_priv),
GFP_KERNEL);
if (!sta32x)
return -ENOMEM;

i2c_set_clientdata(i2c, sta32x);

ret = snd_soc_register_codec(&i2c->dev, &sta32x_codec, &sta32x_dai, 1);
if (ret != 0) {
if (ret != 0)
dev_err(&i2c->dev, "Failed to register codec (%d)\n", ret);
kfree(sta32x);
return ret;
}

return 0;
return ret;
}

static __devexit int sta32x_i2c_remove(struct i2c_client *client)
{
struct sta32x_priv *sta32x = i2c_get_clientdata(client);

snd_soc_unregister_codec(&client->dev);
kfree(sta32x);
return 0;
}

Expand Down

0 comments on commit d999c02

Please sign in to comment.