ASoC: Convert wm8804 to devm_kzalloc() (f649f1a8) · Commits · e / devices / android_kernel_xiaomi_nabu

sound/soc/codecs/wm8804.c

+5 −8

Original line number	Original line	Diff line number	Diff line
	@@ -713,7 +713,7 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi)
	struct wm8804_priv *wm8804;		struct wm8804_priv *wm8804;
	int ret;		int ret;

	wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL);		wm8804 = devm_kzalloc(&spi->dev, sizeof *wm8804, GFP_KERNEL);
	if (!wm8804)		if (!wm8804)
	return -ENOMEM;		return -ENOMEM;

	@@ -722,15 +722,13 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi)

	ret = snd_soc_register_codec(&spi->dev,		ret = snd_soc_register_codec(&spi->dev,
	&soc_codec_dev_wm8804, &wm8804_dai, 1);		&soc_codec_dev_wm8804, &wm8804_dai, 1);
	if (ret < 0)
	kfree(wm8804);
	return ret;		return ret;
	}		}

	static int __devexit wm8804_spi_remove(struct spi_device *spi)		static int __devexit wm8804_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;
	}		}

	@@ -752,7 +750,7 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c,
	struct wm8804_priv *wm8804;		struct wm8804_priv *wm8804;
	int ret;		int ret;

	wm8804 = kzalloc(sizeof *wm8804, GFP_KERNEL);		wm8804 = devm_kzalloc(&i2c->dev, sizeof *wm8804, GFP_KERNEL);
	if (!wm8804)		if (!wm8804)
	return -ENOMEM;		return -ENOMEM;

	@@ -761,15 +759,14 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c,

	ret = snd_soc_register_codec(&i2c->dev,		ret = snd_soc_register_codec(&i2c->dev,
	&soc_codec_dev_wm8804, &wm8804_dai, 1);		&soc_codec_dev_wm8804, &wm8804_dai, 1);
	if (ret < 0)
	kfree(wm8804);
	return ret;		return ret;
	}		}

	static __devexit int wm8804_i2c_remove(struct i2c_client *client)		static __devexit int wm8804_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;
	}		}