Unverified Commit 7ab5ba47 authored by Steven Eckhoff's avatar Steven Eckhoff Committed by Mark Brown
Browse files

ASoC: TSCS42xx: Cleanup private data members



Remove blrcm from private data
Remove dev from private data

Signed-off-by: default avatarSteven Eckhoff <steven.eckhoff.opensource@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4c4825ae
Loading
Loading
Loading
Loading
+6 −10
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct tscs42xx {

	int bclk_ratio;
	int samplerate;
	unsigned int blrcm;
	struct mutex audio_params_lock;

	u8 coeff_ram[COEFF_RAM_SIZE];
@@ -41,8 +40,6 @@ struct tscs42xx {
	struct mutex pll_lock;

	struct regmap *regmap;

	struct device *dev;
};

struct coeff_ram_ctl {
@@ -1404,12 +1401,11 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c,
		return ret;
	}
	i2c_set_clientdata(i2c, tscs42xx);
	tscs42xx->dev = &i2c->dev;

	tscs42xx->regmap = devm_regmap_init_i2c(i2c, &tscs42xx_regmap);
	if (IS_ERR(tscs42xx->regmap)) {
		ret = PTR_ERR(tscs42xx->regmap);
		dev_err(tscs42xx->dev, "Failed to allocate regmap (%d)\n", ret);
		dev_err(&i2c->dev, "Failed to allocate regmap (%d)\n", ret);
		return ret;
	}

@@ -1417,21 +1413,21 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c,

	ret = part_is_valid(tscs42xx);
	if (ret <= 0) {
		dev_err(tscs42xx->dev, "No valid part (%d)\n", ret);
		dev_err(&i2c->dev, "No valid part (%d)\n", ret);
		ret = -ENODEV;
		return ret;
	}

	ret = regmap_write(tscs42xx->regmap, R_RESET, RV_RESET_ENABLE);
	if (ret < 0) {
		dev_err(tscs42xx->dev, "Failed to reset device (%d)\n", ret);
		dev_err(&i2c->dev, "Failed to reset device (%d)\n", ret);
		return ret;
	}

	ret = regmap_register_patch(tscs42xx->regmap, tscs42xx_patch,
			ARRAY_SIZE(tscs42xx_patch));
	if (ret < 0) {
		dev_err(tscs42xx->dev, "Failed to apply patch (%d)\n", ret);
		dev_err(&i2c->dev, "Failed to apply patch (%d)\n", ret);
		return ret;
	}

@@ -1439,10 +1435,10 @@ static int tscs42xx_i2c_probe(struct i2c_client *i2c,
	mutex_init(&tscs42xx->coeff_ram_lock);
	mutex_init(&tscs42xx->pll_lock);

	ret = devm_snd_soc_register_component(tscs42xx->dev,
	ret = devm_snd_soc_register_component(&i2c->dev,
			&soc_codec_dev_tscs42xx, &tscs42xx_dai, 1);
	if (ret) {
		dev_err(tscs42xx->dev, "Failed to register codec (%d)\n", ret);
		dev_err(&i2c->dev, "Failed to register codec (%d)\n", ret);
		return ret;
	}