Skip to content

Commit

Permalink
ASoC: Convert ssm2602 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 a92b0a0 commit 8eeffe9
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions sound/soc/codecs/ssm2602.c
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,8 @@ static int __devinit ssm2602_spi_probe(struct spi_device *spi)
struct ssm2602_priv *ssm2602;
int ret;

ssm2602 = kzalloc(sizeof(struct ssm2602_priv), GFP_KERNEL);
ssm2602 = devm_kzalloc(&spi->dev, sizeof(struct ssm2602_priv),
GFP_KERNEL);
if (ssm2602 == NULL)
return -ENOMEM;

Expand All @@ -662,15 +663,12 @@ static int __devinit ssm2602_spi_probe(struct spi_device *spi)

ret = snd_soc_register_codec(&spi->dev,
&soc_codec_dev_ssm2602, &ssm2602_dai, 1);
if (ret < 0)
kfree(ssm2602);
return ret;
}

static int __devexit ssm2602_spi_remove(struct spi_device *spi)
{
snd_soc_unregister_codec(&spi->dev);
kfree(spi_get_drvdata(spi));
return 0;
}

Expand All @@ -697,7 +695,8 @@ static int __devinit ssm2602_i2c_probe(struct i2c_client *i2c,
struct ssm2602_priv *ssm2602;
int ret;

ssm2602 = kzalloc(sizeof(struct ssm2602_priv), GFP_KERNEL);
ssm2602 = devm_kzalloc(&i2c->dev, sizeof(struct ssm2602_priv),
GFP_KERNEL);
if (ssm2602 == NULL)
return -ENOMEM;

Expand All @@ -707,15 +706,12 @@ static int __devinit ssm2602_i2c_probe(struct i2c_client *i2c,

ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_ssm2602, &ssm2602_dai, 1);
if (ret < 0)
kfree(ssm2602);
return ret;
}

static int __devexit ssm2602_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client));
return 0;
}

Expand Down

0 comments on commit 8eeffe9

Please sign in to comment.