ASoC: Convert WM8741 to devm_kzalloc()
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
b903c0ed2e
commit
5aefb306e3
1 changed files with 4 additions and 12 deletions
|
@ -503,7 +503,8 @@ static int wm8741_i2c_probe(struct i2c_client *i2c,
|
||||||
struct wm8741_priv *wm8741;
|
struct wm8741_priv *wm8741;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
wm8741 = kzalloc(sizeof(struct wm8741_priv), GFP_KERNEL);
|
wm8741 = devm_kzalloc(&i2c->dev, sizeof(struct wm8741_priv),
|
||||||
|
GFP_KERNEL);
|
||||||
if (wm8741 == NULL)
|
if (wm8741 == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -512,20 +513,13 @@ static int wm8741_i2c_probe(struct i2c_client *i2c,
|
||||||
|
|
||||||
ret = snd_soc_register_codec(&i2c->dev,
|
ret = snd_soc_register_codec(&i2c->dev,
|
||||||
&soc_codec_dev_wm8741, &wm8741_dai, 1);
|
&soc_codec_dev_wm8741, &wm8741_dai, 1);
|
||||||
if (ret != 0)
|
|
||||||
goto err;
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
err:
|
|
||||||
kfree(wm8741);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int wm8741_i2c_remove(struct i2c_client *client)
|
static int wm8741_i2c_remove(struct i2c_client *client)
|
||||||
{
|
{
|
||||||
snd_soc_unregister_codec(&client->dev);
|
snd_soc_unregister_codec(&client->dev);
|
||||||
kfree(i2c_get_clientdata(client));
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -553,7 +547,8 @@ static int __devinit wm8741_spi_probe(struct spi_device *spi)
|
||||||
struct wm8741_priv *wm8741;
|
struct wm8741_priv *wm8741;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
wm8741 = kzalloc(sizeof(struct wm8741_priv), GFP_KERNEL);
|
wm8741 = devm_kzalloc(&spi->dev, sizeof(struct wm8741_priv),
|
||||||
|
GFP_KERNEL);
|
||||||
if (wm8741 == NULL)
|
if (wm8741 == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
@ -562,15 +557,12 @@ static int __devinit wm8741_spi_probe(struct spi_device *spi)
|
||||||
|
|
||||||
ret = snd_soc_register_codec(&spi->dev,
|
ret = snd_soc_register_codec(&spi->dev,
|
||||||
&soc_codec_dev_wm8741, &wm8741_dai, 1);
|
&soc_codec_dev_wm8741, &wm8741_dai, 1);
|
||||||
if (ret < 0)
|
|
||||||
kfree(wm8741);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __devexit wm8741_spi_remove(struct spi_device *spi)
|
static int __devexit wm8741_spi_remove(struct spi_device *spi)
|
||||||
{
|
{
|
||||||
snd_soc_unregister_codec(&spi->dev);
|
snd_soc_unregister_codec(&spi->dev);
|
||||||
kfree(spi_get_drvdata(spi));
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in a new issue