Merge remote-tracking branch 'asoc/topic/wm9081' into asoc-next (d88c7dd2) · Commits · e / devices / android_kernel_fairphone_FP4

sound/soc/codecs/wm9081.c

+6 −16

Original line number	Diff line number	Diff line
		@@ -1341,28 +1341,27 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,

		i2c_set_clientdata(i2c, wm9081);

		wm9081->regmap = regmap_init_i2c(i2c, &wm9081_regmap);
		wm9081->regmap = devm_regmap_init_i2c(i2c, &wm9081_regmap);
		if (IS_ERR(wm9081->regmap)) {
		ret = PTR_ERR(wm9081->regmap);
		dev_err(&i2c->dev, "regmap_init() failed: %d\n", ret);
		goto err;
		return ret;
		}

		ret = regmap_read(wm9081->regmap, WM9081_SOFTWARE_RESET, &reg);
		if (ret != 0) {
		dev_err(&i2c->dev, "Failed to read chip ID: %d\n", ret);
		goto err_regmap;
		return ret;
		}
		if (reg != 0x9081) {
		dev_err(&i2c->dev, "Device is not a WM9081: ID=0x%x\n", reg);
		ret = -EINVAL;
		goto err_regmap;
		return -EINVAL;
		}

		ret = wm9081_reset(wm9081->regmap);
		if (ret < 0) {
		dev_err(&i2c->dev, "Failed to issue reset\n");
		goto err_regmap;
		return ret;
		}

		if (dev_get_platdata(&i2c->dev))
		@@ -1382,23 +1381,14 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
		ret = snd_soc_register_codec(&i2c->dev,
		&soc_codec_dev_wm9081, &wm9081_dai, 1);
		if (ret < 0)
		goto err_regmap;
		return ret;

		return 0;

		err_regmap:
		regmap_exit(wm9081->regmap);
		err:

		return ret;
		}

		static __devexit int wm9081_i2c_remove(struct i2c_client *client)
		{
		struct wm9081_priv *wm9081 = i2c_get_clientdata(client);

		snd_soc_unregister_codec(&client->dev);
		regmap_exit(wm9081->regmap);
		return 0;
		}