ASoC: Convert WM8776 to devm_kzalloc() (bf97ca9a) · Commits · e / devices / android_kernel_fairphone_FP4

sound/soc/codecs/wm8776.c

+6 −8

Original line number	Diff line number	Diff line
		@@ -452,7 +452,8 @@ static int __devinit wm8776_spi_probe(struct spi_device *spi)
		struct wm8776_priv *wm8776;
		int ret;

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

		@@ -461,15 +462,13 @@ static int __devinit wm8776_spi_probe(struct spi_device *spi)

		ret = snd_soc_register_codec(&spi->dev,
		&soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai));
		if (ret < 0)
		kfree(wm8776);

		return ret;
		}

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

		@@ -491,7 +490,8 @@ static __devinit int wm8776_i2c_probe(struct i2c_client *i2c,
		struct wm8776_priv *wm8776;
		int ret;

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

		@@ -500,15 +500,13 @@ static __devinit int wm8776_i2c_probe(struct i2c_client *i2c,

		ret = snd_soc_register_codec(&i2c->dev,
		&soc_codec_dev_wm8776, wm8776_dai, ARRAY_SIZE(wm8776_dai));
		if (ret < 0)
		kfree(wm8776);

		return ret;
		}

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