Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f90af52 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next

parents 66195b15 9bb6e95e

sound/soc/codecs/wm8804.c

+2 −15
Original line number Original line Diff line number Diff line
@@ -711,7 +711,7 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi) 
	if (!wm8804)

	if (!wm8804)

		return -ENOMEM;

		return -ENOMEM;





	wm8804->regmap = regmap_init_spi(spi, &wm8804_regmap_config);

	wm8804->regmap = devm_regmap_init_spi(spi, &wm8804_regmap_config);

	if (IS_ERR(wm8804->regmap)) {

	if (IS_ERR(wm8804->regmap)) {

		ret = PTR_ERR(wm8804->regmap);

		ret = PTR_ERR(wm8804->regmap);

		return ret;

		return ret;
@@ -727,9 +727,7 @@ static int __devinit wm8804_spi_probe(struct spi_device *spi) 




static int __devexit wm8804_spi_remove(struct spi_device *spi)

static int __devexit wm8804_spi_remove(struct spi_device *spi)

{

{

	struct wm8804_priv *wm8804 = spi_get_drvdata(spi);

	snd_soc_unregister_codec(&spi->dev);

	snd_soc_unregister_codec(&spi->dev);

	regmap_exit(wm8804->regmap);

	return 0;

	return 0;

}

}
@@ -755,7 +753,7 @@ static __devinit int wm8804_i2c_probe(struct i2c_client *i2c, 
	if (!wm8804)

	if (!wm8804)

		return -ENOMEM;

		return -ENOMEM;





	wm8804->regmap = regmap_init_i2c(i2c, &wm8804_regmap_config);

	wm8804->regmap = devm_regmap_init_i2c(i2c, &wm8804_regmap_config);

	if (IS_ERR(wm8804->regmap)) {

	if (IS_ERR(wm8804->regmap)) {

		ret = PTR_ERR(wm8804->regmap);

		ret = PTR_ERR(wm8804->regmap);

		return ret;

		return ret;
@@ -765,23 +763,12 @@ 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)

		goto err;



	return 0;



err:

	regmap_exit(wm8804->regmap);

	return ret;

	return ret;

}

}





static __devexit int wm8804_i2c_remove(struct i2c_client *i2c)

static __devexit int wm8804_i2c_remove(struct i2c_client *i2c)

{

{

	struct wm8804_priv *wm8804 = i2c_get_clientdata(i2c);



	snd_soc_unregister_codec(&i2c->dev);

	snd_soc_unregister_codec(&i2c->dev);

	regmap_exit(wm8804->regmap);



	return 0;

	return 0;

}

}