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

Commit 6f818e04 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: tlv320aic3x: Move resource acquisition to I2C probe 



This is more idiomatic and interacts better with deferred probing.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a16bbe4d

sound/soc/codecs/tlv320aic3x.c

+33 −30
Original line number Diff line number Diff line
@@ -1345,23 +1345,6 @@ static int aic3x_probe(struct snd_soc_codec *codec) 
		return ret;

	}



	if (gpio_is_valid(aic3x->gpio_reset) &&

	    !aic3x_is_shared_reset(aic3x)) {

		ret = gpio_request(aic3x->gpio_reset, "tlv320aic3x reset");

		if (ret != 0)

			goto err_gpio;

		gpio_direction_output(aic3x->gpio_reset, 0);

	}



	for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)

		aic3x->supplies[i].supply = aic3x_supply_names[i];



	ret = regulator_bulk_get(codec->dev, ARRAY_SIZE(aic3x->supplies),

				 aic3x->supplies);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to request supplies: %d\n", ret);

		goto err_get;

	}

	for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++) {

		aic3x->disable_nb[i].nb.notifier_call = aic3x_regulator_event;

		aic3x->disable_nb[i].aic3x = aic3x;
@@ -1418,12 +1401,6 @@ static int aic3x_probe(struct snd_soc_codec *codec) 
	while (i--)

		regulator_unregister_notifier(aic3x->supplies[i].consumer,

					      &aic3x->disable_nb[i].nb);

	regulator_bulk_free(ARRAY_SIZE(aic3x->supplies), aic3x->supplies);

err_get:

	if (gpio_is_valid(aic3x->gpio_reset) &&

	    !aic3x_is_shared_reset(aic3x))

		gpio_free(aic3x->gpio_reset);

err_gpio:

	return ret;

}
@@ -1434,15 +1411,9 @@ static int aic3x_remove(struct snd_soc_codec *codec) 


	aic3x_set_bias_level(codec, SND_SOC_BIAS_OFF);

	list_del(&aic3x->list);

	if (gpio_is_valid(aic3x->gpio_reset) &&

	    !aic3x_is_shared_reset(aic3x)) {

		gpio_set_value(aic3x->gpio_reset, 0);

		gpio_free(aic3x->gpio_reset);

	}

	for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)

		regulator_unregister_notifier(aic3x->supplies[i].consumer,

					      &aic3x->disable_nb[i].nb);

	regulator_bulk_free(ARRAY_SIZE(aic3x->supplies), aic3x->supplies);



	return 0;

}
@@ -1484,7 +1455,7 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, 
	struct aic3x_priv *aic3x;

	struct aic3x_setup_data *ai3x_setup;

	struct device_node *np = i2c->dev.of_node;

	int ret;

	int ret, i;

	u32 value;



	aic3x = devm_kzalloc(&i2c->dev, sizeof(struct aic3x_priv), GFP_KERNEL);
@@ -1545,14 +1516,46 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, 


	aic3x->model = id->driver_data;



	if (gpio_is_valid(aic3x->gpio_reset) &&

	    !aic3x_is_shared_reset(aic3x)) {

		ret = gpio_request(aic3x->gpio_reset, "tlv320aic3x reset");

		if (ret != 0)

			goto err;

		gpio_direction_output(aic3x->gpio_reset, 0);

	}



	for (i = 0; i < ARRAY_SIZE(aic3x->supplies); i++)

		aic3x->supplies[i].supply = aic3x_supply_names[i];



	ret = devm_regulator_bulk_get(&i2c->dev, ARRAY_SIZE(aic3x->supplies),

				      aic3x->supplies);

	if (ret != 0) {

		dev_err(&i2c->dev, "Failed to request supplies: %d\n", ret);

		goto err_gpio;

	}



	ret = snd_soc_register_codec(&i2c->dev,

			&soc_codec_dev_aic3x, &aic3x_dai, 1);

	return ret;



err_gpio:

	if (gpio_is_valid(aic3x->gpio_reset) &&

	    !aic3x_is_shared_reset(aic3x))

		gpio_free(aic3x->gpio_reset);

err:

	return ret;

}



static int aic3x_i2c_remove(struct i2c_client *client)

{

	struct aic3x_priv *aic3x = i2c_get_clientdata(client);



	snd_soc_unregister_codec(&client->dev);

	if (gpio_is_valid(aic3x->gpio_reset) &&

	    !aic3x_is_shared_reset(aic3x)) {

		gpio_set_value(aic3x->gpio_reset, 0);

		gpio_free(aic3x->gpio_reset);

	}

	return 0;

}